[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47972] trunk/blender/source/blender/ compositor: style cleanup: more nodes

Campbell Barton ideasman42 at gmail.com
Fri Jun 15 19:57:49 CEST 2012 

Revision: 47972
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47972
Author:   campbellbarton
Date:     2012-06-15 17:57:39 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
style cleanup: more nodes

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/intern/COM_NodeBase.cpp
    trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp
    trunk/blender/source/blender/compositor/intern/COM_OutputSocket.cpp
    trunk/blender/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_BokehImageNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_BrightnessNode.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_ColorBalanceNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ColorNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ColorRampNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ColorSpillNode.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_CompositorNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_CropNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_DefocusNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_DisplaceNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_FilterNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_FlipNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_GammaNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_GlareNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_GroupNode.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_IDMaskNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ImageNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_InvertNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_KeyingNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_MapUVNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_MapValueNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_MaskNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_MathNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_MixNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_MovieClipNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_NormalNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_NormalizeNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_OutputFileNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_RotateNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.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
    trunk/blender/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_SwitchNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_TextureNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_TimeNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_TonemapNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_TransformNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_TranslateNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ValueNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ZCombineNode.cpp
    trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_CropOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixAddOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixBlendOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixBurnOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixColorOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixDivideOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixGlareOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixLightenOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixScreenOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixValueOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_NormalizeOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_TonemapOperation.cpp

Modified: trunk/blender/source/blender/compositor/intern/COM_NodeBase.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_NodeBase.cpp	2012-06-15 17:41:12 UTC (rev 47971)
+++ trunk/blender/source/blender/compositor/intern/COM_NodeBase.cpp	2012-06-15 17:57:39 UTC (rev 47972)
@@ -31,6 +31,7 @@
 
 NodeBase::NodeBase()
 {
+	/* pass */
 }
 
 

Modified: trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp	2012-06-15 17:41:12 UTC (rev 47971)
+++ trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp	2012-06-15 17:57:39 UTC (rev 47972)
@@ -69,6 +69,7 @@
 }
 void NodeOperation::initExecution()
 {
+	/* pass */
 }
 
 void NodeOperation::initMutex()
@@ -93,6 +94,7 @@
 
 void NodeOperation::deinitExecution()
 {
+	/* pass */
 }
 SocketReader *NodeOperation::getInputSocketReader(unsigned int inputSocketIndex)
 {

Modified: trunk/blender/source/blender/compositor/intern/COM_OutputSocket.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_OutputSocket.cpp	2012-06-15 17:41:12 UTC (rev 47971)
+++ trunk/blender/source/blender/compositor/intern/COM_OutputSocket.cpp	2012-06-15 17:57:39 UTC (rev 47972)
@@ -27,6 +27,7 @@
 
 OutputSocket::OutputSocket(DataType datatype) : Socket(datatype)
 {
+	/* pass */
 }
 
 int OutputSocket::isOutputSocket() const { return true; }

Modified: trunk/blender/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_AlphaOverNode.cpp	2012-06-15 17:41:12 UTC (rev 47971)
+++ trunk/blender/source/blender/compositor/nodes/COM_AlphaOverNode.cpp	2012-06-15 17:57:39 UTC (rev 47972)
@@ -31,7 +31,7 @@
 #include "COM_SetValueOperation.h"
 #include "DNA_material_types.h" // the ramp types
 
-void AlphaOverNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void AlphaOverNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *valueSocket = this->getInputSocket(0);
 	InputSocket *color1Socket = this->getInputSocket(1);
@@ -40,8 +40,8 @@
 	bNode *editorNode = this->getbNode();
 	
 	MixBaseOperation *convertProg;
-	NodeTwoFloats *ntf = (NodeTwoFloats*)editorNode->storage;
-	if (ntf->x!= 0.0f) {
+	NodeTwoFloats *ntf = (NodeTwoFloats *)editorNode->storage;
+	if (ntf->x != 0.0f) {
 		AlphaOverMixedOperation *mixOperation  = new AlphaOverMixedOperation();
 		mixOperation->setX(ntf->x);
 		convertProg = mixOperation;

Modified: trunk/blender/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp	2012-06-15 17:41:12 UTC (rev 47971)
+++ trunk/blender/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp	2012-06-15 17:57:39 UTC (rev 47972)
@@ -28,6 +28,7 @@
 
 BilateralBlurNode::BilateralBlurNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 void BilateralBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)

Modified: trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp	2012-06-15 17:41:12 UTC (rev 47971)
+++ trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp	2012-06-15 17:57:39 UTC (rev 47972)
@@ -31,6 +31,7 @@
 
 BlurNode::BlurNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)

Modified: trunk/blender/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_BokehBlurNode.cpp	2012-06-15 17:41:12 UTC (rev 47971)
+++ trunk/blender/source/blender/compositor/nodes/COM_BokehBlurNode.cpp	2012-06-15 17:57:39 UTC (rev 47972)
@@ -32,6 +32,7 @@
 
 BokehBlurNode::BokehBlurNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)

Modified: trunk/blender/source/blender/compositor/nodes/COM_BokehImageNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_BokehImageNode.cpp	2012-06-15 17:41:12 UTC (rev 47971)
+++ trunk/blender/source/blender/compositor/nodes/COM_BokehImageNode.cpp	2012-06-15 17:57:39 UTC (rev 47972)
@@ -25,15 +25,16 @@
 #include "COM_BokehImageOperation.h"
 #include "COM_ExecutionSystem.h"
 
-BokehImageNode::BokehImageNode(bNode *editorNode): Node(editorNode)
+BokehImageNode::BokehImageNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void BokehImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void BokehImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	BokehImageOperation *operation = new BokehImageOperation();
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
 	graph->addOperation(operation);
-	operation->setData((NodeBokehImage*)this->getbNode()->storage);
+	operation->setData((NodeBokehImage *)this->getbNode()->storage);
 	addPreviewOperation(graph, operation->getOutputSocket(0));
 }

Modified: trunk/blender/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_BoxMaskNode.cpp	2012-06-15 17:41:12 UTC (rev 47971)
+++ trunk/blender/source/blender/compositor/nodes/COM_BoxMaskNode.cpp	2012-06-15 17:57:39 UTC (rev 47972)
@@ -25,15 +25,16 @@
 #include "COM_BoxMaskOperation.h"
 #include "COM_ExecutionSystem.h"
 
-BoxMaskNode::BoxMaskNode(bNode *editorNode): Node(editorNode)
+BoxMaskNode::BoxMaskNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void BoxMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void BoxMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	BoxMaskOperation *operation;
 	operation = new BoxMaskOperation();
-	operation->setData((NodeBoxMask*)this->getbNode()->storage);
+	operation->setData((NodeBoxMask *)this->getbNode()->storage);
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));

Modified: trunk/blender/source/blender/compositor/nodes/COM_BrightnessNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_BrightnessNode.cpp	2012-06-15 17:41:12 UTC (rev 47971)
+++ trunk/blender/source/blender/compositor/nodes/COM_BrightnessNode.cpp	2012-06-15 17:57:39 UTC (rev 47972)
@@ -25,11 +25,12 @@
 #include "COM_BrightnessOperation.h"
 #include "COM_ExecutionSystem.h"
 
-BrightnessNode::BrightnessNode(bNode *editorNode): Node(editorNode)
+BrightnessNode::BrightnessNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void BrightnessNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void BrightnessNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	BrightnessOperation *operation = new BrightnessOperation();
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);

Modified: trunk/blender/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp	2012-06-15 17:41:12 UTC (rev 47971)
+++ trunk/blender/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp	2012-06-15 17:57:39 UTC (rev 47972)
@@ -27,8 +27,10 @@
 #include "COM_ConvertRGBToYUVOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-ChannelMatteNode::ChannelMatteNode(bNode *editorNode): Node(editorNode)
-{}
+ChannelMatteNode::ChannelMatteNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
 void ChannelMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
@@ -36,30 +38,30 @@
 	OutputSocket *outputSocketImage = this->getOutputSocket(0);
 	OutputSocket *outputSocketMatte = this->getOutputSocket(1);
 
-	NodeOperation *convert=NULL;
+	NodeOperation *convert = NULL;
 	bNode *node = this->getbNode();
 
 	/* colorspace */
 	switch (node->custom1) {
-	case CMP_NODE_CHANNEL_MATTE_CS_RGB:
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_HSV: /*HSV*/
-		convert = new ConvertRGBToHSVOperation();
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_YUV: /*YUV*/
-		convert = new ConvertRGBToYUVOperation();
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_YCC: /*YCC*/
-		convert = new ConvertRGBToYCCOperation();
-		((ConvertRGBToYCCOperation *)convert)->setMode(0); /* BLI_YCC_ITU_BT601 */
-		break;
-	default:
-		break;
+		case CMP_NODE_CHANNEL_MATTE_CS_RGB:
+			break;
+		case CMP_NODE_CHANNEL_MATTE_CS_HSV: /*HSV*/
+			convert = new ConvertRGBToHSVOperation();
+			break;
+		case CMP_NODE_CHANNEL_MATTE_CS_YUV: /*YUV*/
+			convert = new ConvertRGBToYUVOperation();
+			break;
+		case CMP_NODE_CHANNEL_MATTE_CS_YCC: /*YCC*/
+			convert = new ConvertRGBToYCCOperation();
+			((ConvertRGBToYCCOperation *)convert)->setMode(0); /* BLI_YCC_ITU_BT601 */
+			break;
+		default:
+			break;
 	}
 
 	ChannelMatteOperation *operation = new ChannelMatteOperation();
 	/* pass the ui properties to the operation */
-	operation->setSettings((NodeChroma*)node->storage, node->custom2);
+	operation->setSettings((NodeChroma *)node->storage, node->custom2);
 
 	SetAlphaOperation *operationAlpha = new SetAlphaOperation();
 

Modified: trunk/blender/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp	2012-06-15 17:41:12 UTC (rev 47971)
+++ trunk/blender/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp	2012-06-15 17:57:39 UTC (rev 47972)
@@ -25,8 +25,10 @@

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list