diff options
author | Jeroen Bakker <jeroen@blender.org> | 2021-03-19 16:26:24 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2021-03-19 19:11:47 +0300 |
commit | e5ffefe606092c848e25894ccead21f0de42510f (patch) | |
tree | 8c8ce3f367ca0c2637f3ec5d4cb3f4e9c9c50d42 /source/blender/compositor/nodes | |
parent | b5f70d92c25693e05c8ecbd79c76e5bb35a7ceb5 (diff) |
Cleanup: Use enum class for DataType.
Diffstat (limited to 'source/blender/compositor/nodes')
5 files changed, 33 insertions, 33 deletions
diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cc b/source/blender/compositor/nodes/COM_CryptomatteNode.cc index 4c698b5609f..504266da5d7 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.cc +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cc @@ -125,7 +125,7 @@ void CryptomatteNode::input_operations_from_render_source( const std::string combined_name = combined_layer_pass_name(render_layer, render_pass); if (blender::StringRef(combined_name).startswith(prefix)) { RenderLayersProg *op = new RenderLayersProg( - render_pass->name, COM_DT_COLOR, render_pass->channels); + render_pass->name, DataType::Color, render_pass->channels); op->setScene(scene); op->setLayerId(cryptomatte_layer_id); op->setRenderData(context.getRenderData()); diff --git a/source/blender/compositor/nodes/COM_ImageNode.cc b/source/blender/compositor/nodes/COM_ImageNode.cc index 69729e018d7..711399ccd63 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cc +++ b/source/blender/compositor/nodes/COM_ImageNode.cc @@ -46,13 +46,13 @@ NodeOperation *ImageNode::doMultilayerCheck(NodeConverter &converter, NodeOutput *outputSocket = this->getOutputSocket(outputsocketIndex); MultilayerBaseOperation *operation = nullptr; switch (datatype) { - case COM_DT_VALUE: + case DataType::Value: operation = new MultilayerValueOperation(render_layer, render_pass, view); break; - case COM_DT_VECTOR: + case DataType::Vector: operation = new MultilayerVectorOperation(render_layer, render_pass, view); break; - case COM_DT_COLOR: + case DataType::Color: operation = new MultilayerColorOperation(render_layer, render_pass, view); break; default: @@ -137,7 +137,7 @@ void ImageNode::convertToOperations(NodeConverter &converter, framenumber, index, view, - COM_DT_VALUE); + DataType::Value); break; /* using image operations for both 3 and 4 channels (RGB and RGBA respectively) */ /* XXX any way to detect actual vector images? */ @@ -150,7 +150,7 @@ void ImageNode::convertToOperations(NodeConverter &converter, framenumber, index, view, - COM_DT_VECTOR); + DataType::Vector); break; case 4: operation = doMultilayerCheck(converter, @@ -161,7 +161,7 @@ void ImageNode::convertToOperations(NodeConverter &converter, framenumber, index, view, - COM_DT_COLOR); + DataType::Color); break; default: /* dummy operation is added below */ @@ -263,13 +263,13 @@ void ImageNode::convertToOperations(NodeConverter &converter, NodeOutput *output = this->getOutputSocket(i); NodeOperation *operation = nullptr; switch (output->getDataType()) { - case COM_DT_VALUE: { + case DataType::Value: { SetValueOperation *valueoperation = new SetValueOperation(); valueoperation->setValue(0.0f); operation = valueoperation; break; } - case COM_DT_VECTOR: { + case DataType::Vector: { SetVectorOperation *vectoroperation = new SetVectorOperation(); vectoroperation->setX(0.0f); vectoroperation->setY(0.0f); @@ -277,7 +277,7 @@ void ImageNode::convertToOperations(NodeConverter &converter, operation = vectoroperation; break; } - case COM_DT_COLOR: { + case DataType::Color: { SetColorOperation *coloroperation = new SetColorOperation(); coloroperation->setChannel1(0.0f); coloroperation->setChannel2(0.0f); diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cc b/source/blender/compositor/nodes/COM_RenderLayersNode.cc index 6be86c04c4d..ea3eeb13393 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.cc +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cc @@ -86,28 +86,28 @@ void RenderLayersNode::testRenderLink(NodeConverter &converter, 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); + operation = new RenderLayersAlphaProg(rpass->name, DataType::Value, rpass->channels); is_preview = false; } else if (STREQ(rpass->name, RE_PASSNAME_Z)) { - operation = new RenderLayersDepthProg(rpass->name, COM_DT_VALUE, rpass->channels); + operation = new RenderLayersDepthProg(rpass->name, DataType::Value, rpass->channels); is_preview = false; } else { DataType type; switch (rpass->channels) { case 4: - type = COM_DT_COLOR; + type = DataType::Color; break; case 3: - type = COM_DT_VECTOR; + type = DataType::Vector; break; case 1: - type = COM_DT_VALUE; + type = DataType::Value; break; default: BLI_assert(!"Unexpected number of channels for pass"); - type = COM_DT_VALUE; + type = DataType::Value; break; } operation = new RenderLayersProg(rpass->name, type, rpass->channels); @@ -121,21 +121,21 @@ void RenderLayersNode::missingSocketLink(NodeConverter &converter, NodeOutput *o { NodeOperation *operation; switch (output->getDataType()) { - case COM_DT_COLOR: { + case DataType::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: { + case DataType::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: { + case DataType::Value: { SetValueOperation *value_operation = new SetValueOperation(); value_operation->setValue(0.0f); operation = value_operation; diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.cc b/source/blender/compositor/nodes/COM_SocketProxyNode.cc index a84dbf680fe..93d8d399cad 100644 --- a/source/blender/compositor/nodes/COM_SocketProxyNode.cc +++ b/source/blender/compositor/nodes/COM_SocketProxyNode.cc @@ -33,21 +33,21 @@ SocketProxyNode::SocketProxyNode(bNode *editorNode, { DataType dt; - dt = COM_DT_VALUE; + dt = DataType::Value; if (editorInput->type == SOCK_RGBA) { - dt = COM_DT_COLOR; + dt = DataType::Color; } if (editorInput->type == SOCK_VECTOR) { - dt = COM_DT_VECTOR; + dt = DataType::Vector; } this->addInputSocket(dt, editorInput); - dt = COM_DT_VALUE; + dt = DataType::Value; if (editorOutput->type == SOCK_RGBA) { - dt = COM_DT_COLOR; + dt = DataType::Color; } if (editorOutput->type == SOCK_VECTOR) { - dt = COM_DT_VECTOR; + dt = DataType::Vector; } this->addOutputSocket(dt, editorOutput); } @@ -66,21 +66,21 @@ SocketBufferNode::SocketBufferNode(bNode *editorNode, { DataType dt; - dt = COM_DT_VALUE; + dt = DataType::Value; if (editorInput->type == SOCK_RGBA) { - dt = COM_DT_COLOR; + dt = DataType::Color; } if (editorInput->type == SOCK_VECTOR) { - dt = COM_DT_VECTOR; + dt = DataType::Vector; } this->addInputSocket(dt, editorInput); - dt = COM_DT_VALUE; + dt = DataType::Value; if (editorOutput->type == SOCK_RGBA) { - dt = COM_DT_COLOR; + dt = DataType::Color; } if (editorOutput->type == SOCK_VECTOR) { - dt = COM_DT_VECTOR; + dt = DataType::Vector; } this->addOutputSocket(dt, editorOutput); } diff --git a/source/blender/compositor/nodes/COM_TranslateNode.cc b/source/blender/compositor/nodes/COM_TranslateNode.cc index 0e9bf825787..13a73953ea0 100644 --- a/source/blender/compositor/nodes/COM_TranslateNode.cc +++ b/source/blender/compositor/nodes/COM_TranslateNode.cc @@ -55,8 +55,8 @@ void TranslateNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(outputSocket, operation->getOutputSocket(0)); if (data->wrap_axis) { - WriteBufferOperation *writeOperation = new WriteBufferOperation(COM_DT_COLOR); - WrapOperation *wrapOperation = new WrapOperation(COM_DT_COLOR); + WriteBufferOperation *writeOperation = new WriteBufferOperation(DataType::Color); + WrapOperation *wrapOperation = new WrapOperation(DataType::Color); wrapOperation->setMemoryProxy(writeOperation->getMemoryProxy()); wrapOperation->setWrapping(data->wrap_axis); |