[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59820] trunk/blender/source/blender/ compositor: Merge some operations into a single file
Sergey Sharybin
sergey.vfx at gmail.com
Thu Sep 5 11:39:39 CEST 2013
Revision: 59820
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59820
Author: nazgul
Date: 2013-09-05 09:39:38 +0000 (Thu, 05 Sep 2013)
Log Message:
-----------
Merge some operations into a single file
This merges all mix operations into a COM_MixBaseOperation
(naming could be better, but this way it corresponds to what's
going on with math operations.
Same was done with RenderLayers operations.
Overall this gives 20% of bf_compositor library compilation
time decrease. And it was rather annoying to have tens of
files with just a single-line constructors anyway.
TODO:
- All Convert operations could also be merged into a single file,
but that would require adding some ConvertBaseOperation to
reduce code duplication (ideally). Leaving it unchanged for now.
- Some operations' headers seems to be wrongly including MixOperation
header, they need to include NodeOperation instead it seems.
This is rather harmless, but would be nice to doublecheck on this
eventually.
Modified Paths:
--------------
trunk/blender/source/blender/compositor/CMakeLists.txt
trunk/blender/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_FilterNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_GlareNode.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_MixNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_RenderLayersNode.h
trunk/blender/source/blender/compositor/nodes/COM_ZCombineNode.cpp
trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
trunk/blender/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
trunk/blender/source/blender/compositor/operations/COM_ChangeHSVOperation.h
trunk/blender/source/blender/compositor/operations/COM_ChannelMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_ChromaMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_ZCombineOperation.h
Added Paths:
-----------
trunk/blender/source/blender/compositor/operations/COM_MixOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersProg.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersProg.h
Removed Paths:
-------------
trunk/blender/source/blender/compositor/operations/COM_MixAddOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixAddOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixBlendOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixBlendOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixBurnOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixBurnOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixColorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixColorOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixDarkenOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixDifferenceOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixDivideOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixDivideOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixDodgeOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixGlareOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixGlareOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixLightenOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixLightenOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixLinearLightOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixMultiplyOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixOverlayOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixSaturationOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixScreenOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixScreenOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixSoftLightOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixSubtractOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixValueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixValueOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersAOOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersColorOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersDepthProg.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersEmitOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersImageProg.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersMistOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersNormalOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersShadowOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersUVOperation.h
Modified: trunk/blender/source/blender/compositor/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/compositor/CMakeLists.txt 2013-09-05 08:38:06 UTC (rev 59819)
+++ trunk/blender/source/blender/compositor/CMakeLists.txt 2013-09-05 09:39:38 UTC (rev 59820)
@@ -368,48 +368,8 @@
operations/COM_ColorSpillOperation.cpp
operations/COM_ColorSpillOperation.h
- operations/COM_RenderLayersBaseProg.cpp
- operations/COM_RenderLayersBaseProg.h
- operations/COM_RenderLayersImageProg.cpp
- operations/COM_RenderLayersImageProg.h
- operations/COM_RenderLayersAlphaProg.cpp
- operations/COM_RenderLayersAlphaProg.h
- operations/COM_RenderLayersDepthProg.cpp
- operations/COM_RenderLayersDepthProg.h
- operations/COM_RenderLayersNormalOperation.cpp
- operations/COM_RenderLayersNormalOperation.h
- operations/COM_RenderLayersSpeedOperation.cpp
- operations/COM_RenderLayersSpeedOperation.h
- operations/COM_RenderLayersColorOperation.cpp
- operations/COM_RenderLayersColorOperation.h
- operations/COM_RenderLayersUVOperation.cpp
- operations/COM_RenderLayersUVOperation.h
- operations/COM_RenderLayersMistOperation.cpp
- operations/COM_RenderLayersMistOperation.h
- operations/COM_RenderLayersObjectIndexOperation.cpp
- operations/COM_RenderLayersObjectIndexOperation.h
- operations/COM_RenderLayersMaterialIndexOperation.cpp
- operations/COM_RenderLayersMaterialIndexOperation.h
- operations/COM_RenderLayersDiffuseOperation.cpp
- operations/COM_RenderLayersDiffuseOperation.h
- operations/COM_RenderLayersSpecularOperation.cpp
- operations/COM_RenderLayersSpecularOperation.h
- operations/COM_RenderLayersShadowOperation.cpp
- operations/COM_RenderLayersShadowOperation.h
- operations/COM_RenderLayersAOOperation.cpp
- operations/COM_RenderLayersAOOperation.h
- operations/COM_RenderLayersEmitOperation.cpp
- operations/COM_RenderLayersEmitOperation.h
- operations/COM_RenderLayersReflectionOperation.cpp
- operations/COM_RenderLayersReflectionOperation.h
- operations/COM_RenderLayersRefractionOperation.cpp
- operations/COM_RenderLayersRefractionOperation.h
- operations/COM_RenderLayersEnvironmentOperation.cpp
- operations/COM_RenderLayersEnvironmentOperation.h
- operations/COM_RenderLayersIndirectOperation.cpp
- operations/COM_RenderLayersIndirectOperation.h
- operations/COM_RenderLayersCyclesOperation.cpp
- operations/COM_RenderLayersCyclesOperation.h
+ operations/COM_RenderLayersProg.cpp
+ operations/COM_RenderLayersProg.h
operations/COM_ImageOperation.cpp
operations/COM_ImageOperation.h
@@ -500,16 +460,8 @@
operations/COM_ReadBufferOperation.h
operations/COM_WriteBufferOperation.cpp
operations/COM_WriteBufferOperation.h
- operations/COM_MixBaseOperation.h
- operations/COM_MixBaseOperation.cpp
- operations/COM_MixBlendOperation.cpp
- operations/COM_MixBlendOperation.h
- operations/COM_MixGlareOperation.cpp
- operations/COM_MixGlareOperation.h
- operations/COM_MixAddOperation.h
- operations/COM_MixAddOperation.cpp
- operations/COM_MixMultiplyOperation.h
- operations/COM_MixMultiplyOperation.cpp
+ operations/COM_MixOperation.h
+ operations/COM_MixOperation.cpp
operations/COM_BrightnessOperation.cpp
operations/COM_BrightnessOperation.h
operations/COM_GammaOperation.cpp
@@ -523,37 +475,6 @@
operations/COM_SetVectorOperation.h
operations/COM_SetVectorOperation.cpp
- operations/COM_MixBurnOperation.h
- operations/COM_MixBurnOperation.cpp
- operations/COM_MixColorOperation.h
- operations/COM_MixColorOperation.cpp
- operations/COM_MixDarkenOperation.h
- operations/COM_MixDarkenOperation.cpp
- operations/COM_MixDodgeOperation.h
- operations/COM_MixDodgeOperation.cpp
- operations/COM_MixDifferenceOperation.h
- operations/COM_MixDifferenceOperation.cpp
- operations/COM_MixDivideOperation.h
- operations/COM_MixDivideOperation.cpp
- operations/COM_MixHueOperation.h
- operations/COM_MixHueOperation.cpp
- operations/COM_MixLightenOperation.h
- operations/COM_MixLightenOperation.cpp
- operations/COM_MixLinearLightOperation.h
- operations/COM_MixLinearLightOperation.cpp
- operations/COM_MixOverlayOperation.h
- operations/COM_MixOverlayOperation.cpp
- operations/COM_MixSaturationOperation.h
- operations/COM_MixSaturationOperation.cpp
- operations/COM_MixScreenOperation.h
- operations/COM_MixScreenOperation.cpp
- operations/COM_MixSoftLightOperation.h
- operations/COM_MixSoftLightOperation.cpp
- operations/COM_MixValueOperation.h
- operations/COM_MixValueOperation.cpp
- operations/COM_MixSubtractOperation.h
- operations/COM_MixSubtractOperation.cpp
-
operations/COM_MathBaseOperation.h
operations/COM_MathBaseOperation.cpp
Modified: trunk/blender/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_AlphaOverNode.cpp 2013-09-05 08:38:06 UTC (rev 59819)
+++ trunk/blender/source/blender/compositor/nodes/COM_AlphaOverNode.cpp 2013-09-05 09:39:38 UTC (rev 59820)
@@ -22,7 +22,7 @@
#include "COM_AlphaOverNode.h"
-#include "COM_MixBaseOperation.h"
+#include "COM_MixOperation.h"
#include "COM_AlphaOverKeyOperation.h"
#include "COM_AlphaOverMixedOperation.h"
#include "COM_AlphaOverPremultiplyOperation.h"
Modified: trunk/blender/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp 2013-09-05 08:38:06 UTC (rev 59819)
+++ trunk/blender/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp 2013-09-05 09:39:38 UTC (rev 59820)
@@ -25,7 +25,7 @@
#include "COM_ColorBalanceASCCDLOperation.h"
#include "COM_ExecutionSystem.h"
#include "BKE_node.h"
-#include "COM_MixBlendOperation.h"
+#include "COM_MixOperation.h"
ColorBalanceNode::ColorBalanceNode(bNode *editorNode) : Node(editorNode)
{
Modified: trunk/blender/source/blender/compositor/nodes/COM_FilterNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_FilterNode.cpp 2013-09-05 08:38:06 UTC (rev 59819)
+++ trunk/blender/source/blender/compositor/nodes/COM_FilterNode.cpp 2013-09-05 09:39:38 UTC (rev 59820)
@@ -25,7 +25,7 @@
#include "COM_ConvolutionEdgeFilterOperation.h"
#include "COM_ExecutionSystem.h"
#include "BKE_node.h"
-#include "COM_MixBlendOperation.h"
+#include "COM_MixOperation.h"
FilterNode::FilterNode(bNode *editorNode) : Node(editorNode)
{
Modified: trunk/blender/source/blender/compositor/nodes/COM_GlareNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_GlareNode.cpp 2013-09-05 08:38:06 UTC (rev 59819)
+++ trunk/blender/source/blender/compositor/nodes/COM_GlareNode.cpp 2013-09-05 09:39:38 UTC (rev 59820)
@@ -26,7 +26,7 @@
#include "COM_GlareSimpleStarOperation.h"
#include "COM_GlareStreaksOperation.h"
#include "COM_SetValueOperation.h"
-#include "COM_MixGlareOperation.h"
+#include "COM_MixOperation.h"
#include "COM_FastGaussianBlurOperation.h"
#include "COM_GlareGhostOperation.h"
#include "COM_GlareFogGlowOperation.h"
Modified: trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp 2013-09-05 08:38:06 UTC (rev 59819)
+++ trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp 2013-09-05 09:39:38 UTC (rev 59820)
@@ -26,7 +26,7 @@
#include "COM_ExecutionSystem.h"
#include "COM_ConvertRGBToHSVOperation.h"
#include "COM_ConvertHSVToRGBOperation.h"
-#include "COM_MixBlendOperation.h"
+#include "COM_MixOperation.h"
#include "COM_SetColorOperation.h"
#include "COM_SetValueOperation.h"
#include "COM_ChangeHSVOperation.h"
Modified: trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp 2013-09-05 08:38:06 UTC (rev 59819)
+++ trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp 2013-09-05 09:39:38 UTC (rev 59820)
@@ -26,7 +26,7 @@
#include "COM_ExecutionSystem.h"
#include "COM_ConvertRGBToHSVOperation.h"
#include "COM_ConvertHSVToRGBOperation.h"
-#include "COM_MixBlendOperation.h"
+#include "COM_MixOperation.h"
#include "COM_SetColorOperation.h"
#include "COM_SetValueOperation.h"
#include "COM_ChangeHSVOperation.h"
Modified: trunk/blender/source/blender/compositor/nodes/COM_MixNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_MixNode.cpp 2013-09-05 08:38:06 UTC (rev 59819)
+++ trunk/blender/source/blender/compositor/nodes/COM_MixNode.cpp 2013-09-05 09:39:38 UTC (rev 59820)
@@ -22,24 +22,7 @@
#include "COM_MixNode.h"
-#include "COM_MixBlendOperation.h"
-#include "COM_MixAddOperation.h"
-#include "COM_MixMultiplyOperation.h"
-#include "COM_MixBurnOperation.h"
-#include "COM_MixColorOperation.h"
-#include "COM_MixDarkenOperation.h"
-#include "COM_MixDifferenceOperation.h"
-#include "COM_MixDivideOperation.h"
-#include "COM_MixHueOperation.h"
-#include "COM_MixLightenOperation.h"
-#include "COM_MixLinearLightOperation.h"
-#include "COM_MixOverlayOperation.h"
-#include "COM_MixSaturationOperation.h"
-#include "COM_MixScreenOperation.h"
-#include "COM_MixSoftLightOperation.h"
-#include "COM_MixSubtractOperation.h"
-#include "COM_MixValueOperation.h"
-#include "COM_MixDodgeOperation.h"
+#include "COM_MixOperation.h"
#include "COM_ExecutionSystem.h"
#include "COM_SetValueOperation.h"
Modified: trunk/blender/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_RenderLayersNode.cpp 2013-09-05 08:38:06 UTC (rev 59819)
+++ trunk/blender/source/blender/compositor/nodes/COM_RenderLayersNode.cpp 2013-09-05 09:39:38 UTC (rev 59820)
@@ -22,26 +22,7 @@
#include "COM_RenderLayersNode.h"
#include "COM_ExecutionSystem.h"
-#include "COM_RenderLayersImageProg.h"
-#include "COM_RenderLayersAlphaProg.h"
-#include "COM_RenderLayersDepthProg.h"
-#include "COM_RenderLayersNormalOperation.h"
-#include "COM_RenderLayersSpeedOperation.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list