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/nodes/COM_RenderLayersNode.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/nodes/COM_RenderLayersNode.cpp')
-rw-r--r-- | source/blender/compositor/nodes/COM_RenderLayersNode.cpp | 240 |
1 files changed, 113 insertions, 127 deletions
diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp index e1897e09128..26f21713a77 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp @@ -27,7 +27,7 @@ RenderLayersNode::RenderLayersNode(bNode *editorNode) : Node(editorNode) { - /* pass */ + /* pass */ } void RenderLayersNode::testSocketLink(NodeConverter &converter, @@ -38,152 +38,138 @@ void RenderLayersNode::testSocketLink(NodeConverter &converter, int layerId, bool is_preview) const { - operation->setScene(scene); - operation->setLayerId(layerId); - operation->setRenderData(context.getRenderData()); - operation->setViewName(context.getViewName()); + operation->setScene(scene); + operation->setLayerId(layerId); + operation->setRenderData(context.getRenderData()); + operation->setViewName(context.getViewName()); - converter.mapOutputSocket(output, operation->getOutputSocket()); - converter.addOperation(operation); + converter.mapOutputSocket(output, operation->getOutputSocket()); + converter.addOperation(operation); - if (is_preview) /* only for image socket */ - converter.addPreview(operation->getOutputSocket()); + if (is_preview) /* only for image socket */ + converter.addPreview(operation->getOutputSocket()); } void RenderLayersNode::testRenderLink(NodeConverter &converter, const CompositorContext &context, Render *re) const { - Scene *scene = (Scene *)this->getbNode()->id; - const short layerId = this->getbNode()->custom1; - RenderResult *rr = RE_AcquireResultRead(re); - if (rr == NULL) { - missingRenderLink(converter); - return; - } - ViewLayer *view_layer = (ViewLayer *)BLI_findlink(&scene->view_layers, layerId); - if (view_layer == NULL) { - missingRenderLink(converter); - return; - } - RenderLayer *rl = RE_GetRenderLayer(rr, view_layer->name); - if (rl == NULL) { - missingRenderLink(converter); - return; - } - const int num_outputs = this->getNumberOfOutputSockets(); - for (int i = 0; i < num_outputs; i++) { - NodeOutput *output = this->getOutputSocket(i); - NodeImageLayer *storage = (NodeImageLayer *)output->getbNodeSocket()->storage; - RenderPass *rpass = (RenderPass *)BLI_findstring( - &rl->passes, - storage->pass_name, - offsetof(RenderPass, name)); - if (rpass == NULL) { - missingSocketLink(converter, output); - continue; - } - RenderLayersProg *operation; - bool is_preview; - if (STREQ(rpass->name, RE_PASSNAME_COMBINED) && - STREQ(output->getbNodeSocket()->name, "Alpha")) - { - operation = new RenderLayersAlphaProg(rpass->name, - COM_DT_VALUE, - rpass->channels); - is_preview = false; - } - else if (STREQ(rpass->name, RE_PASSNAME_Z)) { - operation = new RenderLayersDepthProg(rpass->name, - COM_DT_VALUE, - rpass->channels); - is_preview = false; - } - else { - DataType type; - switch (rpass->channels) { - case 4: type = COM_DT_COLOR; break; - case 3: type = COM_DT_VECTOR; break; - case 1: type = COM_DT_VALUE; break; - default: - BLI_assert(!"Unexpected number of channels for pass"); - type = COM_DT_VALUE; - break; - } - operation = new RenderLayersProg(rpass->name, - type, - rpass->channels); - is_preview = STREQ(output->getbNodeSocket()->name, "Image"); - } - testSocketLink(converter, - context, - output, - operation, - scene, - layerId, - is_preview); - } + Scene *scene = (Scene *)this->getbNode()->id; + const short layerId = this->getbNode()->custom1; + RenderResult *rr = RE_AcquireResultRead(re); + if (rr == NULL) { + missingRenderLink(converter); + return; + } + ViewLayer *view_layer = (ViewLayer *)BLI_findlink(&scene->view_layers, layerId); + if (view_layer == NULL) { + missingRenderLink(converter); + return; + } + RenderLayer *rl = RE_GetRenderLayer(rr, view_layer->name); + if (rl == NULL) { + missingRenderLink(converter); + return; + } + const int num_outputs = this->getNumberOfOutputSockets(); + for (int i = 0; i < num_outputs; i++) { + NodeOutput *output = this->getOutputSocket(i); + NodeImageLayer *storage = (NodeImageLayer *)output->getbNodeSocket()->storage; + RenderPass *rpass = (RenderPass *)BLI_findstring( + &rl->passes, storage->pass_name, offsetof(RenderPass, name)); + if (rpass == NULL) { + missingSocketLink(converter, output); + continue; + } + RenderLayersProg *operation; + bool is_preview; + if (STREQ(rpass->name, RE_PASSNAME_COMBINED) && + STREQ(output->getbNodeSocket()->name, "Alpha")) { + operation = new RenderLayersAlphaProg(rpass->name, COM_DT_VALUE, rpass->channels); + is_preview = false; + } + else if (STREQ(rpass->name, RE_PASSNAME_Z)) { + operation = new RenderLayersDepthProg(rpass->name, COM_DT_VALUE, rpass->channels); + is_preview = false; + } + else { + DataType type; + switch (rpass->channels) { + case 4: + type = COM_DT_COLOR; + break; + case 3: + type = COM_DT_VECTOR; + break; + case 1: + type = COM_DT_VALUE; + break; + default: + BLI_assert(!"Unexpected number of channels for pass"); + type = COM_DT_VALUE; + break; + } + operation = new RenderLayersProg(rpass->name, type, rpass->channels); + is_preview = STREQ(output->getbNodeSocket()->name, "Image"); + } + testSocketLink(converter, context, output, operation, scene, layerId, is_preview); + } } -void RenderLayersNode::missingSocketLink(NodeConverter &converter, - NodeOutput *output) const +void RenderLayersNode::missingSocketLink(NodeConverter &converter, NodeOutput *output) const { - NodeOperation *operation; - switch (output->getDataType()) { - case COM_DT_COLOR: - { - const float color[4] = {0.0f, 0.0f, 0.0f, 0.0f}; - SetColorOperation *color_operation = new SetColorOperation(); - color_operation->setChannels(color); - operation = color_operation; - break; - } - case COM_DT_VECTOR: - { - const float vector[3] = {0.0f, 0.0f, 0.0f}; - SetVectorOperation *vector_operation = new SetVectorOperation(); - vector_operation->setVector(vector); - operation = vector_operation; - break; - } - case COM_DT_VALUE: - { - SetValueOperation *value_operation = new SetValueOperation(); - value_operation->setValue(0.0f); - operation = value_operation; - break; - } - default: - { - BLI_assert("!Unexpected data type"); - return; - } - } + NodeOperation *operation; + switch (output->getDataType()) { + case COM_DT_COLOR: { + const float color[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + SetColorOperation *color_operation = new SetColorOperation(); + color_operation->setChannels(color); + operation = color_operation; + break; + } + case COM_DT_VECTOR: { + const float vector[3] = {0.0f, 0.0f, 0.0f}; + SetVectorOperation *vector_operation = new SetVectorOperation(); + vector_operation->setVector(vector); + operation = vector_operation; + break; + } + case COM_DT_VALUE: { + SetValueOperation *value_operation = new SetValueOperation(); + value_operation->setValue(0.0f); + operation = value_operation; + break; + } + default: { + BLI_assert("!Unexpected data type"); + return; + } + } - converter.mapOutputSocket(output, operation->getOutputSocket()); - converter.addOperation(operation); + converter.mapOutputSocket(output, operation->getOutputSocket()); + converter.addOperation(operation); } void RenderLayersNode::missingRenderLink(NodeConverter &converter) const { - const int num_outputs = this->getNumberOfOutputSockets(); - for (int i = 0; i < num_outputs; i++) { - NodeOutput *output = this->getOutputSocket(i); - missingSocketLink(converter, output); - } + const int num_outputs = this->getNumberOfOutputSockets(); + for (int i = 0; i < num_outputs; i++) { + NodeOutput *output = this->getOutputSocket(i); + missingSocketLink(converter, output); + } } void RenderLayersNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const { - Scene *scene = (Scene *)this->getbNode()->id; - Render *re = (scene) ? RE_GetSceneRender(scene) : NULL; + Scene *scene = (Scene *)this->getbNode()->id; + Render *re = (scene) ? RE_GetSceneRender(scene) : NULL; - if (re != NULL) { - testRenderLink(converter, context, re); - RE_ReleaseResult(re); - } - else { - missingRenderLink(converter); - } + if (re != NULL) { + testRenderLink(converter, context, re); + RE_ReleaseResult(re); + } + else { + missingRenderLink(converter); + } } |