diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/intern/COM_Node.cpp | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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_Node.cpp')
-rw-r--r-- | source/blender/compositor/intern/COM_Node.cpp | 186 |
1 files changed, 91 insertions, 95 deletions
diff --git a/source/blender/compositor/intern/COM_Node.cpp b/source/blender/compositor/intern/COM_Node.cpp index 5435c0475c8..b38493e19f2 100644 --- a/source/blender/compositor/intern/COM_Node.cpp +++ b/source/blender/compositor/intern/COM_Node.cpp @@ -38,175 +38,171 @@ extern "C" { **** Node **** **************/ -Node::Node(bNode *editorNode, bool create_sockets) : - m_editorNodeTree(NULL), - m_editorNode(editorNode), - m_inActiveGroup(false), - m_instanceKey(NODE_INSTANCE_KEY_NONE) -{ - if (create_sockets) { - bNodeSocket *input = (bNodeSocket *)editorNode->inputs.first; - while (input != NULL) { - DataType dt = COM_DT_VALUE; - if (input->type == SOCK_RGBA) dt = COM_DT_COLOR; - if (input->type == SOCK_VECTOR) dt = COM_DT_VECTOR; - - this->addInputSocket(dt, input); - input = input->next; - } - bNodeSocket *output = (bNodeSocket *)editorNode->outputs.first; - while (output != NULL) { - DataType dt = COM_DT_VALUE; - if (output->type == SOCK_RGBA) dt = COM_DT_COLOR; - if (output->type == SOCK_VECTOR) dt = COM_DT_VECTOR; - - this->addOutputSocket(dt, output); - output = output->next; - } - } +Node::Node(bNode *editorNode, bool create_sockets) + : m_editorNodeTree(NULL), + m_editorNode(editorNode), + m_inActiveGroup(false), + m_instanceKey(NODE_INSTANCE_KEY_NONE) +{ + if (create_sockets) { + bNodeSocket *input = (bNodeSocket *)editorNode->inputs.first; + while (input != NULL) { + DataType dt = COM_DT_VALUE; + if (input->type == SOCK_RGBA) + dt = COM_DT_COLOR; + if (input->type == SOCK_VECTOR) + dt = COM_DT_VECTOR; + + this->addInputSocket(dt, input); + input = input->next; + } + bNodeSocket *output = (bNodeSocket *)editorNode->outputs.first; + while (output != NULL) { + DataType dt = COM_DT_VALUE; + if (output->type == SOCK_RGBA) + dt = COM_DT_COLOR; + if (output->type == SOCK_VECTOR) + dt = COM_DT_VECTOR; + + this->addOutputSocket(dt, output); + output = output->next; + } + } } Node::~Node() { - while (!this->m_outputsockets.empty()) { - delete (this->m_outputsockets.back()); - this->m_outputsockets.pop_back(); - } - while (!this->m_inputsockets.empty()) { - delete (this->m_inputsockets.back()); - this->m_inputsockets.pop_back(); - } + while (!this->m_outputsockets.empty()) { + delete (this->m_outputsockets.back()); + this->m_outputsockets.pop_back(); + } + while (!this->m_inputsockets.empty()) { + delete (this->m_inputsockets.back()); + this->m_inputsockets.pop_back(); + } } void Node::addInputSocket(DataType datatype) { - this->addInputSocket(datatype, NULL); + this->addInputSocket(datatype, NULL); } void Node::addInputSocket(DataType datatype, bNodeSocket *bSocket) { - NodeInput *socket = new NodeInput(this, bSocket, datatype); - this->m_inputsockets.push_back(socket); + NodeInput *socket = new NodeInput(this, bSocket, datatype); + this->m_inputsockets.push_back(socket); } void Node::addOutputSocket(DataType datatype) { - this->addOutputSocket(datatype, NULL); - + this->addOutputSocket(datatype, NULL); } void Node::addOutputSocket(DataType datatype, bNodeSocket *bSocket) { - NodeOutput *socket = new NodeOutput(this, bSocket, datatype); - this->m_outputsockets.push_back(socket); + NodeOutput *socket = new NodeOutput(this, bSocket, datatype); + this->m_outputsockets.push_back(socket); } NodeOutput *Node::getOutputSocket(unsigned int index) const { - BLI_assert(index < this->m_outputsockets.size()); - return this->m_outputsockets[index]; + BLI_assert(index < this->m_outputsockets.size()); + return this->m_outputsockets[index]; } NodeInput *Node::getInputSocket(unsigned int index) const { - BLI_assert(index < this->m_inputsockets.size()); - return this->m_inputsockets[index]; + BLI_assert(index < this->m_inputsockets.size()); + return this->m_inputsockets[index]; } bNodeSocket *Node::getEditorInputSocket(int editorNodeInputSocketIndex) { - bNodeSocket *bSock = (bNodeSocket *)this->getbNode()->inputs.first; - int index = 0; - while (bSock != NULL) { - if (index == editorNodeInputSocketIndex) { - return bSock; - } - index++; - bSock = bSock->next; - } - return NULL; + bNodeSocket *bSock = (bNodeSocket *)this->getbNode()->inputs.first; + int index = 0; + while (bSock != NULL) { + if (index == editorNodeInputSocketIndex) { + return bSock; + } + index++; + bSock = bSock->next; + } + return NULL; } bNodeSocket *Node::getEditorOutputSocket(int editorNodeInputSocketIndex) { - bNodeSocket *bSock = (bNodeSocket *)this->getbNode()->outputs.first; - int index = 0; - while (bSock != NULL) { - if (index == editorNodeInputSocketIndex) { - return bSock; - } - index++; - bSock = bSock->next; - } - return NULL; + bNodeSocket *bSock = (bNodeSocket *)this->getbNode()->outputs.first; + int index = 0; + while (bSock != NULL) { + if (index == editorNodeInputSocketIndex) { + return bSock; + } + index++; + bSock = bSock->next; + } + return NULL; } - /******************* **** NodeInput **** *******************/ -NodeInput::NodeInput(Node *node, bNodeSocket *b_socket, DataType datatype) : - m_node(node), - m_editorSocket(b_socket), - m_datatype(datatype), - m_link(NULL) +NodeInput::NodeInput(Node *node, bNodeSocket *b_socket, DataType datatype) + : m_node(node), m_editorSocket(b_socket), m_datatype(datatype), m_link(NULL) { } void NodeInput::setLink(NodeOutput *link) { - m_link = link; + m_link = link; } float NodeInput::getEditorValueFloat() { - PointerRNA ptr; - RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr); - return RNA_float_get(&ptr, "default_value"); + PointerRNA ptr; + RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr); + return RNA_float_get(&ptr, "default_value"); } void NodeInput::getEditorValueColor(float *value) { - PointerRNA ptr; - RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr); - return RNA_float_get_array(&ptr, "default_value", value); + PointerRNA ptr; + RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr); + return RNA_float_get_array(&ptr, "default_value", value); } void NodeInput::getEditorValueVector(float *value) { - PointerRNA ptr; - RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr); - return RNA_float_get_array(&ptr, "default_value", value); + PointerRNA ptr; + RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr); + return RNA_float_get_array(&ptr, "default_value", value); } - /******************** **** NodeOutput **** ********************/ -NodeOutput::NodeOutput(Node *node, bNodeSocket *b_socket, DataType datatype) : - m_node(node), - m_editorSocket(b_socket), - m_datatype(datatype) +NodeOutput::NodeOutput(Node *node, bNodeSocket *b_socket, DataType datatype) + : m_node(node), m_editorSocket(b_socket), m_datatype(datatype) { } float NodeOutput::getEditorValueFloat() { - PointerRNA ptr; - RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr); - return RNA_float_get(&ptr, "default_value"); + PointerRNA ptr; + RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr); + return RNA_float_get(&ptr, "default_value"); } void NodeOutput::getEditorValueColor(float *value) { - PointerRNA ptr; - RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr); - return RNA_float_get_array(&ptr, "default_value", value); + PointerRNA ptr; + RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr); + return RNA_float_get_array(&ptr, "default_value", value); } void NodeOutput::getEditorValueVector(float *value) { - PointerRNA ptr; - RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr); - return RNA_float_get_array(&ptr, "default_value", value); + PointerRNA ptr; + RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr); + return RNA_float_get_array(&ptr, "default_value", value); } |