Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/intern/COM_NodeConverter.cpp
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/compositor/intern/COM_NodeConverter.cpp')
-rw-r--r--source/blender/compositor/intern/COM_NodeConverter.cpp97
1 files changed, 48 insertions, 49 deletions
diff --git a/source/blender/compositor/intern/COM_NodeConverter.cpp b/source/blender/compositor/intern/COM_NodeConverter.cpp
index c775a9ed49f..c44721e3939 100644
--- a/source/blender/compositor/intern/COM_NodeConverter.cpp
+++ b/source/blender/compositor/intern/COM_NodeConverter.cpp
@@ -31,135 +31,134 @@ extern "C" {
#include "COM_NodeConverter.h" /* own include */
-NodeConverter::NodeConverter(NodeOperationBuilder *builder) :
- m_builder(builder)
+NodeConverter::NodeConverter(NodeOperationBuilder *builder) : m_builder(builder)
{
}
void NodeConverter::addOperation(NodeOperation *operation)
{
- m_builder->addOperation(operation);
+ m_builder->addOperation(operation);
}
void NodeConverter::mapInputSocket(NodeInput *node_socket, NodeOperationInput *operation_socket)
{
- m_builder->mapInputSocket(node_socket, operation_socket);
+ m_builder->mapInputSocket(node_socket, operation_socket);
}
void NodeConverter::mapOutputSocket(NodeOutput *node_socket, NodeOperationOutput *operation_socket)
{
- m_builder->mapOutputSocket(node_socket, operation_socket);
+ m_builder->mapOutputSocket(node_socket, operation_socket);
}
void NodeConverter::addLink(NodeOperationOutput *from, NodeOperationInput *to)
{
- m_builder->addLink(from, to);
+ m_builder->addLink(from, to);
}
void NodeConverter::addPreview(NodeOperationOutput *output)
{
- m_builder->addPreview(output);
+ m_builder->addPreview(output);
}
void NodeConverter::addNodeInputPreview(NodeInput *input)
{
- m_builder->addNodeInputPreview(input);
+ m_builder->addNodeInputPreview(input);
}
NodeOperation *NodeConverter::setInvalidOutput(NodeOutput *output)
{
- /* this is a really bad situation - bring on the pink! - so artists know this is bad */
- const float warning_color[4] = {1.0f, 0.0f, 1.0f, 1.0f};
+ /* this is a really bad situation - bring on the pink! - so artists know this is bad */
+ const float warning_color[4] = {1.0f, 0.0f, 1.0f, 1.0f};
- SetColorOperation *operation = new SetColorOperation();
- operation->setChannels(warning_color);
+ SetColorOperation *operation = new SetColorOperation();
+ operation->setChannels(warning_color);
- m_builder->addOperation(operation);
- m_builder->mapOutputSocket(output, operation->getOutputSocket());
+ m_builder->addOperation(operation);
+ m_builder->mapOutputSocket(output, operation->getOutputSocket());
- return operation;
+ return operation;
}
NodeOperationOutput *NodeConverter::addInputProxy(NodeInput *input, bool use_conversion)
{
- SocketProxyOperation *proxy = new SocketProxyOperation(input->getDataType(), use_conversion);
- m_builder->addOperation(proxy);
+ SocketProxyOperation *proxy = new SocketProxyOperation(input->getDataType(), use_conversion);
+ m_builder->addOperation(proxy);
- m_builder->mapInputSocket(input, proxy->getInputSocket(0));
+ m_builder->mapInputSocket(input, proxy->getInputSocket(0));
- return proxy->getOutputSocket();
+ return proxy->getOutputSocket();
}
NodeOperationInput *NodeConverter::addOutputProxy(NodeOutput *output, bool use_conversion)
{
- SocketProxyOperation *proxy = new SocketProxyOperation(output->getDataType(), use_conversion);
- m_builder->addOperation(proxy);
+ SocketProxyOperation *proxy = new SocketProxyOperation(output->getDataType(), use_conversion);
+ m_builder->addOperation(proxy);
- m_builder->mapOutputSocket(output, proxy->getOutputSocket());
+ m_builder->mapOutputSocket(output, proxy->getOutputSocket());
- return proxy->getInputSocket(0);
+ return proxy->getInputSocket(0);
}
void NodeConverter::addInputValue(NodeOperationInput *input, float value)
{
- SetValueOperation *operation = new SetValueOperation();
- operation->setValue(value);
+ SetValueOperation *operation = new SetValueOperation();
+ operation->setValue(value);
- m_builder->addOperation(operation);
- m_builder->addLink(operation->getOutputSocket(), input);
+ m_builder->addOperation(operation);
+ m_builder->addLink(operation->getOutputSocket(), input);
}
void NodeConverter::addInputColor(NodeOperationInput *input, const float value[4])
{
- SetColorOperation *operation = new SetColorOperation();
- operation->setChannels(value);
+ SetColorOperation *operation = new SetColorOperation();
+ operation->setChannels(value);
- m_builder->addOperation(operation);
- m_builder->addLink(operation->getOutputSocket(), input);
+ m_builder->addOperation(operation);
+ m_builder->addLink(operation->getOutputSocket(), input);
}
void NodeConverter::addInputVector(NodeOperationInput *input, const float value[3])
{
- SetVectorOperation *operation = new SetVectorOperation();
- operation->setVector(value);
+ SetVectorOperation *operation = new SetVectorOperation();
+ operation->setVector(value);
- m_builder->addOperation(operation);
- m_builder->addLink(operation->getOutputSocket(), input);
+ m_builder->addOperation(operation);
+ m_builder->addLink(operation->getOutputSocket(), input);
}
void NodeConverter::addOutputValue(NodeOutput *output, float value)
{
- SetValueOperation *operation = new SetValueOperation();
- operation->setValue(value);
+ SetValueOperation *operation = new SetValueOperation();
+ operation->setValue(value);
- m_builder->addOperation(operation);
- m_builder->mapOutputSocket(output, operation->getOutputSocket());
+ m_builder->addOperation(operation);
+ m_builder->mapOutputSocket(output, operation->getOutputSocket());
}
void NodeConverter::addOutputColor(NodeOutput *output, const float value[4])
{
- SetColorOperation *operation = new SetColorOperation();
- operation->setChannels(value);
+ SetColorOperation *operation = new SetColorOperation();
+ operation->setChannels(value);
- m_builder->addOperation(operation);
- m_builder->mapOutputSocket(output, operation->getOutputSocket());
+ m_builder->addOperation(operation);
+ m_builder->mapOutputSocket(output, operation->getOutputSocket());
}
void NodeConverter::addOutputVector(NodeOutput *output, const float value[3])
{
- SetVectorOperation *operation = new SetVectorOperation();
- operation->setVector(value);
+ SetVectorOperation *operation = new SetVectorOperation();
+ operation->setVector(value);
- m_builder->addOperation(operation);
- m_builder->mapOutputSocket(output, operation->getOutputSocket());
+ m_builder->addOperation(operation);
+ m_builder->mapOutputSocket(output, operation->getOutputSocket());
}
void NodeConverter::registerViewer(ViewerOperation *viewer)
{
- m_builder->registerViewer(viewer);
+ m_builder->registerViewer(viewer);
}
ViewerOperation *NodeConverter::active_viewer() const
{
- return m_builder->active_viewer();
+ return m_builder->active_viewer();
}