[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45921] branches/tile/source/blender/ compositor: TileBranch
Jeroen Bakker
j.bakker at atmind.nl
Tue Apr 24 14:38:03 CEST 2012
Revision: 45921
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45921
Author: jbakker
Date: 2012-04-24 12:38:03 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
TileBranch
* Converted spaces to tab in the nodes nodes directory
Modified Paths:
--------------
branches/tile/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/tile/source/blender/compositor/intern/COM_MemoryManagerState.h
branches/tile/source/blender/compositor/intern/COM_SocketReader.h
branches/tile/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
branches/tile/source/blender/compositor/nodes/COM_AlphaOverNode.h
branches/tile/source/blender/compositor/nodes/COM_BilateralBlurNode.h
branches/tile/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/tile/source/blender/compositor/nodes/COM_BlurNode.h
branches/tile/source/blender/compositor/nodes/COM_BokehBlurNode.h
branches/tile/source/blender/compositor/nodes/COM_BokehImageNode.cpp
branches/tile/source/blender/compositor/nodes/COM_BokehImageNode.h
branches/tile/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
branches/tile/source/blender/compositor/nodes/COM_BoxMaskNode.h
branches/tile/source/blender/compositor/nodes/COM_BrightnessNode.cpp
branches/tile/source/blender/compositor/nodes/COM_BrightnessNode.h
branches/tile/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ColorBalanceNode.h
branches/tile/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ColorCorrectionNode.h
branches/tile/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ColorRampNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ColorRampNode.h
branches/tile/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ColorToBWNode.h
branches/tile/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
branches/tile/source/blender/compositor/nodes/COM_CombineHSVANode.h
branches/tile/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
branches/tile/source/blender/compositor/nodes/COM_CombineRGBANode.h
branches/tile/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/tile/source/blender/compositor/nodes/COM_CompositorNode.h
branches/tile/source/blender/compositor/nodes/COM_DefocusNode.h
branches/tile/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
branches/tile/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
branches/tile/source/blender/compositor/nodes/COM_DilateErodeNode.h
branches/tile/source/blender/compositor/nodes/COM_DirectionalBlurNode.h
branches/tile/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
branches/tile/source/blender/compositor/nodes/COM_EllipseMaskNode.h
branches/tile/source/blender/compositor/nodes/COM_FilterNode.cpp
branches/tile/source/blender/compositor/nodes/COM_FilterNode.h
branches/tile/source/blender/compositor/nodes/COM_FlipNode.cpp
branches/tile/source/blender/compositor/nodes/COM_FlipNode.h
branches/tile/source/blender/compositor/nodes/COM_GammaNode.cpp
branches/tile/source/blender/compositor/nodes/COM_GammaNode.h
branches/tile/source/blender/compositor/nodes/COM_GlareNode.h
branches/tile/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
branches/tile/source/blender/compositor/nodes/COM_HueSaturationValueNode.h
branches/tile/source/blender/compositor/nodes/COM_IDMaskNode.cpp
branches/tile/source/blender/compositor/nodes/COM_IDMaskNode.h
branches/tile/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ImageNode.h
branches/tile/source/blender/compositor/nodes/COM_InvertNode.cpp
branches/tile/source/blender/compositor/nodes/COM_InvertNode.h
branches/tile/source/blender/compositor/nodes/COM_LensDistortionNode.h
branches/tile/source/blender/compositor/nodes/COM_MapUVNode.h
branches/tile/source/blender/compositor/nodes/COM_MapValueNode.cpp
branches/tile/source/blender/compositor/nodes/COM_MapValueNode.h
branches/tile/source/blender/compositor/nodes/COM_MathNode.cpp
branches/tile/source/blender/compositor/nodes/COM_MathNode.h
branches/tile/source/blender/compositor/nodes/COM_MixNode.cpp
branches/tile/source/blender/compositor/nodes/COM_MovieClipNode.cpp
branches/tile/source/blender/compositor/nodes/COM_MovieClipNode.h
branches/tile/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
branches/tile/source/blender/compositor/nodes/COM_MovieDistortionNode.h
branches/tile/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/tile/source/blender/compositor/nodes/COM_MuteNode.h
branches/tile/source/blender/compositor/nodes/COM_NormalNode.cpp
branches/tile/source/blender/compositor/nodes/COM_NormalNode.h
branches/tile/source/blender/compositor/nodes/COM_NormalizeNode.h
branches/tile/source/blender/compositor/nodes/COM_RenderLayersNode.h
branches/tile/source/blender/compositor/nodes/COM_RotateNode.h
branches/tile/source/blender/compositor/nodes/COM_ScaleNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ScaleNode.h
branches/tile/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
branches/tile/source/blender/compositor/nodes/COM_SeparateHSVANode.h
branches/tile/source/blender/compositor/nodes/COM_SeparateRGBANode.h
branches/tile/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
branches/tile/source/blender/compositor/nodes/COM_SetAlphaNode.h
branches/tile/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/tile/source/blender/compositor/nodes/COM_SplitViewerNode.h
branches/tile/source/blender/compositor/nodes/COM_TonemapNode.cpp
branches/tile/source/blender/compositor/nodes/COM_TonemapNode.h
branches/tile/source/blender/compositor/nodes/COM_TranslateNode.cpp
branches/tile/source/blender/compositor/nodes/COM_TranslateNode.h
branches/tile/source/blender/compositor/nodes/COM_VectorBlurNode.h
branches/tile/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ViewLevelsNode.h
branches/tile/source/blender/compositor/nodes/COM_ViewerNode.h
Modified: branches/tile/source/blender/compositor/intern/COM_MemoryBuffer.h
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_MemoryBuffer.h 2012-04-24 12:27:38 UTC (rev 45920)
+++ branches/tile/source/blender/compositor/intern/COM_MemoryBuffer.h 2012-04-24 12:38:03 UTC (rev 45921)
@@ -29,7 +29,7 @@
#include "BLI_rect.h"
#include "COM_MemoryProxy.h"
extern "C" {
- #include "BLI_threads.h"
+ #include "BLI_threads.h"
}
#include <vector>
Modified: branches/tile/source/blender/compositor/intern/COM_MemoryManagerState.h
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_MemoryManagerState.h 2012-04-24 12:27:38 UTC (rev 45920)
+++ branches/tile/source/blender/compositor/intern/COM_MemoryManagerState.h 2012-04-24 12:38:03 UTC (rev 45921)
@@ -29,7 +29,7 @@
#include "COM_MemoryBuffer.h"
#include <vector>
extern "C" {
- #include "BLI_threads.h"
+ #include "BLI_threads.h"
}
/**
Modified: branches/tile/source/blender/compositor/intern/COM_SocketReader.h
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_SocketReader.h 2012-04-24 12:27:38 UTC (rev 45920)
+++ branches/tile/source/blender/compositor/intern/COM_SocketReader.h 2012-04-24 12:38:03 UTC (rev 45921)
@@ -73,7 +73,7 @@
virtual void executePixel(float* result, int x, int y, MemoryBuffer *inputBuffers[], void* chunkData) {
executePixel(result, x, y, COM_PS_NEAREST, inputBuffers);
}
-
+
/**
* @brief calculate a single pixel using an EWA filter
* @note this method is called for complex
Modified: branches/tile/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_AlphaOverNode.cpp 2012-04-24 12:27:38 UTC (rev 45920)
+++ branches/tile/source/blender/compositor/nodes/COM_AlphaOverNode.cpp 2012-04-24 12:38:03 UTC (rev 45921)
@@ -32,36 +32,36 @@
#include "DNA_material_types.h" // the ramp types
void AlphaOverNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
- InputSocket *valueSocket = this->getInputSocket(0);
- InputSocket *color1Socket = this->getInputSocket(1);
- InputSocket *color2Socket = this->getInputSocket(2);
- OutputSocket *outputSocket = this->getOutputSocket(0);
- bNode* editorNode = this->getbNode();
-
- MixBaseOperation *convertProg;
- NodeTwoFloats *ntf= (NodeTwoFloats*)editorNode->storage;
- if (ntf->x!= 0.0f) {
- AlphaOverMixedOperation *mixOperation = new AlphaOverMixedOperation();
- mixOperation->setX(ntf->x);
- convertProg = mixOperation;
-
- } else if (editorNode->custom1) {
- convertProg = new AlphaOverKeyOperation();
- } else {
- convertProg = new AlphaOverPremultiplyOperation();
- }
-
- convertProg->setUseValueAlphaMultiply(false);
- if (color1Socket->isConnected()) {
- convertProg->setResolutionInputSocketIndex(1);
- } else if (color2Socket->isConnected()) {
- convertProg->setResolutionInputSocketIndex(2);
- } else {
- convertProg->setResolutionInputSocketIndex(0);
- }
- valueSocket->relinkConnections(convertProg->getInputSocket(0), true, 0, graph);
- color1Socket->relinkConnections(convertProg->getInputSocket(1), true, 1, graph);
- color2Socket->relinkConnections(convertProg->getInputSocket(2), true, 2, graph);
- outputSocket->relinkConnections(convertProg->getOutputSocket(0));
- graph->addOperation(convertProg);
+ InputSocket *valueSocket = this->getInputSocket(0);
+ InputSocket *color1Socket = this->getInputSocket(1);
+ InputSocket *color2Socket = this->getInputSocket(2);
+ OutputSocket *outputSocket = this->getOutputSocket(0);
+ bNode* editorNode = this->getbNode();
+
+ MixBaseOperation *convertProg;
+ NodeTwoFloats *ntf= (NodeTwoFloats*)editorNode->storage;
+ if (ntf->x!= 0.0f) {
+ AlphaOverMixedOperation *mixOperation = new AlphaOverMixedOperation();
+ mixOperation->setX(ntf->x);
+ convertProg = mixOperation;
+
+ } else if (editorNode->custom1) {
+ convertProg = new AlphaOverKeyOperation();
+ } else {
+ convertProg = new AlphaOverPremultiplyOperation();
+ }
+
+ convertProg->setUseValueAlphaMultiply(false);
+ if (color1Socket->isConnected()) {
+ convertProg->setResolutionInputSocketIndex(1);
+ } else if (color2Socket->isConnected()) {
+ convertProg->setResolutionInputSocketIndex(2);
+ } else {
+ convertProg->setResolutionInputSocketIndex(0);
+ }
+ valueSocket->relinkConnections(convertProg->getInputSocket(0), true, 0, graph);
+ color1Socket->relinkConnections(convertProg->getInputSocket(1), true, 1, graph);
+ color2Socket->relinkConnections(convertProg->getInputSocket(2), true, 2, graph);
+ outputSocket->relinkConnections(convertProg->getOutputSocket(0));
+ graph->addOperation(convertProg);
}
Modified: branches/tile/source/blender/compositor/nodes/COM_AlphaOverNode.h
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_AlphaOverNode.h 2012-04-24 12:27:38 UTC (rev 45920)
+++ branches/tile/source/blender/compositor/nodes/COM_AlphaOverNode.h 2012-04-24 12:38:03 UTC (rev 45921)
@@ -31,7 +31,7 @@
*/
class AlphaOverNode: public Node {
public:
- AlphaOverNode(bNode* editorNode) :Node(editorNode) {}
+ AlphaOverNode(bNode* editorNode) :Node(editorNode) {}
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
};
Modified: branches/tile/source/blender/compositor/nodes/COM_BilateralBlurNode.h
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_BilateralBlurNode.h 2012-04-24 12:27:38 UTC (rev 45920)
+++ branches/tile/source/blender/compositor/nodes/COM_BilateralBlurNode.h 2012-04-24 12:38:03 UTC (rev 45921)
@@ -32,7 +32,7 @@
class BilateralBlurNode: public Node {
public:
BilateralBlurNode(bNode *editorNode);
- void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+ void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
};
#endif
Modified: branches/tile/source/blender/compositor/nodes/COM_BlurNode.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_BlurNode.cpp 2012-04-24 12:27:38 UTC (rev 45920)
+++ branches/tile/source/blender/compositor/nodes/COM_BlurNode.cpp 2012-04-24 12:38:03 UTC (rev 45921)
@@ -32,7 +32,7 @@
}
void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
- bNode* editorNode = this->getbNode();
+ bNode* editorNode = this->getbNode();
NodeBlurData * data = (NodeBlurData*)editorNode->storage;
const bNodeSocket *sock = this->getInputSocket(1)->getbNodeSocket();
const float size = ((const bNodeSocketValueFloat*)sock->default_value)->value;
Modified: branches/tile/source/blender/compositor/nodes/COM_BlurNode.h
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_BlurNode.h 2012-04-24 12:27:38 UTC (rev 45920)
+++ branches/tile/source/blender/compositor/nodes/COM_BlurNode.h 2012-04-24 12:38:03 UTC (rev 45921)
@@ -33,7 +33,7 @@
class BlurNode: public Node {
public:
BlurNode(bNode *editorNode);
- void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+ void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
};
#endif
Modified: branches/tile/source/blender/compositor/nodes/COM_BokehBlurNode.h
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_BokehBlurNode.h 2012-04-24 12:27:38 UTC (rev 45920)
+++ branches/tile/source/blender/compositor/nodes/COM_BokehBlurNode.h 2012-04-24 12:38:03 UTC (rev 45921)
@@ -33,7 +33,7 @@
class BokehBlurNode: public Node {
public:
BokehBlurNode(bNode *editorNode);
- void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+ void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
};
#endif
Modified: branches/tile/source/blender/compositor/nodes/COM_BokehImageNode.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_BokehImageNode.cpp 2012-04-24 12:27:38 UTC (rev 45920)
+++ branches/tile/source/blender/compositor/nodes/COM_BokehImageNode.cpp 2012-04-24 12:38:03 UTC (rev 45921)
@@ -30,8 +30,8 @@
void BokehImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
BokehImageOperation *operation = new BokehImageOperation();
- this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
- graph->addOperation(operation);
+ this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
+ graph->addOperation(operation);
operation->setData((NodeBokehImage*)this->getbNode()->storage);
addPreviewOperation(graph, operation->getOutputSocket(0), 9);
}
Modified: branches/tile/source/blender/compositor/nodes/COM_BokehImageNode.h
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_BokehImageNode.h 2012-04-24 12:27:38 UTC (rev 45920)
+++ branches/tile/source/blender/compositor/nodes/COM_BokehImageNode.h 2012-04-24 12:38:03 UTC (rev 45921)
@@ -32,7 +32,7 @@
class BokehImageNode: public Node {
public:
BokehImageNode(bNode *editorNode);
- void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+ void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
};
#endif
Modified: branches/tile/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_BoxMaskNode.cpp 2012-04-24 12:27:38 UTC (rev 45920)
+++ branches/tile/source/blender/compositor/nodes/COM_BoxMaskNode.cpp 2012-04-24 12:38:03 UTC (rev 45921)
@@ -29,13 +29,13 @@
}
void BoxMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
- BoxMaskOperation *operation;
- operation = new BoxMaskOperation();
- operation->setData((NodeBoxMask*)this->getbNode()->storage);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list