[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59837] trunk/blender/source/blender/ compositor: Compositor cleanup: Merge conversion operations into a single file (see also r59820).
Lukas Toenne
lukas.toenne at googlemail.com
Thu Sep 5 15:32:14 CEST 2013
Revision: 59837
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59837
Author: lukastoenne
Date: 2013-09-05 13:32:14 +0000 (Thu, 05 Sep 2013)
Log Message:
-----------
Compositor cleanup: Merge conversion operations into a single file (see also r59820).
Most convert operations can share a common base class with a single socket reader (except channel separate/combine nodes).
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59820
Modified Paths:
--------------
trunk/blender/source/blender/compositor/CMakeLists.txt
trunk/blender/source/blender/compositor/intern/COM_Converter.cpp
trunk/blender/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ColorRampNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
trunk/blender/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
trunk/blender/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
trunk/blender/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ImageNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_KeyingNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
trunk/blender/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
trunk/blender/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
trunk/blender/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
Added Paths:
-----------
trunk/blender/source/blender/compositor/operations/COM_ConvertOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertOperation.h
Removed Paths:
-------------
trunk/blender/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_CombineChannelsOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
trunk/blender/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SeparateChannelOperation.h
Modified: trunk/blender/source/blender/compositor/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/compositor/CMakeLists.txt 2013-09-05 13:15:29 UTC (rev 59836)
+++ trunk/blender/source/blender/compositor/CMakeLists.txt 2013-09-05 13:32:14 UTC (rev 59837)
@@ -394,37 +394,11 @@
operations/COM_PreviewOperation.cpp
operations/COM_SplitOperation.h
operations/COM_SplitOperation.cpp
- operations/COM_ConvertValueToColorProg.h
- operations/COM_ConvertValueToColorProg.cpp
- operations/COM_ConvertColorToValueProg.h
- operations/COM_ConvertColorToValueProg.cpp
- operations/COM_ConvertColorToBWOperation.h
- operations/COM_ConvertColorToBWOperation.cpp
- operations/COM_ConvertColorToVectorOperation.h
- operations/COM_ConvertColorToVectorOperation.cpp
- operations/COM_ConvertValueToVectorOperation.h
- operations/COM_ConvertValueToVectorOperation.cpp
- operations/COM_ConvertVectorToColorOperation.h
- operations/COM_ConvertVectorToColorOperation.cpp
- operations/COM_ConvertVectorToValueOperation.h
- operations/COM_ConvertVectorToValueOperation.cpp
operations/COM_ConvertDepthToRadiusOperation.h
operations/COM_ConvertDepthToRadiusOperation.cpp
operations/COM_ZCombineOperation.cpp
operations/COM_ZCombineOperation.h
- operations/COM_ConvertRGBToYCCOperation.h
- operations/COM_ConvertRGBToYCCOperation.cpp
- operations/COM_ConvertYCCToRGBOperation.h
- operations/COM_ConvertYCCToRGBOperation.cpp
- operations/COM_ConvertRGBToYUVOperation.h
- operations/COM_ConvertRGBToYUVOperation.cpp
- operations/COM_ConvertYUVToRGBOperation.h
- operations/COM_ConvertYUVToRGBOperation.cpp
- operations/COM_ConvertRGBToHSVOperation.h
- operations/COM_ConvertRGBToHSVOperation.cpp
- operations/COM_ConvertHSVToRGBOperation.h
- operations/COM_ConvertHSVToRGBOperation.cpp
operations/COM_ChangeHSVOperation.h
operations/COM_ChangeHSVOperation.cpp
operations/COM_ColorCurveOperation.h
@@ -451,10 +425,6 @@
operations/COM_ColorMatteOperation.h
operations/COM_ChannelMatteOperation.cpp
operations/COM_ChannelMatteOperation.h
- operations/COM_ConvertPremulToStraightOperation.cpp
- operations/COM_ConvertPremulToStraightOperation.h
- operations/COM_ConvertStraightToPremulOperation.cpp
- operations/COM_ConvertStraightToPremulOperation.h
operations/COM_ReadBufferOperation.cpp
operations/COM_ReadBufferOperation.h
@@ -556,12 +526,9 @@
#Convert operations
operations/COM_IDMaskOperation.cpp
operations/COM_IDMaskOperation.h
+ operations/COM_ConvertOperation.cpp
+ operations/COM_ConvertOperation.h
- operations/COM_SeparateChannelOperation.cpp
- operations/COM_SeparateChannelOperation.h
- operations/COM_CombineChannelsOperation.cpp
- operations/COM_CombineChannelsOperation.h
-
operations/COM_DotproductOperation.cpp
operations/COM_DotproductOperation.h
Modified: trunk/blender/source/blender/compositor/intern/COM_Converter.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_Converter.cpp 2013-09-05 13:15:29 UTC (rev 59836)
+++ trunk/blender/source/blender/compositor/intern/COM_Converter.cpp 2013-09-05 13:32:14 UTC (rev 59837)
@@ -47,12 +47,7 @@
#include "COM_CombineYUVANode.h"
#include "COM_CompositorNode.h"
#include "COM_ConvertAlphaNode.h"
-#include "COM_ConvertColorToVectorOperation.h"
-#include "COM_ConvertColorToValueProg.h"
-#include "COM_ConvertValueToColorProg.h"
-#include "COM_ConvertValueToVectorOperation.h"
-#include "COM_ConvertVectorToColorOperation.h"
-#include "COM_ConvertVectorToValueOperation.h"
+#include "COM_ConvertOperation.h"
#include "COM_Converter.h"
#include "COM_CropNode.h"
#include "COM_DefocusNode.h"
@@ -420,13 +415,13 @@
DataType toDatatype = inputSocket->getDataType();
NodeOperation *converter = NULL;
if (fromDatatype == COM_DT_VALUE && toDatatype == COM_DT_COLOR) {
- converter = new ConvertValueToColorProg();
+ converter = new ConvertValueToColorOperation();
}
else if (fromDatatype == COM_DT_VALUE && toDatatype == COM_DT_VECTOR) {
converter = new ConvertValueToVectorOperation();
}
else if (fromDatatype == COM_DT_COLOR && toDatatype == COM_DT_VALUE) {
- converter = new ConvertColorToValueProg();
+ converter = new ConvertColorToValueOperation();
}
else if (fromDatatype == COM_DT_COLOR && toDatatype == COM_DT_VECTOR) {
converter = new ConvertColorToVectorOperation();
Modified: trunk/blender/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp 2013-09-05 13:15:29 UTC (rev 59836)
+++ trunk/blender/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp 2013-09-05 13:32:14 UTC (rev 59837)
@@ -22,9 +22,7 @@
#include "COM_ChannelMatteNode.h"
#include "BKE_node.h"
#include "COM_ChannelMatteOperation.h"
-#include "COM_ConvertRGBToHSVOperation.h"
-#include "COM_ConvertRGBToYCCOperation.h"
-#include "COM_ConvertRGBToYUVOperation.h"
+#include "COM_ConvertOperation.h"
#include "COM_SetAlphaOperation.h"
ChannelMatteNode::ChannelMatteNode(bNode *editorNode) : Node(editorNode)
Modified: trunk/blender/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp 2013-09-05 13:15:29 UTC (rev 59836)
+++ trunk/blender/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp 2013-09-05 13:32:14 UTC (rev 59837)
@@ -22,7 +22,7 @@
#include "COM_ChromaMatteNode.h"
#include "BKE_node.h"
#include "COM_ChromaMatteOperation.h"
-#include "COM_ConvertRGBToYCCOperation.h"
+#include "COM_ConvertOperation.h"
#include "COM_SetAlphaOperation.h"
ChromaMatteNode::ChromaMatteNode(bNode *editorNode) : Node(editorNode)
Modified: trunk/blender/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ColorMatteNode.cpp 2013-09-05 13:15:29 UTC (rev 59836)
+++ trunk/blender/source/blender/compositor/nodes/COM_ColorMatteNode.cpp 2013-09-05 13:32:14 UTC (rev 59837)
@@ -22,7 +22,7 @@
#include "COM_ColorMatteNode.h"
#include "BKE_node.h"
#include "COM_ColorMatteOperation.h"
-#include "COM_ConvertRGBToHSVOperation.h"
+#include "COM_ConvertOperation.h"
#include "COM_SetAlphaOperation.h"
ColorMatteNode::ColorMatteNode(bNode *editorNode) : Node(editorNode)
Modified: trunk/blender/source/blender/compositor/nodes/COM_ColorRampNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ColorRampNode.cpp 2013-09-05 13:15:29 UTC (rev 59836)
+++ trunk/blender/source/blender/compositor/nodes/COM_ColorRampNode.cpp 2013-09-05 13:32:14 UTC (rev 59837)
@@ -24,7 +24,7 @@
#include "COM_ExecutionSystem.h"
#include "BKE_node.h"
#include "COM_ColorRampOperation.h"
-#include "COM_SeparateChannelOperation.h"
+#include "COM_ConvertOperation.h"
#include "DNA_texture_types.h"
ColorRampNode::ColorRampNode(bNode *editorNode) : Node(editorNode)
Modified: trunk/blender/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ColorToBWNode.cpp 2013-09-05 13:15:29 UTC (rev 59836)
+++ trunk/blender/source/blender/compositor/nodes/COM_ColorToBWNode.cpp 2013-09-05 13:32:14 UTC (rev 59837)
@@ -22,7 +22,7 @@
#include "COM_ColorToBWNode.h"
-#include "COM_ConvertColorToBWOperation.h"
+#include "COM_ConvertOperation.h"
#include "COM_ExecutionSystem.h"
ColorToBWNode::ColorToBWNode(bNode *editorNode) : Node(editorNode)
Modified: trunk/blender/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_CombineHSVANode.cpp 2013-09-05 13:15:29 UTC (rev 59836)
+++ trunk/blender/source/blender/compositor/nodes/COM_CombineHSVANode.cpp 2013-09-05 13:32:14 UTC (rev 59837)
@@ -22,11 +22,11 @@
#include "COM_CombineHSVANode.h"
-#include "COM_CombineChannelsOperation.h"
+#include "COM_ConvertOperation.h"
#include "COM_ExecutionSystem.h"
#include "COM_SetValueOperation.h"
-#include "COM_ConvertHSVToRGBOperation.h"
+#include "COM_ConvertOperation.h"
CombineHSVANode::CombineHSVANode(bNode *editorNode) : CombineRGBANode(editorNode)
{
Modified: trunk/blender/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_CombineRGBANode.cpp 2013-09-05 13:15:29 UTC (rev 59836)
+++ trunk/blender/source/blender/compositor/nodes/COM_CombineRGBANode.cpp 2013-09-05 13:32:14 UTC (rev 59837)
@@ -22,7 +22,7 @@
#include "COM_CombineRGBANode.h"
-#include "COM_CombineChannelsOperation.h"
+#include "COM_ConvertOperation.h"
#include "COM_ExecutionSystem.h"
#include "COM_SetValueOperation.h"
Modified: trunk/blender/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_CombineYCCANode.cpp 2013-09-05 13:15:29 UTC (rev 59836)
+++ trunk/blender/source/blender/compositor/nodes/COM_CombineYCCANode.cpp 2013-09-05 13:32:14 UTC (rev 59837)
@@ -20,7 +20,7 @@
*/
#include "COM_CombineYCCANode.h"
-#include "COM_ConvertYCCToRGBOperation.h"
+#include "COM_ConvertOperation.h"
CombineYCCANode::CombineYCCANode(bNode *editorNode) : CombineRGBANode(editorNode)
{
Modified: trunk/blender/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_CombineYUVANode.cpp 2013-09-05 13:15:29 UTC (rev 59836)
+++ trunk/blender/source/blender/compositor/nodes/COM_CombineYUVANode.cpp 2013-09-05 13:32:14 UTC (rev 59837)
@@ -20,7 +20,7 @@
*/
#include "COM_CombineYUVANode.h"
-#include "COM_ConvertYUVToRGBOperation.h"
+#include "COM_ConvertOperation.h"
CombineYUVANode::CombineYUVANode(bNode *editorNode) : CombineRGBANode(editorNode)
{
Modified: trunk/blender/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list