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 | |
parent | b5f70d92c25693e05c8ecbd79c76e5bb35a7ceb5 (diff) |
Cleanup: Use enum class for DataType.
Diffstat (limited to 'source/blender')
111 files changed, 400 insertions, 399 deletions
diff --git a/source/blender/compositor/COM_defines.h b/source/blender/compositor/COM_defines.h index e08c0e5fe8e..6aa42c45212 100644 --- a/source/blender/compositor/COM_defines.h +++ b/source/blender/compositor/COM_defines.h @@ -22,14 +22,14 @@ * \brief possible data types for sockets * \ingroup Model */ -typedef enum DataType { +enum class DataType { /** \brief Value data type */ - COM_DT_VALUE = 1, + Value = 0, /** \brief Vector data type */ - COM_DT_VECTOR = 2, + Vector = 1, /** \brief Color data type */ - COM_DT_COLOR = 4, -} DataType; + Color = 2, +}; /** * \brief Possible quality settings diff --git a/source/blender/compositor/intern/COM_Converter.cc b/source/blender/compositor/intern/COM_Converter.cc index 91439f54710..d5bce636b8c 100644 --- a/source/blender/compositor/intern/COM_Converter.cc +++ b/source/blender/compositor/intern/COM_Converter.cc @@ -428,22 +428,22 @@ NodeOperation *COM_convert_data_type(const NodeOperationOutput &from, const Node const DataType src_data_type = from.getDataType(); const DataType dst_data_type = to.getDataType(); - if (src_data_type == COM_DT_VALUE && dst_data_type == COM_DT_COLOR) { + if (src_data_type == DataType::Value && dst_data_type == DataType::Color) { return new ConvertValueToColorOperation(); } - if (src_data_type == COM_DT_VALUE && dst_data_type == COM_DT_VECTOR) { + if (src_data_type == DataType::Value && dst_data_type == DataType::Vector) { return new ConvertValueToVectorOperation(); } - if (src_data_type == COM_DT_COLOR && dst_data_type == COM_DT_VALUE) { + if (src_data_type == DataType::Color && dst_data_type == DataType::Value) { return new ConvertColorToValueOperation(); } - if (src_data_type == COM_DT_COLOR && dst_data_type == COM_DT_VECTOR) { + if (src_data_type == DataType::Color && dst_data_type == DataType::Vector) { return new ConvertColorToVectorOperation(); } - if (src_data_type == COM_DT_VECTOR && dst_data_type == COM_DT_VALUE) { + if (src_data_type == DataType::Vector && dst_data_type == DataType::Value) { return new ConvertVectorToValueOperation(); } - if (src_data_type == COM_DT_VECTOR && dst_data_type == COM_DT_COLOR) { + if (src_data_type == DataType::Vector && dst_data_type == DataType::Color) { return new ConvertVectorToColorOperation(); } diff --git a/source/blender/compositor/intern/COM_Debug.cc b/source/blender/compositor/intern/COM_Debug.cc index c97d3a4a00a..c299bd1c72d 100644 --- a/source/blender/compositor/intern/COM_Debug.cc +++ b/source/blender/compositor/intern/COM_Debug.cc @@ -165,13 +165,13 @@ int DebugInfo::graphviz_operation(const ExecutionSystem *system, } len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "<IN_%p>", socket); switch (socket->getDataType()) { - case COM_DT_VALUE: + case DataType::Value: len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Value"); break; - case COM_DT_VECTOR: + case DataType::Vector: len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Vector"); break; - case COM_DT_COLOR: + case DataType::Color: len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Color"); break; } @@ -203,13 +203,13 @@ int DebugInfo::graphviz_operation(const ExecutionSystem *system, } len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "<OUT_%p>", socket); switch (socket->getDataType()) { - case COM_DT_VALUE: + case DataType::Value: len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Value"); break; - case COM_DT_VECTOR: + case DataType::Vector: len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Vector"); break; - case COM_DT_COLOR: + case DataType::Color: len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Color"); break; } @@ -390,13 +390,13 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma std::string color; switch (from->getDataType()) { - case COM_DT_VALUE: + case DataType::Value: color = "gray"; break; - case COM_DT_VECTOR: + case DataType::Vector: color = "blue"; break; - case COM_DT_COLOR: + case DataType::Color: color = "orange"; break; } diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h index 9a51baf55d7..6a50cc6906b 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.h +++ b/source/blender/compositor/intern/COM_ExecutionSystem.h @@ -64,8 +64,8 @@ class ExecutionGroup; * \see NodeOperation base class for all operations in the system * * \section EM_Step3 Step3: add additional conversions to the operation system - * - Data type conversions: the system has 3 data types COM_DT_VALUE, COM_DT_VECTOR, - * COM_DT_COLOR. The user can connect a Value socket to a color socket. As values are ordered + * - Data type conversions: the system has 3 data types DataType::Value, DataType::Vector, + * DataType::Color. The user can connect a Value socket to a color socket. As values are ordered * differently than colors a conversion happens. * * - Image size conversions: the system can automatically convert when resolutions do not match. diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cc b/source/blender/compositor/intern/COM_MemoryBuffer.cc index 17a73efeab2..60f74e2ae2f 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.cc +++ b/source/blender/compositor/intern/COM_MemoryBuffer.cc @@ -23,11 +23,11 @@ static unsigned int determine_num_channels(DataType datatype) { switch (datatype) { - case COM_DT_VALUE: + case DataType::Value: return COM_NUM_CHANNELS_VALUE; - case COM_DT_VECTOR: + case DataType::Vector: return COM_NUM_CHANNELS_VECTOR; - case COM_DT_COLOR: + case DataType::Color: default: return COM_NUM_CHANNELS_COLOR; } @@ -204,7 +204,7 @@ static void read_ewa_pixel_sampled(void *userdata, int x, int y, float result[4] void MemoryBuffer::readEWA(float *result, const float uv[2], const float derivatives[2][2]) { - BLI_assert(this->m_datatype == COM_DT_COLOR); + BLI_assert(this->m_datatype == DataType::Color); float inv_width = 1.0f / (float)this->getWidth(), inv_height = 1.0f / (float)this->getHeight(); /* TODO(sergey): Render pipeline uses normalized coordinates and derivatives, * but compositor uses pixel space. For now let's just divide the values and diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h index 41e4b86bdd2..77661f54db5 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.h +++ b/source/blender/compositor/intern/COM_MemoryBuffer.h @@ -60,7 +60,7 @@ class MemoryBuffer { MemoryProxy *m_memoryProxy; /** - * \brief the type of buffer COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR + * \brief the type of buffer DataType::Value, DataType::Vector, DataType::Color */ DataType m_datatype; diff --git a/source/blender/compositor/intern/COM_Node.cc b/source/blender/compositor/intern/COM_Node.cc index 665b4720b23..819f1c02b14 100644 --- a/source/blender/compositor/intern/COM_Node.cc +++ b/source/blender/compositor/intern/COM_Node.cc @@ -45,12 +45,12 @@ Node::Node(bNode *editorNode, bool create_sockets) if (create_sockets) { bNodeSocket *input = (bNodeSocket *)editorNode->inputs.first; while (input != nullptr) { - DataType dt = COM_DT_VALUE; + DataType dt = DataType::Value; if (input->type == SOCK_RGBA) { - dt = COM_DT_COLOR; + dt = DataType::Color; } if (input->type == SOCK_VECTOR) { - dt = COM_DT_VECTOR; + dt = DataType::Vector; } this->addInputSocket(dt, input); @@ -58,12 +58,12 @@ Node::Node(bNode *editorNode, bool create_sockets) } bNodeSocket *output = (bNodeSocket *)editorNode->outputs.first; while (output != nullptr) { - DataType dt = COM_DT_VALUE; + DataType dt = DataType::Value; if (output->type == SOCK_RGBA) { - dt = COM_DT_COLOR; + dt = DataType::Color; } if (output->type == SOCK_VECTOR) { - dt = COM_DT_VECTOR; + dt = DataType::Vector; } this->addOutputSocket(dt, output); diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc index 492f7cb8768..818f2e4bcf6 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc @@ -297,7 +297,7 @@ void NodeOperationBuilder::add_input_constant_value(NodeOperationInput *input, const NodeInput *node_input) { switch (input->getDataType()) { - case COM_DT_VALUE: { + case DataType::Value: { float value; if (node_input && node_input->getbNodeSocket()) { value = node_input->getEditorValueFloat(); @@ -312,7 +312,7 @@ void NodeOperationBuilder::add_input_constant_value(NodeOperationInput *input, addLink(op->getOutputSocket(), input); break; } - case COM_DT_COLOR: { + case DataType::Color: { float value[4]; if (node_input && node_input->getbNodeSocket()) { node_input->getEditorValueColor(value); @@ -327,7 +327,7 @@ void NodeOperationBuilder::add_input_constant_value(NodeOperationInput *input, addLink(op->getOutputSocket(), input); break; } - case COM_DT_VECTOR: { + case DataType::Vector: { float value[3]; if (node_input && node_input->getbNodeSocket()) { node_input->getEditorValueVector(value); 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); diff --git a/source/blender/compositor/operations/COM_AntiAliasOperation.cc b/source/blender/compositor/operations/COM_AntiAliasOperation.cc index 684485c40cb..740cd3ff609 100644 --- a/source/blender/compositor/operations/COM_AntiAliasOperation.cc +++ b/source/blender/compositor/operations/COM_AntiAliasOperation.cc @@ -114,8 +114,8 @@ static int extrapolate9(float *E0, AntiAliasOperation::AntiAliasOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->m_valueReader = nullptr; this->setComplex(true); } diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.cc b/source/blender/compositor/operations/COM_BilateralBlurOperation.cc index 35b0092fa5f..d04fade2e93 100644 --- a/source/blender/compositor/operations/COM_BilateralBlurOperation.cc +++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.cc @@ -23,9 +23,9 @@ BilateralBlurOperation::BilateralBlurOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->setComplex(true); this->m_inputColorProgram = nullptr; diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.cc b/source/blender/compositor/operations/COM_BlurBaseOperation.cc index 612a71037f7..fe6ca1cfd4e 100644 --- a/source/blender/compositor/operations/COM_BlurBaseOperation.cc +++ b/source/blender/compositor/operations/COM_BlurBaseOperation.cc @@ -24,9 +24,9 @@ BlurBaseOperation::BlurBaseOperation(DataType data_type) { - /* data_type is almost always COM_DT_COLOR except for alpha-blur */ + /* data_type is almost always DataType::Color except for alpha-blur */ this->addInputSocket(data_type); - this->addInputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); this->addOutputSocket(data_type); this->setComplex(true); this->m_inputProgram = nullptr; diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.cc b/source/blender/compositor/operations/COM_BokehBlurOperation.cc index a8ad2a11790..b0ab3906b60 100644 --- a/source/blender/compositor/operations/COM_BokehBlurOperation.cc +++ b/source/blender/compositor/operations/COM_BokehBlurOperation.cc @@ -24,11 +24,11 @@ BokehBlurOperation::BokehBlurOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Color, COM_SC_NO_RESIZE); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->setComplex(true); this->setOpenCL(true); diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.cc b/source/blender/compositor/operations/COM_BokehImageOperation.cc index 473a43c1776..01f8c81b3b7 100644 --- a/source/blender/compositor/operations/COM_BokehImageOperation.cc +++ b/source/blender/compositor/operations/COM_BokehImageOperation.cc @@ -21,7 +21,7 @@ BokehImageOperation::BokehImageOperation() { - this->addOutputSocket(COM_DT_COLOR); + this->addOutputSocket(DataType::Color); this->m_deleteData = false; } void BokehImageOperation::initExecution() diff --git a/source/blender/compositor/operations/COM_BoxMaskOperation.cc b/source/blender/compositor/operations/COM_BoxMaskOperation.cc index bb10f3425e2..51b1ea98456 100644 --- a/source/blender/compositor/operations/COM_BoxMaskOperation.cc +++ b/source/blender/compositor/operations/COM_BoxMaskOperation.cc @@ -22,9 +22,9 @@ BoxMaskOperation::BoxMaskOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->m_inputMask = nullptr; this->m_inputValue = nullptr; this->m_cosine = 0.0f; diff --git a/source/blender/compositor/operations/COM_BrightnessOperation.cc b/source/blender/compositor/operations/COM_BrightnessOperation.cc index 3ae1b4aaef4..3a6ddd178e8 100644 --- a/source/blender/compositor/operations/COM_BrightnessOperation.cc +++ b/source/blender/compositor/operations/COM_BrightnessOperation.cc @@ -20,10 +20,10 @@ BrightnessOperation::BrightnessOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->m_inputProgram = nullptr; this->m_use_premultiply = false; } diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.cc b/source/blender/compositor/operations/COM_CalculateMeanOperation.cc index 9ccf9d7f1ef..fdeecd0cb29 100644 --- a/source/blender/compositor/operations/COM_CalculateMeanOperation.cc +++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.cc @@ -24,8 +24,8 @@ CalculateMeanOperation::CalculateMeanOperation() { - this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Color, COM_SC_NO_RESIZE); + this->addOutputSocket(DataType::Value); this->m_imageReader = nullptr; this->m_iscalculated = false; this->m_setting = 1; diff --git a/source/blender/compositor/operations/COM_ChangeHSVOperation.cc b/source/blender/compositor/operations/COM_ChangeHSVOperation.cc index 6bc9fa53c31..e53a416f0dd 100644 --- a/source/blender/compositor/operations/COM_ChangeHSVOperation.cc +++ b/source/blender/compositor/operations/COM_ChangeHSVOperation.cc @@ -20,11 +20,11 @@ ChangeHSVOperation::ChangeHSVOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->m_inputOperation = nullptr; } diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.cc b/source/blender/compositor/operations/COM_ChannelMatteOperation.cc index 15375589888..98105a9dfde 100644 --- a/source/blender/compositor/operations/COM_ChannelMatteOperation.cc +++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.cc @@ -21,8 +21,8 @@ ChannelMatteOperation::ChannelMatteOperation() { - addInputSocket(COM_DT_COLOR); - addOutputSocket(COM_DT_VALUE); + addInputSocket(DataType::Color); + addOutputSocket(DataType::Value); this->m_inputImageProgram = nullptr; } diff --git a/source/blender/compositor/operations/COM_ChromaMatteOperation.cc b/source/blender/compositor/operations/COM_ChromaMatteOperation.cc index 52de0198a00..09bf9c76e55 100644 --- a/source/blender/compositor/operations/COM_ChromaMatteOperation.cc +++ b/source/blender/compositor/operations/COM_ChromaMatteOperation.cc @@ -21,9 +21,9 @@ ChromaMatteOperation::ChromaMatteOperation() { - addInputSocket(COM_DT_COLOR); - addInputSocket(COM_DT_COLOR); - addOutputSocket(COM_DT_VALUE); + addInputSocket(DataType::Color); + addInputSocket(DataType::Color); + addOutputSocket(DataType::Value); this->m_inputImageProgram = nullptr; this->m_inputKeyProgram = nullptr; diff --git a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc index 44eef1e19cd..b21e453699b 100644 --- a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc +++ b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc @@ -33,9 +33,9 @@ inline float colorbalance_cdl(float in, float offset, float power, float slope) ColorBalanceASCCDLOperation::ColorBalanceASCCDLOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_inputValueOperation = nullptr; this->m_inputColorOperation = nullptr; this->setResolutionInputSocketIndex(1); diff --git a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc index 4b8e1aa0d1b..b6ff636bce9 100644 --- a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc +++ b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc @@ -38,9 +38,9 @@ inline float colorbalance_lgg(float in, float lift_lgg, float gamma_inv, float g ColorBalanceLGGOperation::ColorBalanceLGGOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_inputValueOperation = nullptr; this->m_inputColorOperation = nullptr; this->setResolutionInputSocketIndex(1); diff --git a/source/blender/compositor/operations/COM_ColorCorrectionOperation.cc b/source/blender/compositor/operations/COM_ColorCorrectionOperation.cc index 02c109e8acd..b2578451180 100644 --- a/source/blender/compositor/operations/COM_ColorCorrectionOperation.cc +++ b/source/blender/compositor/operations/COM_ColorCorrectionOperation.cc @@ -23,9 +23,9 @@ ColorCorrectionOperation::ColorCorrectionOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->m_inputImage = nullptr; this->m_inputMask = nullptr; this->m_redChannelEnabled = true; diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.cc b/source/blender/compositor/operations/COM_ColorCurveOperation.cc index ed107a88953..35218cef7cc 100644 --- a/source/blender/compositor/operations/COM_ColorCurveOperation.cc +++ b/source/blender/compositor/operations/COM_ColorCurveOperation.cc @@ -24,11 +24,11 @@ ColorCurveOperation::ColorCurveOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_inputFacProgram = nullptr; this->m_inputImageProgram = nullptr; @@ -100,9 +100,9 @@ void ColorCurveOperation::deinitExecution() ConstantLevelColorCurveOperation::ConstantLevelColorCurveOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_inputFacProgram = nullptr; this->m_inputImageProgram = nullptr; diff --git a/source/blender/compositor/operations/COM_ColorExposureOperation.cc b/source/blender/compositor/operations/COM_ColorExposureOperation.cc index a11039852a1..0e24620846e 100644 --- a/source/blender/compositor/operations/COM_ColorExposureOperation.cc +++ b/source/blender/compositor/operations/COM_ColorExposureOperation.cc @@ -20,9 +20,9 @@ ExposureOperation::ExposureOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->m_inputProgram = nullptr; } diff --git a/source/blender/compositor/operations/COM_ColorMatteOperation.cc b/source/blender/compositor/operations/COM_ColorMatteOperation.cc index 17ada8d89b2..cc7a81f68d1 100644 --- a/source/blender/compositor/operations/COM_ColorMatteOperation.cc +++ b/source/blender/compositor/operations/COM_ColorMatteOperation.cc @@ -21,9 +21,9 @@ ColorMatteOperation::ColorMatteOperation() { - addInputSocket(COM_DT_COLOR); - addInputSocket(COM_DT_COLOR); - addOutputSocket(COM_DT_VALUE); + addInputSocket(DataType::Color); + addInputSocket(DataType::Color); + addOutputSocket(DataType::Value); this->m_inputImageProgram = nullptr; this->m_inputKeyProgram = nullptr; diff --git a/source/blender/compositor/operations/COM_ColorRampOperation.cc b/source/blender/compositor/operations/COM_ColorRampOperation.cc index 4d62a293b78..4fde951fd3c 100644 --- a/source/blender/compositor/operations/COM_ColorRampOperation.cc +++ b/source/blender/compositor/operations/COM_ColorRampOperation.cc @@ -22,8 +22,8 @@ ColorRampOperation::ColorRampOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->m_inputProgram = nullptr; this->m_colorBand = nullptr; diff --git a/source/blender/compositor/operations/COM_ColorSpillOperation.cc b/source/blender/compositor/operations/COM_ColorSpillOperation.cc index 8139d71c637..8e8eaabfc6b 100644 --- a/source/blender/compositor/operations/COM_ColorSpillOperation.cc +++ b/source/blender/compositor/operations/COM_ColorSpillOperation.cc @@ -22,9 +22,9 @@ ColorSpillOperation::ColorSpillOperation() { - addInputSocket(COM_DT_COLOR); - addInputSocket(COM_DT_VALUE); - addOutputSocket(COM_DT_COLOR); + addInputSocket(DataType::Color); + addInputSocket(DataType::Value); + addOutputSocket(DataType::Color); this->m_inputImageReader = nullptr; this->m_inputFacReader = nullptr; diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cc b/source/blender/compositor/operations/COM_CompositorOperation.cc index 6a16872cae2..0454bae8b38 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cc +++ b/source/blender/compositor/operations/COM_CompositorOperation.cc @@ -33,9 +33,9 @@ CompositorOperation::CompositorOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); this->setRenderData(nullptr); this->m_outputBuffer = nullptr; diff --git a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cc b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cc index 44468e04ae9..431f0e9c880 100644 --- a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cc +++ b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cc @@ -22,8 +22,8 @@ ConvertColorProfileOperation::ConvertColorProfileOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_inputOperation = nullptr; this->m_predivided = false; } diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc index abf423cc48a..17b351cb14c 100644 --- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc +++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc @@ -23,8 +23,8 @@ ConvertDepthToRadiusOperation::ConvertDepthToRadiusOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->m_inputOperation = nullptr; this->m_fStop = 128.0f; this->m_cameraObject = nullptr; diff --git a/source/blender/compositor/operations/COM_ConvertOperation.cc b/source/blender/compositor/operations/COM_ConvertOperation.cc index cccfd407752..648b3f0b30a 100644 --- a/source/blender/compositor/operations/COM_ConvertOperation.cc +++ b/source/blender/compositor/operations/COM_ConvertOperation.cc @@ -39,8 +39,8 @@ void ConvertBaseOperation::deinitExecution() ConvertValueToColorOperation::ConvertValueToColorOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); } void ConvertValueToColorOperation::executePixelSampled(float output[4], @@ -58,8 +58,8 @@ void ConvertValueToColorOperation::executePixelSampled(float output[4], ConvertColorToValueOperation::ConvertColorToValueOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Value); } void ConvertColorToValueOperation::executePixelSampled(float output[4], @@ -76,8 +76,8 @@ void ConvertColorToValueOperation::executePixelSampled(float output[4], ConvertColorToBWOperation::ConvertColorToBWOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Value); } void ConvertColorToBWOperation::executePixelSampled(float output[4], @@ -94,8 +94,8 @@ void ConvertColorToBWOperation::executePixelSampled(float output[4], ConvertColorToVectorOperation::ConvertColorToVectorOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_VECTOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Vector); } void ConvertColorToVectorOperation::executePixelSampled(float output[4], @@ -112,8 +112,8 @@ void ConvertColorToVectorOperation::executePixelSampled(float output[4], ConvertValueToVectorOperation::ConvertValueToVectorOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VECTOR); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Vector); } void ConvertValueToVectorOperation::executePixelSampled(float output[4], @@ -130,8 +130,8 @@ void ConvertValueToVectorOperation::executePixelSampled(float output[4], ConvertVectorToColorOperation::ConvertVectorToColorOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_VECTOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Vector); + this->addOutputSocket(DataType::Color); } void ConvertVectorToColorOperation::executePixelSampled(float output[4], @@ -147,8 +147,8 @@ void ConvertVectorToColorOperation::executePixelSampled(float output[4], ConvertVectorToValueOperation::ConvertVectorToValueOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_VECTOR); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Vector); + this->addOutputSocket(DataType::Value); } void ConvertVectorToValueOperation::executePixelSampled(float output[4], @@ -165,8 +165,8 @@ void ConvertVectorToValueOperation::executePixelSampled(float output[4], ConvertRGBToYCCOperation::ConvertRGBToYCCOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); } void ConvertRGBToYCCOperation::setMode(int mode) @@ -207,8 +207,8 @@ void ConvertRGBToYCCOperation::executePixelSampled(float output[4], ConvertYCCToRGBOperation::ConvertYCCToRGBOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); } void ConvertYCCToRGBOperation::setMode(int mode) @@ -253,8 +253,8 @@ void ConvertYCCToRGBOperation::executePixelSampled(float output[4], ConvertRGBToYUVOperation::ConvertRGBToYUVOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); } void ConvertRGBToYUVOperation::executePixelSampled(float output[4], @@ -278,8 +278,8 @@ void ConvertRGBToYUVOperation::executePixelSampled(float output[4], ConvertYUVToRGBOperation::ConvertYUVToRGBOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); } void ConvertYUVToRGBOperation::executePixelSampled(float output[4], @@ -303,8 +303,8 @@ void ConvertYUVToRGBOperation::executePixelSampled(float output[4], ConvertRGBToHSVOperation::ConvertRGBToHSVOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); } void ConvertRGBToHSVOperation::executePixelSampled(float output[4], @@ -322,8 +322,8 @@ void ConvertRGBToHSVOperation::executePixelSampled(float output[4], ConvertHSVToRGBOperation::ConvertHSVToRGBOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); } void ConvertHSVToRGBOperation::executePixelSampled(float output[4], @@ -344,8 +344,8 @@ void ConvertHSVToRGBOperation::executePixelSampled(float output[4], ConvertPremulToStraightOperation::ConvertPremulToStraightOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); } void ConvertPremulToStraightOperation::executePixelSampled(float output[4], @@ -374,8 +374,8 @@ void ConvertPremulToStraightOperation::executePixelSampled(float output[4], ConvertStraightToPremulOperation::ConvertStraightToPremulOperation() : ConvertBaseOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); } void ConvertStraightToPremulOperation::executePixelSampled(float output[4], @@ -399,8 +399,8 @@ void ConvertStraightToPremulOperation::executePixelSampled(float output[4], SeparateChannelOperation::SeparateChannelOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Value); this->m_inputOperation = nullptr; } void SeparateChannelOperation::initExecution() @@ -427,11 +427,11 @@ void SeparateChannelOperation::executePixelSampled(float output[4], CombineChannelsOperation::CombineChannelsOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->setResolutionInputSocketIndex(0); this->m_inputChannel1Operation = nullptr; this->m_inputChannel2Operation = nullptr; diff --git a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc index 425e87ffa7e..f80144fb06d 100644 --- a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc +++ b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc @@ -24,9 +24,9 @@ ConvolutionFilterOperation::ConvolutionFilterOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->setResolutionInputSocketIndex(0); this->m_inputOperation = nullptr; this->setComplex(true); diff --git a/source/blender/compositor/operations/COM_CropOperation.cc b/source/blender/compositor/operations/COM_CropOperation.cc index 9364557169c..55a1e505ec8 100644 --- a/source/blender/compositor/operations/COM_CropOperation.cc +++ b/source/blender/compositor/operations/COM_CropOperation.cc @@ -21,8 +21,8 @@ CropBaseOperation::CropBaseOperation() { - this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color, COM_SC_NO_RESIZE); + this->addOutputSocket(DataType::Color); this->m_inputOperation = nullptr; this->m_settings = nullptr; } diff --git a/source/blender/compositor/operations/COM_CryptomatteOperation.cc b/source/blender/compositor/operations/COM_CryptomatteOperation.cc index ccd291697cf..8d42a756f51 100644 --- a/source/blender/compositor/operations/COM_CryptomatteOperation.cc +++ b/source/blender/compositor/operations/COM_CryptomatteOperation.cc @@ -21,10 +21,10 @@ CryptomatteOperation::CryptomatteOperation(size_t num_inputs) { for (size_t i = 0; i < num_inputs; i++) { - this->addInputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); } inputs.resize(num_inputs); - this->addOutputSocket(COM_DT_COLOR); + this->addOutputSocket(DataType::Color); this->setComplex(true); } diff --git a/source/blender/compositor/operations/COM_DenoiseOperation.cc b/source/blender/compositor/operations/COM_DenoiseOperation.cc index d08f238c4c1..6a27dc4fd3d 100644 --- a/source/blender/compositor/operations/COM_DenoiseOperation.cc +++ b/source/blender/compositor/operations/COM_DenoiseOperation.cc @@ -28,10 +28,10 @@ static pthread_mutex_t oidn_lock = BLI_MUTEX_INITIALIZER; DenoiseOperation::DenoiseOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VECTOR); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Vector); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_settings = nullptr; } void DenoiseOperation::initExecution() @@ -60,7 +60,7 @@ MemoryBuffer *DenoiseOperation::createMemoryBuffer(rcti *rect2) rect.ymin = 0; rect.xmax = getWidth(); rect.ymax = getHeight(); - MemoryBuffer *result = new MemoryBuffer(COM_DT_COLOR, &rect); + MemoryBuffer *result = new MemoryBuffer(DataType::Color, &rect); float *data = result->getBuffer(); this->generateDenoise(data, tileColor, tileNormal, tileAlbedo, this->m_settings); return result; diff --git a/source/blender/compositor/operations/COM_DespeckleOperation.cc b/source/blender/compositor/operations/COM_DespeckleOperation.cc index b299c73eabb..813ae07a97a 100644 --- a/source/blender/compositor/operations/COM_DespeckleOperation.cc +++ b/source/blender/compositor/operations/COM_DespeckleOperation.cc @@ -24,9 +24,9 @@ DespeckleOperation::DespeckleOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->setResolutionInputSocketIndex(0); this->m_inputOperation = nullptr; this->setComplex(true); diff --git a/source/blender/compositor/operations/COM_DifferenceMatteOperation.cc b/source/blender/compositor/operations/COM_DifferenceMatteOperation.cc index cca99a42c0c..1ce91aeb4c3 100644 --- a/source/blender/compositor/operations/COM_DifferenceMatteOperation.cc +++ b/source/blender/compositor/operations/COM_DifferenceMatteOperation.cc @@ -21,9 +21,9 @@ DifferenceMatteOperation::DifferenceMatteOperation() { - addInputSocket(COM_DT_COLOR); - addInputSocket(COM_DT_COLOR); - addOutputSocket(COM_DT_VALUE); + addInputSocket(DataType::Color); + addInputSocket(DataType::Color); + addOutputSocket(DataType::Value); this->m_inputImage1Program = nullptr; this->m_inputImage2Program = nullptr; diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.cc b/source/blender/compositor/operations/COM_DilateErodeOperation.cc index fbe9fe8ea27..dc8792fc59a 100644 --- a/source/blender/compositor/operations/COM_DilateErodeOperation.cc +++ b/source/blender/compositor/operations/COM_DilateErodeOperation.cc @@ -25,8 +25,8 @@ // DilateErode Distance Threshold DilateErodeThresholdOperation::DilateErodeThresholdOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->setComplex(true); this->m_inputProgram = nullptr; this->m_inset = 0.0f; @@ -161,8 +161,8 @@ bool DilateErodeThresholdOperation::determineDependingAreaOfInterest( // Dilate Distance DilateDistanceOperation::DilateDistanceOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->setComplex(true); this->m_inputProgram = nullptr; this->m_distance = 0.0f; @@ -319,8 +319,8 @@ void ErodeDistanceOperation::executeOpenCL(OpenCLDevice *device, // Dilate step DilateStepOperation::DilateStepOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->setComplex(true); this->m_inputProgram = nullptr; } diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc index 3f0cd4ef255..1a2701a681d 100644 --- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc +++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc @@ -25,8 +25,8 @@ DirectionalBlurOperation::DirectionalBlurOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->setComplex(true); this->setOpenCL(true); diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.cc b/source/blender/compositor/operations/COM_DisplaceOperation.cc index fcc8bc4670e..12c7d29a210 100644 --- a/source/blender/compositor/operations/COM_DisplaceOperation.cc +++ b/source/blender/compositor/operations/COM_DisplaceOperation.cc @@ -22,11 +22,11 @@ DisplaceOperation::DisplaceOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VECTOR); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Vector); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->setComplex(true); this->m_inputColorProgram = nullptr; diff --git a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cc b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cc index bbc4d63305b..9d00c2cb148 100644 --- a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cc +++ b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cc @@ -22,11 +22,11 @@ DisplaceSimpleOperation::DisplaceSimpleOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VECTOR); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Vector); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->m_inputColorProgram = nullptr; this->m_inputVectorProgram = nullptr; diff --git a/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc b/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc index ecc2fc2e85f..ae024d497d6 100644 --- a/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc +++ b/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc @@ -21,9 +21,9 @@ DistanceRGBMatteOperation::DistanceRGBMatteOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Value); this->m_inputImageProgram = nullptr; this->m_inputKeyProgram = nullptr; diff --git a/source/blender/compositor/operations/COM_DotproductOperation.cc b/source/blender/compositor/operations/COM_DotproductOperation.cc index 5914be21453..c5b89bb7fae 100644 --- a/source/blender/compositor/operations/COM_DotproductOperation.cc +++ b/source/blender/compositor/operations/COM_DotproductOperation.cc @@ -20,9 +20,9 @@ DotproductOperation::DotproductOperation() { - this->addInputSocket(COM_DT_VECTOR); - this->addInputSocket(COM_DT_VECTOR); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Vector); + this->addInputSocket(DataType::Vector); + this->addOutputSocket(DataType::Value); this->setResolutionInputSocketIndex(0); this->m_input1Operation = nullptr; this->m_input2Operation = nullptr; diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc index b548a684ba5..4c7cbb3cc7e 100644 --- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc +++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc @@ -1308,9 +1308,9 @@ void DoubleEdgeMaskOperation::doDoubleEdgeMask(float *imask, float *omask, float DoubleEdgeMaskOperation::DoubleEdgeMaskOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->m_inputInnerMask = nullptr; this->m_inputOuterMask = nullptr; this->m_adjacentOnly = false; diff --git a/source/blender/compositor/operations/COM_EllipseMaskOperation.cc b/source/blender/compositor/operations/COM_EllipseMaskOperation.cc index a6985a40625..956b5e50edc 100644 --- a/source/blender/compositor/operations/COM_EllipseMaskOperation.cc +++ b/source/blender/compositor/operations/COM_EllipseMaskOperation.cc @@ -22,9 +22,9 @@ EllipseMaskOperation::EllipseMaskOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->m_inputMask = nullptr; this->m_inputValue = nullptr; this->m_cosine = 0.0f; diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc index b3c1b6b4413..c896cfcc49f 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc @@ -22,7 +22,7 @@ #include "COM_FastGaussianBlurOperation.h" #include "MEM_guardedalloc.h" -FastGaussianBlurOperation::FastGaussianBlurOperation() : BlurBaseOperation(COM_DT_COLOR) +FastGaussianBlurOperation::FastGaussianBlurOperation() : BlurBaseOperation(DataType::Color) { this->m_iirgaus = nullptr; } @@ -258,8 +258,8 @@ void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src, /// FastGaussianBlurValueOperation::FastGaussianBlurValueOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->m_iirgaus = nullptr; this->m_inputprogram = nullptr; this->m_sigma = 1.0f; diff --git a/source/blender/compositor/operations/COM_FlipOperation.cc b/source/blender/compositor/operations/COM_FlipOperation.cc index 37eaf4868d3..4837766b5eb 100644 --- a/source/blender/compositor/operations/COM_FlipOperation.cc +++ b/source/blender/compositor/operations/COM_FlipOperation.cc @@ -20,8 +20,8 @@ FlipOperation::FlipOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->setResolutionInputSocketIndex(0); this->m_inputOperation = nullptr; this->m_flipX = true; diff --git a/source/blender/compositor/operations/COM_GammaCorrectOperation.cc b/source/blender/compositor/operations/COM_GammaCorrectOperation.cc index d67d67f8e57..51c033498ef 100644 --- a/source/blender/compositor/operations/COM_GammaCorrectOperation.cc +++ b/source/blender/compositor/operations/COM_GammaCorrectOperation.cc @@ -21,8 +21,8 @@ GammaCorrectOperation::GammaCorrectOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_inputProgram = nullptr; } void GammaCorrectOperation::initExecution() @@ -63,8 +63,8 @@ void GammaCorrectOperation::deinitExecution() GammaUncorrectOperation::GammaUncorrectOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_inputProgram = nullptr; } void GammaUncorrectOperation::initExecution() diff --git a/source/blender/compositor/operations/COM_GammaOperation.cc b/source/blender/compositor/operations/COM_GammaOperation.cc index 6baa52a290c..327c5c24929 100644 --- a/source/blender/compositor/operations/COM_GammaOperation.cc +++ b/source/blender/compositor/operations/COM_GammaOperation.cc @@ -21,9 +21,9 @@ GammaOperation::GammaOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->m_inputProgram = nullptr; this->m_inputGammaProgram = nullptr; } diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc index 4d3efec7c85..1d3cce45e10 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc @@ -22,7 +22,7 @@ #include "RE_pipeline.h" -GaussianAlphaXBlurOperation::GaussianAlphaXBlurOperation() : BlurBaseOperation(COM_DT_VALUE) +GaussianAlphaXBlurOperation::GaussianAlphaXBlurOperation() : BlurBaseOperation(DataType::Value) { this->m_gausstab = nullptr; this->m_filtersize = 0; diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc index a722a879b8d..ce2e75db95c 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc @@ -22,7 +22,7 @@ #include "RE_pipeline.h" -GaussianAlphaYBlurOperation::GaussianAlphaYBlurOperation() : BlurBaseOperation(COM_DT_VALUE) +GaussianAlphaYBlurOperation::GaussianAlphaYBlurOperation() : BlurBaseOperation(DataType::Value) { this->m_gausstab = nullptr; this->m_filtersize = 0; diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cc index ca3173001cb..b83fceb038f 100644 --- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cc @@ -22,7 +22,7 @@ #include "RE_pipeline.h" -GaussianBokehBlurOperation::GaussianBokehBlurOperation() : BlurBaseOperation(COM_DT_COLOR) +GaussianBokehBlurOperation::GaussianBokehBlurOperation() : BlurBaseOperation(DataType::Color) { this->m_gausstab = nullptr; } @@ -195,7 +195,8 @@ bool GaussianBokehBlurOperation::determineDependingAreaOfInterest( } // reference image -GaussianBlurReferenceOperation::GaussianBlurReferenceOperation() : BlurBaseOperation(COM_DT_COLOR) +GaussianBlurReferenceOperation::GaussianBlurReferenceOperation() + : BlurBaseOperation(DataType::Color) { this->m_maintabs = nullptr; } diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cc index 596d439658c..b1c24edc9fd 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cc @@ -23,7 +23,7 @@ #include "RE_pipeline.h" -GaussianXBlurOperation::GaussianXBlurOperation() : BlurBaseOperation(COM_DT_COLOR) +GaussianXBlurOperation::GaussianXBlurOperation() : BlurBaseOperation(DataType::Color) { this->m_gausstab = nullptr; #ifdef BLI_HAVE_SSE2 diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc index 55c1551ca42..3800f2b8040 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc @@ -23,7 +23,7 @@ #include "RE_pipeline.h" -GaussianYBlurOperation::GaussianYBlurOperation() : BlurBaseOperation(COM_DT_COLOR) +GaussianYBlurOperation::GaussianYBlurOperation() : BlurBaseOperation(DataType::Color) { this->m_gausstab = nullptr; #ifdef BLI_HAVE_SSE2 diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.cc b/source/blender/compositor/operations/COM_GlareBaseOperation.cc index 7b4d38fba3e..7ad12d81ac2 100644 --- a/source/blender/compositor/operations/COM_GlareBaseOperation.cc +++ b/source/blender/compositor/operations/COM_GlareBaseOperation.cc @@ -21,8 +21,8 @@ GlareBaseOperation::GlareBaseOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_settings = nullptr; } void GlareBaseOperation::initExecution() @@ -45,7 +45,7 @@ MemoryBuffer *GlareBaseOperation::createMemoryBuffer(rcti *rect2) rect.ymin = 0; rect.xmax = getWidth(); rect.ymax = getHeight(); - MemoryBuffer *result = new MemoryBuffer(COM_DT_COLOR, &rect); + MemoryBuffer *result = new MemoryBuffer(DataType::Color, &rect); float *data = result->getBuffer(); this->generateGlare(data, tile, this->m_settings); return result; diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cc b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cc index 362905761bb..463080988a4 100644 --- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cc +++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cc @@ -268,7 +268,7 @@ static void convolve(float *dst, MemoryBuffer *in1, MemoryBuffer *in2) float *kernelBuffer = in2->getBuffer(); float *imageBuffer = in1->getBuffer(); - MemoryBuffer *rdst = new MemoryBuffer(COM_DT_COLOR, in1->getRect()); + MemoryBuffer *rdst = new MemoryBuffer(DataType::Color, in1->getRect()); memset(rdst->getBuffer(), 0, rdst->getWidth() * rdst->getHeight() * COM_NUM_CHANNELS_COLOR * sizeof(float)); @@ -417,7 +417,7 @@ void GlareFogGlowOperation::generateGlare(float *data, // make the convolution kernel rcti kernelRect; BLI_rcti_init(&kernelRect, 0, sz, 0, sz); - ckrn = new MemoryBuffer(COM_DT_COLOR, &kernelRect); + ckrn = new MemoryBuffer(DataType::Color, &kernelRect); scale = 0.25f * sqrtf((float)(sz * sz)); diff --git a/source/blender/compositor/operations/COM_GlareStreaksOperation.cc b/source/blender/compositor/operations/COM_GlareStreaksOperation.cc index 4fccb62e3df..e2d8c7ff68e 100644 --- a/source/blender/compositor/operations/COM_GlareStreaksOperation.cc +++ b/source/blender/compositor/operations/COM_GlareStreaksOperation.cc @@ -34,7 +34,7 @@ void GlareStreaksOperation::generateGlare(float *data, bool breaked = false; MemoryBuffer *tsrc = inputTile->duplicate(); - MemoryBuffer *tdst = new MemoryBuffer(COM_DT_COLOR, inputTile->getRect()); + MemoryBuffer *tdst = new MemoryBuffer(DataType::Color, inputTile->getRect()); tdst->clear(); memset(data, 0, size4 * sizeof(float)); diff --git a/source/blender/compositor/operations/COM_GlareThresholdOperation.cc b/source/blender/compositor/operations/COM_GlareThresholdOperation.cc index cfa4b99cd70..984b433469a 100644 --- a/source/blender/compositor/operations/COM_GlareThresholdOperation.cc +++ b/source/blender/compositor/operations/COM_GlareThresholdOperation.cc @@ -23,8 +23,8 @@ GlareThresholdOperation::GlareThresholdOperation() { - this->addInputSocket(COM_DT_COLOR, COM_SC_FIT); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color, COM_SC_FIT); + this->addOutputSocket(DataType::Color); this->m_inputProgram = nullptr; } diff --git a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cc b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cc index df30e75cf27..0ef15b2b3d7 100644 --- a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cc +++ b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cc @@ -24,8 +24,8 @@ HueSaturationValueCorrectOperation::HueSaturationValueCorrectOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_inputProgram = nullptr; } diff --git a/source/blender/compositor/operations/COM_IDMaskOperation.cc b/source/blender/compositor/operations/COM_IDMaskOperation.cc index 8113adb9bbc..8757908e354 100644 --- a/source/blender/compositor/operations/COM_IDMaskOperation.cc +++ b/source/blender/compositor/operations/COM_IDMaskOperation.cc @@ -20,8 +20,8 @@ IDMaskOperation::IDMaskOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->setComplex(true); } diff --git a/source/blender/compositor/operations/COM_ImageOperation.cc b/source/blender/compositor/operations/COM_ImageOperation.cc index ae5b7293a8c..06e8db7b467 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.cc +++ b/source/blender/compositor/operations/COM_ImageOperation.cc @@ -48,15 +48,15 @@ BaseImageOperation::BaseImageOperation() } ImageOperation::ImageOperation() : BaseImageOperation() { - this->addOutputSocket(COM_DT_COLOR); + this->addOutputSocket(DataType::Color); } ImageAlphaOperation::ImageAlphaOperation() : BaseImageOperation() { - this->addOutputSocket(COM_DT_VALUE); + this->addOutputSocket(DataType::Value); } ImageDepthOperation::ImageDepthOperation() : BaseImageOperation() { - this->addOutputSocket(COM_DT_VALUE); + this->addOutputSocket(DataType::Value); } ImBuf *BaseImageOperation::getImBuf() diff --git a/source/blender/compositor/operations/COM_InpaintOperation.cc b/source/blender/compositor/operations/COM_InpaintOperation.cc index 502b33d7e14..f4e38c85e50 100644 --- a/source/blender/compositor/operations/COM_InpaintOperation.cc +++ b/source/blender/compositor/operations/COM_InpaintOperation.cc @@ -29,8 +29,8 @@ // Inpaint (simple convolve using average of known pixels) InpaintSimpleOperation::InpaintSimpleOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->setComplex(true); this->m_inputImageProgram = nullptr; this->m_pixelorder = nullptr; diff --git a/source/blender/compositor/operations/COM_InvertOperation.cc b/source/blender/compositor/operations/COM_InvertOperation.cc index d9f436a3e28..53e32baaa3d 100644 --- a/source/blender/compositor/operations/COM_InvertOperation.cc +++ b/source/blender/compositor/operations/COM_InvertOperation.cc @@ -20,9 +20,9 @@ InvertOperation::InvertOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_inputValueProgram = nullptr; this->m_inputColorProgram = nullptr; this->m_color = true; diff --git a/source/blender/compositor/operations/COM_KeyingBlurOperation.cc b/source/blender/compositor/operations/COM_KeyingBlurOperation.cc index c9cc8ebc045..0d9613eea96 100644 --- a/source/blender/compositor/operations/COM_KeyingBlurOperation.cc +++ b/source/blender/compositor/operations/COM_KeyingBlurOperation.cc @@ -25,8 +25,8 @@ KeyingBlurOperation::KeyingBlurOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->m_size = 0; this->m_axis = BLUR_AXIS_X; diff --git a/source/blender/compositor/operations/COM_KeyingClipOperation.cc b/source/blender/compositor/operations/COM_KeyingClipOperation.cc index 592f116c451..e8556d9d8c9 100644 --- a/source/blender/compositor/operations/COM_KeyingClipOperation.cc +++ b/source/blender/compositor/operations/COM_KeyingClipOperation.cc @@ -25,8 +25,8 @@ KeyingClipOperation::KeyingClipOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->m_kernelRadius = 3; this->m_kernelTolerance = 0.1f; diff --git a/source/blender/compositor/operations/COM_KeyingDespillOperation.cc b/source/blender/compositor/operations/COM_KeyingDespillOperation.cc index f4d0d6c6a00..5caa450a878 100644 --- a/source/blender/compositor/operations/COM_KeyingDespillOperation.cc +++ b/source/blender/compositor/operations/COM_KeyingDespillOperation.cc @@ -25,9 +25,9 @@ KeyingDespillOperation::KeyingDespillOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_despillFactor = 0.5f; this->m_colorBalance = 0.5f; diff --git a/source/blender/compositor/operations/COM_KeyingOperation.cc b/source/blender/compositor/operations/COM_KeyingOperation.cc index 94e65181207..108b7c60874 100644 --- a/source/blender/compositor/operations/COM_KeyingOperation.cc +++ b/source/blender/compositor/operations/COM_KeyingOperation.cc @@ -41,9 +41,9 @@ static float get_pixel_saturation(const float pixelColor[4], KeyingOperation::KeyingOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Value); this->m_screenBalance = 0.5f; diff --git a/source/blender/compositor/operations/COM_KeyingScreenOperation.cc b/source/blender/compositor/operations/COM_KeyingScreenOperation.cc index 463a6fe49c0..801750d99d0 100644 --- a/source/blender/compositor/operations/COM_KeyingScreenOperation.cc +++ b/source/blender/compositor/operations/COM_KeyingScreenOperation.cc @@ -32,7 +32,7 @@ KeyingScreenOperation::KeyingScreenOperation() { - this->addOutputSocket(COM_DT_COLOR); + this->addOutputSocket(DataType::Color); this->m_movieClip = nullptr; this->m_framenumber = 0; this->m_trackingObject[0] = 0; diff --git a/source/blender/compositor/operations/COM_LuminanceMatteOperation.cc b/source/blender/compositor/operations/COM_LuminanceMatteOperation.cc index 2bd7493625e..43cc8f8bf71 100644 --- a/source/blender/compositor/operations/COM_LuminanceMatteOperation.cc +++ b/source/blender/compositor/operations/COM_LuminanceMatteOperation.cc @@ -23,8 +23,8 @@ LuminanceMatteOperation::LuminanceMatteOperation() { - addInputSocket(COM_DT_COLOR); - addOutputSocket(COM_DT_VALUE); + addInputSocket(DataType::Color); + addOutputSocket(DataType::Value); this->m_inputImageProgram = nullptr; } diff --git a/source/blender/compositor/operations/COM_MapRangeOperation.cc b/source/blender/compositor/operations/COM_MapRangeOperation.cc index 95b3c27ac2f..78ba446051e 100644 --- a/source/blender/compositor/operations/COM_MapRangeOperation.cc +++ b/source/blender/compositor/operations/COM_MapRangeOperation.cc @@ -20,12 +20,12 @@ MapRangeOperation::MapRangeOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->m_inputOperation = nullptr; this->m_useClamp = false; } diff --git a/source/blender/compositor/operations/COM_MapUVOperation.cc b/source/blender/compositor/operations/COM_MapUVOperation.cc index 32ab63ae028..7328de7f49f 100644 --- a/source/blender/compositor/operations/COM_MapUVOperation.cc +++ b/source/blender/compositor/operations/COM_MapUVOperation.cc @@ -21,9 +21,9 @@ MapUVOperation::MapUVOperation() { - this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE); - this->addInputSocket(COM_DT_VECTOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color, COM_SC_NO_RESIZE); + this->addInputSocket(DataType::Vector); + this->addOutputSocket(DataType::Color); this->m_alpha = 0.0f; this->setComplex(true); setResolutionInputSocketIndex(1); diff --git a/source/blender/compositor/operations/COM_MapValueOperation.cc b/source/blender/compositor/operations/COM_MapValueOperation.cc index 7f2044b9139..9c28e3c2577 100644 --- a/source/blender/compositor/operations/COM_MapValueOperation.cc +++ b/source/blender/compositor/operations/COM_MapValueOperation.cc @@ -20,8 +20,8 @@ MapValueOperation::MapValueOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->m_inputOperation = nullptr; } diff --git a/source/blender/compositor/operations/COM_MaskOperation.cc b/source/blender/compositor/operations/COM_MaskOperation.cc index ab908590c55..64d8c9a5492 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.cc +++ b/source/blender/compositor/operations/COM_MaskOperation.cc @@ -28,7 +28,7 @@ MaskOperation::MaskOperation() { - this->addOutputSocket(COM_DT_VALUE); + this->addOutputSocket(DataType::Value); this->m_mask = nullptr; this->m_maskWidth = 0; this->m_maskHeight = 0; diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.cc b/source/blender/compositor/operations/COM_MathBaseOperation.cc index 692c1e70462..57ccbe7792b 100644 --- a/source/blender/compositor/operations/COM_MathBaseOperation.cc +++ b/source/blender/compositor/operations/COM_MathBaseOperation.cc @@ -22,10 +22,10 @@ MathBaseOperation::MathBaseOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->m_inputValue1Operation = nullptr; this->m_inputValue2Operation = nullptr; this->m_inputValue3Operation = nullptr; diff --git a/source/blender/compositor/operations/COM_MixOperation.cc b/source/blender/compositor/operations/COM_MixOperation.cc index 11df0900345..e70c59c6a01 100644 --- a/source/blender/compositor/operations/COM_MixOperation.cc +++ b/source/blender/compositor/operations/COM_MixOperation.cc @@ -24,10 +24,10 @@ MixBaseOperation::MixBaseOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_inputValueOperation = nullptr; this->m_inputColor1Operation = nullptr; this->m_inputColor2Operation = nullptr; diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cc b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cc index 725aacc7d34..3920b4c02bd 100644 --- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cc +++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cc @@ -23,7 +23,7 @@ MovieClipAttributeOperation::MovieClipAttributeOperation() { - this->addOutputSocket(COM_DT_VALUE); + this->addOutputSocket(DataType::Value); this->m_framenumber = 0; this->m_attribute = MCA_X; this->m_invert = false; diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.cc b/source/blender/compositor/operations/COM_MovieClipOperation.cc index 4f819bf27af..5d5880e14b0 100644 --- a/source/blender/compositor/operations/COM_MovieClipOperation.cc +++ b/source/blender/compositor/operations/COM_MovieClipOperation.cc @@ -116,12 +116,12 @@ void MovieClipBaseOperation::executePixelSampled(float output[4], MovieClipOperation::MovieClipOperation() : MovieClipBaseOperation() { - this->addOutputSocket(COM_DT_COLOR); + this->addOutputSocket(DataType::Color); } MovieClipAlphaOperation::MovieClipAlphaOperation() : MovieClipBaseOperation() { - this->addOutputSocket(COM_DT_VALUE); + this->addOutputSocket(DataType::Value); } void MovieClipAlphaOperation::executePixelSampled(float output[4], diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.cc b/source/blender/compositor/operations/COM_MovieDistortionOperation.cc index 5031d590720..fcd482a69ef 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.cc +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.cc @@ -25,8 +25,8 @@ MovieDistortionOperation::MovieDistortionOperation(bool distortion) { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->setResolutionInputSocketIndex(0); this->m_inputOperation = nullptr; this->m_movieClip = nullptr; diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.h b/source/blender/compositor/operations/COM_MultilayerImageOperation.h index bfc59cabdbf..dceb57de140 100644 --- a/source/blender/compositor/operations/COM_MultilayerImageOperation.h +++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.h @@ -42,7 +42,7 @@ class MultilayerColorOperation : public MultilayerBaseOperation { MultilayerColorOperation(RenderLayer *render_layer, RenderPass *render_pass, int view) : MultilayerBaseOperation(render_layer, render_pass, view) { - this->addOutputSocket(COM_DT_COLOR); + this->addOutputSocket(DataType::Color); } void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; std::unique_ptr<MetaData> getMetaData() const override; @@ -53,7 +53,7 @@ class MultilayerValueOperation : public MultilayerBaseOperation { MultilayerValueOperation(RenderLayer *render_layer, RenderPass *render_pass, int view) : MultilayerBaseOperation(render_layer, render_pass, view) { - this->addOutputSocket(COM_DT_VALUE); + this->addOutputSocket(DataType::Value); } void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; @@ -63,7 +63,7 @@ class MultilayerVectorOperation : public MultilayerBaseOperation { MultilayerVectorOperation(RenderLayer *render_layer, RenderPass *render_pass, int view) : MultilayerBaseOperation(render_layer, render_pass, view) { - this->addOutputSocket(COM_DT_VECTOR); + this->addOutputSocket(DataType::Vector); } void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; }; diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.cc b/source/blender/compositor/operations/COM_NormalizeOperation.cc index a8448685332..fd3b951c842 100644 --- a/source/blender/compositor/operations/COM_NormalizeOperation.cc +++ b/source/blender/compositor/operations/COM_NormalizeOperation.cc @@ -20,8 +20,8 @@ NormalizeOperation::NormalizeOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Value); this->m_imageReader = nullptr; this->m_cachedInstance = nullptr; this->setComplex(true); diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cc b/source/blender/compositor/operations/COM_OutputFileOperation.cc index bb1b312ffec..a6135ef064c 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cc +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cc @@ -50,11 +50,11 @@ void add_exr_channels(void *exrhandle, { /* create channels */ switch (datatype) { - case COM_DT_VALUE: + case DataType::Value: IMB_exr_add_channel( exrhandle, layerName, "V", viewName, 1, width, buf ? buf : nullptr, use_half_float); break; - case COM_DT_VECTOR: + case DataType::Vector: IMB_exr_add_channel( exrhandle, layerName, "X", viewName, 3, 3 * width, buf ? buf : nullptr, use_half_float); IMB_exr_add_channel(exrhandle, @@ -74,7 +74,7 @@ void add_exr_channels(void *exrhandle, buf ? buf + 2 : nullptr, use_half_float); break; - case COM_DT_COLOR: + case DataType::Color: IMB_exr_add_channel( exrhandle, layerName, "R", viewName, 4, 4 * width, buf ? buf : nullptr, use_half_float); IMB_exr_add_channel(exrhandle, @@ -124,13 +124,13 @@ void free_exr_channels(void *exrhandle, /* the pointer is stored in the first channel of each datatype */ switch (datatype) { - case COM_DT_VALUE: + case DataType::Value: rect = IMB_exr_channel_rect(exrhandle, layerName, "V", srv->name); break; - case COM_DT_VECTOR: + case DataType::Vector: rect = IMB_exr_channel_rect(exrhandle, layerName, "X", srv->name); break; - case COM_DT_COLOR: + case DataType::Color: rect = IMB_exr_channel_rect(exrhandle, layerName, "R", srv->name); break; default: @@ -145,11 +145,11 @@ void free_exr_channels(void *exrhandle, int get_datatype_size(DataType datatype) { switch (datatype) { - case COM_DT_VALUE: + case DataType::Value: return 1; - case COM_DT_VECTOR: + case DataType::Vector: return 3; - case COM_DT_COLOR: + case DataType::Color: return 4; default: return 0; diff --git a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc index d4f2ca7bbe8..bcf79e1c6c6 100644 --- a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc +++ b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc @@ -89,10 +89,10 @@ static void readCornersFromSockets(rcti *rect, SocketReader *readers[4], float c PlaneCornerPinMaskOperation::PlaneCornerPinMaskOperation() : m_corners_ready(false) { - addInputSocket(COM_DT_VECTOR); - addInputSocket(COM_DT_VECTOR); - addInputSocket(COM_DT_VECTOR); - addInputSocket(COM_DT_VECTOR); + addInputSocket(DataType::Vector); + addInputSocket(DataType::Vector); + addInputSocket(DataType::Vector); + addInputSocket(DataType::Vector); /* XXX this is stupid: we need to make this "complex", * so we can use the initializeTileData function @@ -153,10 +153,10 @@ void PlaneCornerPinMaskOperation::determineResolution(unsigned int resolution[2] PlaneCornerPinWarpImageOperation::PlaneCornerPinWarpImageOperation() : m_corners_ready(false) { - addInputSocket(COM_DT_VECTOR); - addInputSocket(COM_DT_VECTOR); - addInputSocket(COM_DT_VECTOR); - addInputSocket(COM_DT_VECTOR); + addInputSocket(DataType::Vector); + addInputSocket(DataType::Vector); + addInputSocket(DataType::Vector); + addInputSocket(DataType::Vector); } void PlaneCornerPinWarpImageOperation::initExecution() diff --git a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc index c395f795a22..87f837973d2 100644 --- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc +++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc @@ -46,8 +46,8 @@ BLI_INLINE void warpCoord(float x, float y, float matrix[3][3], float uv[2], flo PlaneDistortWarpImageOperation::PlaneDistortWarpImageOperation() { - this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color, COM_SC_NO_RESIZE); + this->addOutputSocket(DataType::Color); this->m_pixelReader = nullptr; this->m_motion_blur_samples = 1; this->m_motion_blur_shutter = 0.5f; @@ -147,7 +147,7 @@ bool PlaneDistortWarpImageOperation::determineDependingAreaOfInterest( PlaneDistortMaskOperation::PlaneDistortMaskOperation() { - addOutputSocket(COM_DT_VALUE); + addOutputSocket(DataType::Value); /* Currently hardcoded to 8 samples. */ m_osa = 8; diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cc b/source/blender/compositor/operations/COM_PreviewOperation.cc index c374524818c..eedf561717a 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.cc +++ b/source/blender/compositor/operations/COM_PreviewOperation.cc @@ -37,7 +37,7 @@ PreviewOperation::PreviewOperation(const ColorManagedViewSettings *viewSettings, const ColorManagedDisplaySettings *displaySettings) { - this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE); + this->addInputSocket(DataType::Color, COM_SC_NO_RESIZE); this->m_preview = nullptr; this->m_outputBuffer = nullptr; this->m_input = nullptr; diff --git a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc index 7d459b76cb9..5494c3cd46b 100644 --- a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc +++ b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc @@ -22,9 +22,9 @@ ProjectorLensDistortionOperation::ProjectorLensDistortionOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->setComplex(true); this->m_inputProgram = nullptr; this->m_dispersionAvailable = false; diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cc b/source/blender/compositor/operations/COM_RenderLayersProg.cc index 73de60f4c34..d622e14b585 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.cc +++ b/source/blender/compositor/operations/COM_RenderLayersProg.cc @@ -146,13 +146,13 @@ void RenderLayersProg::executePixelSampled(float output[4], float x, float y, Pi const DataType data_type = this->getOutputSocket()->getDataType(); int actual_element_size = this->m_elementsize; int expected_element_size; - if (data_type == COM_DT_VALUE) { + if (data_type == DataType::Value) { expected_element_size = 1; } - else if (data_type == COM_DT_VECTOR) { + else if (data_type == DataType::Vector) { expected_element_size = 3; } - else if (data_type == COM_DT_COLOR) { + else if (data_type == DataType::Color) { expected_element_size = 4; } else { diff --git a/source/blender/compositor/operations/COM_RotateOperation.cc b/source/blender/compositor/operations/COM_RotateOperation.cc index 9a1f54a6e10..c2105efe246 100644 --- a/source/blender/compositor/operations/COM_RotateOperation.cc +++ b/source/blender/compositor/operations/COM_RotateOperation.cc @@ -21,9 +21,9 @@ RotateOperation::RotateOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->setResolutionInputSocketIndex(0); this->m_imageSocket = nullptr; this->m_degreeSocket = nullptr; diff --git a/source/blender/compositor/operations/COM_ScaleOperation.cc b/source/blender/compositor/operations/COM_ScaleOperation.cc index 9ec4e474ccd..b0c9bfb2663 100644 --- a/source/blender/compositor/operations/COM_ScaleOperation.cc +++ b/source/blender/compositor/operations/COM_ScaleOperation.cc @@ -37,10 +37,10 @@ BaseScaleOperation::BaseScaleOperation() ScaleOperation::ScaleOperation() : BaseScaleOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->setResolutionInputSocketIndex(0); this->m_inputOperation = nullptr; this->m_inputXOperation = nullptr; @@ -112,10 +112,10 @@ bool ScaleOperation::determineDependingAreaOfInterest(rcti *input, // SCALE ABSOLUTE ScaleAbsoluteOperation::ScaleAbsoluteOperation() : BaseScaleOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->setResolutionInputSocketIndex(0); this->m_inputOperation = nullptr; this->m_inputXOperation = nullptr; @@ -203,8 +203,8 @@ bool ScaleAbsoluteOperation::determineDependingAreaOfInterest(rcti *input, // Absolute fixed size ScaleFixedSizeOperation::ScaleFixedSizeOperation() : BaseScaleOperation() { - this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color, COM_SC_NO_RESIZE); + this->addOutputSocket(DataType::Color); this->setResolutionInputSocketIndex(0); this->m_inputOperation = nullptr; this->m_is_offset = false; diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc index 158ffd4a8c0..d5918dfa6f5 100644 --- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc +++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc @@ -26,10 +26,10 @@ ScreenLensDistortionOperation::ScreenLensDistortionOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->setComplex(true); this->m_inputProgram = nullptr; this->m_distortion = 0.0f; diff --git a/source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.cc b/source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.cc index 17029cb3049..3151bad5e4a 100644 --- a/source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.cc +++ b/source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.cc @@ -20,9 +20,9 @@ SetAlphaMultiplyOperation::SetAlphaMultiplyOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->m_inputColor = nullptr; this->m_inputAlpha = nullptr; diff --git a/source/blender/compositor/operations/COM_SetAlphaReplaceOperation.cc b/source/blender/compositor/operations/COM_SetAlphaReplaceOperation.cc index cd6e82902cc..cd9bf039f3e 100644 --- a/source/blender/compositor/operations/COM_SetAlphaReplaceOperation.cc +++ b/source/blender/compositor/operations/COM_SetAlphaReplaceOperation.cc @@ -20,9 +20,9 @@ SetAlphaReplaceOperation::SetAlphaReplaceOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->m_inputColor = nullptr; this->m_inputAlpha = nullptr; diff --git a/source/blender/compositor/operations/COM_SetColorOperation.cc b/source/blender/compositor/operations/COM_SetColorOperation.cc index ffbc20fde9c..b08381963fd 100644 --- a/source/blender/compositor/operations/COM_SetColorOperation.cc +++ b/source/blender/compositor/operations/COM_SetColorOperation.cc @@ -20,7 +20,7 @@ SetColorOperation::SetColorOperation() { - this->addOutputSocket(COM_DT_COLOR); + this->addOutputSocket(DataType::Color); } void SetColorOperation::executePixelSampled(float output[4], diff --git a/source/blender/compositor/operations/COM_SetSamplerOperation.cc b/source/blender/compositor/operations/COM_SetSamplerOperation.cc index 942d717d19c..8272ad7583d 100644 --- a/source/blender/compositor/operations/COM_SetSamplerOperation.cc +++ b/source/blender/compositor/operations/COM_SetSamplerOperation.cc @@ -20,8 +20,8 @@ SetSamplerOperation::SetSamplerOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); } void SetSamplerOperation::initExecution() diff --git a/source/blender/compositor/operations/COM_SetValueOperation.cc b/source/blender/compositor/operations/COM_SetValueOperation.cc index d72a2dfe23d..98d0ad630ad 100644 --- a/source/blender/compositor/operations/COM_SetValueOperation.cc +++ b/source/blender/compositor/operations/COM_SetValueOperation.cc @@ -20,7 +20,7 @@ SetValueOperation::SetValueOperation() { - this->addOutputSocket(COM_DT_VALUE); + this->addOutputSocket(DataType::Value); } void SetValueOperation::executePixelSampled(float output[4], diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.cc b/source/blender/compositor/operations/COM_SetVectorOperation.cc index a0341dbc4df..6b6bcad02f3 100644 --- a/source/blender/compositor/operations/COM_SetVectorOperation.cc +++ b/source/blender/compositor/operations/COM_SetVectorOperation.cc @@ -21,7 +21,7 @@ SetVectorOperation::SetVectorOperation() { - this->addOutputSocket(COM_DT_VECTOR); + this->addOutputSocket(DataType::Vector); } void SetVectorOperation::executePixelSampled(float output[4], diff --git a/source/blender/compositor/operations/COM_SplitOperation.cc b/source/blender/compositor/operations/COM_SplitOperation.cc index fb6214c7522..25438259973 100644 --- a/source/blender/compositor/operations/COM_SplitOperation.cc +++ b/source/blender/compositor/operations/COM_SplitOperation.cc @@ -29,9 +29,9 @@ SplitOperation::SplitOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_image1Input = nullptr; this->m_image2Input = nullptr; } diff --git a/source/blender/compositor/operations/COM_SunBeamsOperation.cc b/source/blender/compositor/operations/COM_SunBeamsOperation.cc index 28811d479a5..af5cdeba547 100644 --- a/source/blender/compositor/operations/COM_SunBeamsOperation.cc +++ b/source/blender/compositor/operations/COM_SunBeamsOperation.cc @@ -21,8 +21,8 @@ SunBeamsOperation::SunBeamsOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->setResolutionInputSocketIndex(0); this->setComplex(true); diff --git a/source/blender/compositor/operations/COM_TextureOperation.cc b/source/blender/compositor/operations/COM_TextureOperation.cc index e66cd57cb3f..146f43dbe3a 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.cc +++ b/source/blender/compositor/operations/COM_TextureOperation.cc @@ -27,8 +27,8 @@ TextureBaseOperation::TextureBaseOperation() { - this->addInputSocket(COM_DT_VECTOR); // offset - this->addInputSocket(COM_DT_VECTOR); // size + this->addInputSocket(DataType::Vector); // offset + this->addInputSocket(DataType::Vector); // size this->m_texture = nullptr; this->m_inputSize = nullptr; this->m_inputOffset = nullptr; @@ -39,11 +39,11 @@ TextureBaseOperation::TextureBaseOperation() } TextureOperation::TextureOperation() : TextureBaseOperation() { - this->addOutputSocket(COM_DT_COLOR); + this->addOutputSocket(DataType::Color); } TextureAlphaOperation::TextureAlphaOperation() : TextureBaseOperation() { - this->addOutputSocket(COM_DT_VALUE); + this->addOutputSocket(DataType::Value); } void TextureBaseOperation::initExecution() diff --git a/source/blender/compositor/operations/COM_TonemapOperation.cc b/source/blender/compositor/operations/COM_TonemapOperation.cc index 4c1d285a69f..85011171432 100644 --- a/source/blender/compositor/operations/COM_TonemapOperation.cc +++ b/source/blender/compositor/operations/COM_TonemapOperation.cc @@ -24,8 +24,8 @@ TonemapOperation::TonemapOperation() { - this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color, COM_SC_NO_RESIZE); + this->addOutputSocket(DataType::Color); this->m_imageReader = nullptr; this->m_data = nullptr; this->m_cachedInstance = nullptr; diff --git a/source/blender/compositor/operations/COM_TrackPositionOperation.cc b/source/blender/compositor/operations/COM_TrackPositionOperation.cc index ddabfb7cf6c..97d602aa458 100644 --- a/source/blender/compositor/operations/COM_TrackPositionOperation.cc +++ b/source/blender/compositor/operations/COM_TrackPositionOperation.cc @@ -30,7 +30,7 @@ TrackPositionOperation::TrackPositionOperation() { - this->addOutputSocket(COM_DT_VALUE); + this->addOutputSocket(DataType::Value); this->m_movieClip = nullptr; this->m_framenumber = 0; this->m_trackingObjectName[0] = 0; diff --git a/source/blender/compositor/operations/COM_TranslateOperation.cc b/source/blender/compositor/operations/COM_TranslateOperation.cc index 286004cd49b..7efd655b1df 100644 --- a/source/blender/compositor/operations/COM_TranslateOperation.cc +++ b/source/blender/compositor/operations/COM_TranslateOperation.cc @@ -20,10 +20,10 @@ TranslateOperation::TranslateOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->setResolutionInputSocketIndex(0); this->m_inputOperation = nullptr; this->m_inputXOperation = nullptr; diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc index b96c713a83a..a002a853bd4 100644 --- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc +++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc @@ -24,14 +24,14 @@ VariableSizeBokehBlurOperation::VariableSizeBokehBlurOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE); // do not resize the bokeh image. - this->addInputSocket(COM_DT_VALUE); // radius + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Color, COM_SC_NO_RESIZE); // do not resize the bokeh image. + this->addInputSocket(DataType::Value); // radius #ifdef COM_DEFOCUS_SEARCH - this->addInputSocket(COM_DT_COLOR, + this->addInputSocket(DataType::Color, COM_SC_NO_RESIZE); // inverse search radius optimization structure. #endif - this->addOutputSocket(COM_DT_COLOR); + this->addOutputSocket(DataType::Color); this->setComplex(true); this->setOpenCL(true); @@ -278,8 +278,8 @@ bool VariableSizeBokehBlurOperation::determineDependingAreaOfInterest( // InverseSearchRadiusOperation InverseSearchRadiusOperation::InverseSearchRadiusOperation() { - this->addInputSocket(COM_DT_VALUE, COM_SC_NO_RESIZE); // radius - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Value, COM_SC_NO_RESIZE); // radius + this->addOutputSocket(DataType::Color); this->setComplex(true); this->m_inputRadius = nullptr; } @@ -291,7 +291,7 @@ void InverseSearchRadiusOperation::initExecution() void *InverseSearchRadiusOperation::initializeTileData(rcti *rect) { - MemoryBuffer *data = new MemoryBuffer(COM_DT_COLOR, rect); + MemoryBuffer *data = new MemoryBuffer(DataType::Color, rect); float *buffer = data->getBuffer(); int x, y; int width = this->m_inputRadius->getWidth(); diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cc b/source/blender/compositor/operations/COM_VectorBlurOperation.cc index f03d702dc58..ff9eef8a7e1 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cc +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cc @@ -45,10 +45,10 @@ void antialias_tagbuf(int xsize, int ysize, char *rectmove); /* VectorBlurOperation */ VectorBlurOperation::VectorBlurOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); // ZBUF - this->addInputSocket(COM_DT_COLOR); // SPEED - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); // ZBUF + this->addInputSocket(DataType::Color); // SPEED + this->addOutputSocket(DataType::Color); this->m_settings = nullptr; this->m_cachedInstance = nullptr; this->m_inputImageProgram = nullptr; diff --git a/source/blender/compositor/operations/COM_VectorCurveOperation.cc b/source/blender/compositor/operations/COM_VectorCurveOperation.cc index a883237f870..a6638a78e88 100644 --- a/source/blender/compositor/operations/COM_VectorCurveOperation.cc +++ b/source/blender/compositor/operations/COM_VectorCurveOperation.cc @@ -22,8 +22,8 @@ VectorCurveOperation::VectorCurveOperation() { - this->addInputSocket(COM_DT_VECTOR); - this->addOutputSocket(COM_DT_VECTOR); + this->addInputSocket(DataType::Vector); + this->addOutputSocket(DataType::Vector); this->m_inputProgram = nullptr; } diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cc b/source/blender/compositor/operations/COM_ViewerOperation.cc index 715b2e56735..e31f7ad8eba 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cc +++ b/source/blender/compositor/operations/COM_ViewerOperation.cc @@ -44,9 +44,9 @@ ViewerOperation::ViewerOperation() this->m_displaySettings = nullptr; this->m_useAlphaInput = false; - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_VALUE); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Value); this->m_imageInput = nullptr; this->m_alphaInput = nullptr; diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.cc b/source/blender/compositor/operations/COM_ZCombineOperation.cc index 26d3f2c7dc4..8afdbcc7c2d 100644 --- a/source/blender/compositor/operations/COM_ZCombineOperation.cc +++ b/source/blender/compositor/operations/COM_ZCombineOperation.cc @@ -21,11 +21,11 @@ ZCombineOperation::ZCombineOperation() { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Value); + this->addOutputSocket(DataType::Color); this->m_image1Reader = nullptr; this->m_depth1Reader = nullptr; @@ -97,10 +97,10 @@ void ZCombineOperation::deinitExecution() // MASK combine ZCombineMaskOperation::ZCombineMaskOperation() { - this->addInputSocket(COM_DT_VALUE); // mask - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(DataType::Value); // mask + this->addInputSocket(DataType::Color); + this->addInputSocket(DataType::Color); + this->addOutputSocket(DataType::Color); this->m_maskReader = nullptr; this->m_image1Reader = nullptr; |