[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45931] branches/tile/source/blender/ compositor: TileBranch
Jeroen Bakker
j.bakker at atmind.nl
Tue Apr 24 18:08:40 CEST 2012
Revision: 45931
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45931
Author: jbakker
Date: 2012-04-24 16:08:39 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
TileBranch
* converted spaces => tabs
Modified Paths:
--------------
branches/tile/source/blender/compositor/CMakeLists.txt
branches/tile/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
branches/tile/source/blender/compositor/operations/COM_CurveBaseOperation.h
branches/tile/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
branches/tile/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/tile/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
branches/tile/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
branches/tile/source/blender/compositor/operations/COM_DistanceMatteOperation.h
branches/tile/source/blender/compositor/operations/COM_DotproductOperation.cpp
branches/tile/source/blender/compositor/operations/COM_DotproductOperation.h
branches/tile/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
branches/tile/source/blender/compositor/operations/COM_EllipseMaskOperation.h
branches/tile/source/blender/compositor/operations/COM_FlipOperation.cpp
branches/tile/source/blender/compositor/operations/COM_FlipOperation.h
branches/tile/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
branches/tile/source/blender/compositor/operations/COM_GammaCorrectOperation.h
branches/tile/source/blender/compositor/operations/COM_GammaOperation.cpp
branches/tile/source/blender/compositor/operations/COM_GammaOperation.h
branches/tile/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/tile/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
branches/tile/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/tile/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
branches/tile/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/tile/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
branches/tile/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
branches/tile/source/blender/compositor/operations/COM_IDMaskOperation.cpp
branches/tile/source/blender/compositor/operations/COM_IDMaskOperation.h
branches/tile/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ImageOperation.h
branches/tile/source/blender/compositor/operations/COM_InvertOperation.cpp
branches/tile/source/blender/compositor/operations/COM_InvertOperation.h
branches/tile/source/blender/compositor/operations/COM_LensGhostOperation.h
branches/tile/source/blender/compositor/operations/COM_LensGlowImageOperation.cpp
branches/tile/source/blender/compositor/operations/COM_LensGlowImageOperation.h
branches/tile/source/blender/compositor/operations/COM_LensGlowOperation.cpp
branches/tile/source/blender/compositor/operations/COM_LensGlowOperation.h
branches/tile/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
branches/tile/source/blender/compositor/operations/COM_MapValueOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MapValueOperation.h
branches/tile/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/tile/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixAddOperation.h
branches/tile/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/tile/source/blender/compositor/operations/COM_MixBlendOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixBlendOperation.h
branches/tile/source/blender/compositor/operations/COM_MixBurnOperation.h
branches/tile/source/blender/compositor/operations/COM_MixColorOperation.h
branches/tile/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixDarkenOperation.h
branches/tile/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixDifferenceOperation.h
branches/tile/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixDivideOperation.h
branches/tile/source/blender/compositor/operations/COM_MixDodgeOperation.h
branches/tile/source/blender/compositor/operations/COM_MixHueOperation.h
branches/tile/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixLightenOperation.h
branches/tile/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixLinearLightOperation.h
branches/tile/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixMultiplyOperation.h
branches/tile/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixOverlayOperation.h
branches/tile/source/blender/compositor/operations/COM_MixSaturationOperation.h
branches/tile/source/blender/compositor/operations/COM_MixScreenOperation.h
branches/tile/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixSoftLightOperation.h
branches/tile/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MixSubtractOperation.h
branches/tile/source/blender/compositor/operations/COM_MixValueOperation.h
branches/tile/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
branches/tile/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MovieClipOperation.h
branches/tile/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/tile/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/tile/source/blender/compositor/operations/COM_MultilayerImageOperation.h
branches/tile/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/tile/source/blender/compositor/operations/COM_PreviewOperation.h
branches/tile/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
branches/tile/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersAOOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersColorOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersEmitOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersImageProg.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersMistOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersNormalOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersShadowOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.h
branches/tile/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
branches/tile/source/blender/compositor/operations/COM_RenderLayersUVOperation.h
branches/tile/source/blender/compositor/operations/COM_RotateOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ScaleOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
branches/tile/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SeparateChannelOperation.h
branches/tile/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SetAlphaOperation.h
branches/tile/source/blender/compositor/operations/COM_SetColorOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SetColorOperation.h
branches/tile/source/blender/compositor/operations/COM_SetValueOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SetVectorOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SetVectorOperation.h
branches/tile/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SocketProxyOperation.h
branches/tile/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/tile/source/blender/compositor/operations/COM_SplitViewerOperation.h
branches/tile/source/blender/compositor/operations/COM_TextureOperation.h
branches/tile/source/blender/compositor/operations/COM_TonemapOperation.cpp
branches/tile/source/blender/compositor/operations/COM_TonemapOperation.h
branches/tile/source/blender/compositor/operations/COM_TranslateOperation.cpp
branches/tile/source/blender/compositor/operations/COM_VectorCurveOperation.h
branches/tile/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ViewerBaseOperation.h
branches/tile/source/blender/compositor/operations/COM_ViewerOperation.h
branches/tile/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/tile/source/blender/compositor/operations/COM_ZCombineOperation.h
Modified: branches/tile/source/blender/compositor/CMakeLists.txt
===================================================================
--- branches/tile/source/blender/compositor/CMakeLists.txt 2012-04-24 16:08:37 UTC (rev 45930)
+++ branches/tile/source/blender/compositor/CMakeLists.txt 2012-04-24 16:08:39 UTC (rev 45931)
@@ -590,7 +590,6 @@
operations/COM_MovieClipOperation.h
operations/COM_ConvertColorProfileOperation.cpp
operations/COM_ConvertColorProfileOperation.h
-# operations/COM_OpenCLKernels.cl.cpp
)
blender_add_lib(bf_compositor "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/tile/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp 2012-04-24 16:08:37 UTC (rev 45930)
+++ branches/tile/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp 2012-04-24 16:08:39 UTC (rev 45931)
@@ -26,33 +26,33 @@
}
void AlphaOverKeyOperation::executePixel(float* outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) {
- float inputColor1[4];
- float inputOverColor[4];
- float value[4];
-
+ float inputColor1[4];
+ float inputOverColor[4];
+ float value[4];
+
inputValueOperation->read(value, x, y, sampler, inputBuffers);
inputColor1Operation->read(inputColor1, x, y, sampler, inputBuffers);
inputColor2Operation->read(inputOverColor, x, y, sampler, inputBuffers);
-
- if(inputOverColor[3]<=0.0f) {
- outputValue[0] = inputColor1[0];
- outputValue[1] = inputColor1[1];
- outputValue[2] = inputColor1[2];
- outputValue[3] = inputColor1[3];
- }
- else if(value[0]==1.0f && inputOverColor[3]>=1.0f) {
- outputValue[0] = inputOverColor[0];
- outputValue[1] = inputOverColor[1];
- outputValue[2] = inputOverColor[2];
- outputValue[3] = inputOverColor[3];
- }
- else {
- float premul= value[0]*inputOverColor[3];
- float mul= 1.0f - premul;
-
- outputValue[0]= (mul*inputColor1[0]) + premul*inputOverColor[0];
- outputValue[1]= (mul*inputColor1[1]) + premul*inputOverColor[1];
- outputValue[2]= (mul*inputColor1[2]) + premul*inputOverColor[2];
- outputValue[3]= (mul*inputColor1[3]) + value[0]*inputOverColor[3];
- }
+
+ if(inputOverColor[3]<=0.0f) {
+ outputValue[0] = inputColor1[0];
+ outputValue[1] = inputColor1[1];
+ outputValue[2] = inputColor1[2];
+ outputValue[3] = inputColor1[3];
+ }
+ else if(value[0]==1.0f && inputOverColor[3]>=1.0f) {
+ outputValue[0] = inputOverColor[0];
+ outputValue[1] = inputOverColor[1];
+ outputValue[2] = inputOverColor[2];
+ outputValue[3] = inputOverColor[3];
+ }
+ else {
+ float premul= value[0]*inputOverColor[3];
+ float mul= 1.0f - premul;
+
+ outputValue[0]= (mul*inputColor1[0]) + premul*inputOverColor[0];
+ outputValue[1]= (mul*inputColor1[1]) + premul*inputOverColor[1];
+ outputValue[2]= (mul*inputColor1[2]) + premul*inputOverColor[2];
+ outputValue[3]= (mul*inputColor1[3]) + value[0]*inputOverColor[3];
+ }
}
Modified: branches/tile/source/blender/compositor/operations/COM_CurveBaseOperation.h
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_CurveBaseOperation.h 2012-04-24 16:08:37 UTC (rev 45930)
+++ branches/tile/source/blender/compositor/operations/COM_CurveBaseOperation.h 2012-04-24 16:08:39 UTC (rev 45931)
@@ -27,18 +27,18 @@
class CurveBaseOperation : public NodeOperation {
protected:
- /**
- * Cached reference to the inputProgram
- */
+ /**
+ * Cached reference to the inputProgram
+ */
CurveMapping *curveMapping;
public:
CurveBaseOperation();
-
+
/**
- * Initialize the execution
- */
- void initExecution();
-
+ * Initialize the execution
+ */
+ void initExecution();
+
void setCurveMapping(CurveMapping* mapping) {this->curveMapping = mapping;}
};
#endif
Modified: branches/tile/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_DifferenceMatteOperation.h 2012-04-24 16:08:37 UTC (rev 45930)
+++ branches/tile/source/blender/compositor/operations/COM_DifferenceMatteOperation.h 2012-04-24 16:08:39 UTC (rev 45931)
@@ -35,19 +35,19 @@
SocketReader * inputImage1Program;
SocketReader* inputImage2Program;
public:
- /**
- * Default constructor
- */
+ /**
+ * Default constructor
+ */
DifferenceMatteOperation();
-
- /**
- * the inner loop of this program
- */
+
+ /**
+ * the inner loop of this program
+ */
void executePixel(float* color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
-
+
void initExecution();
void deinitExecution();
-
+
void setSettings(NodeChroma* nodeChroma) {this->settings= nodeChroma;}
};
#endif
Modified: branches/tile/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_DilateErodeOperation.cpp 2012-04-24 16:08:37 UTC (rev 45930)
+++ branches/tile/source/blender/compositor/operations/COM_DilateErodeOperation.cpp 2012-04-24 16:08:39 UTC (rev 45931)
@@ -24,10 +24,10 @@
#include "BLI_math.h"
DilateErodeOperation::DilateErodeOperation(): NodeOperation() {
- this->addInputSocket(COM_DT_VALUE);
- this->addOutputSocket(COM_DT_VALUE);
+ this->addInputSocket(COM_DT_VALUE);
+ this->addOutputSocket(COM_DT_VALUE);
this->setComplex(true);
- this->inputProgram = NULL;
+ this->inputProgram = NULL;
this->inset = 0.0f;
this->_switch = 0.5f;
this->distance = 0.0f;
Modified: branches/tile/source/blender/compositor/operations/COM_DilateErodeOperation.h
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_DilateErodeOperation.h 2012-04-24 16:08:37 UTC (rev 45930)
+++ branches/tile/source/blender/compositor/operations/COM_DilateErodeOperation.h 2012-04-24 16:08:39 UTC (rev 45931)
@@ -27,15 +27,15 @@
class DilateErodeOperation : public NodeOperation {
private:
- /**
- * Cached reference to the inputProgram
- */
+ /**
+ * Cached reference to the inputProgram
+ */
SocketReader * inputProgram;
-
+
float distance;
float _switch;
float inset;
-
+
/**
* determines the area of interest to track pixels
* keep this one as small as possible for speed gain.
@@ -43,29 +43,29 @@
int scope;
public:
DilateErodeOperation();
-
- /**
- * the inner loop of this program
- */
+
+ /**
+ * the inner loop of this program
+ */
void executePixel(float* color, int x, int y, MemoryBuffer *inputBuffers[], void* data);
-
- /**
- * Initialize the execution
- */
+
+ /**
+ * Initialize the execution
+ */
void initExecution();
-
+
void* initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
- /**
- * Deinitialize the execution
- */
- void deinitExecution();
-
+ /**
+ * Deinitialize the execution
+ */
+ void deinitExecution();
+
void setData(NodeDilateErode* data) {this->distance= data->distance;this->inset = data->inset;this->_switch = data->sw;}
void setDistance(float distance) {this->distance = distance;}
void setSwitch(float sw) {this->_switch = sw;}
void setInset(float inset) {this->inset = inset;}
+
+ bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
- bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-
};
#endif
Modified: branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.h 2012-04-24 16:08:37 UTC (rev 45930)
+++ branches/tile/source/blender/compositor/operations/COM_DirectionalBlurOperation.h 2012-04-24 16:08:39 UTC (rev 45931)
@@ -38,23 +38,23 @@
DirectionalBlurOperation();
void* initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
- /**
- * the inner loop of this program
- */
+ /**
+ * the inner loop of this program
+ */
void executePixel(float* color, int x, int y, MemoryBuffer *inputBuffers[], void* data);
-
- /**
- * Initialize the execution
- */
- void initExecution();
-
- /**
- * Deinitialize the execution
- */
- void deinitExecution();
-
- bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-
+
+ /**
+ * Initialize the execution
+ */
+ void initExecution();
+
+ /**
+ * Deinitialize the execution
+ */
+ void deinitExecution();
+
+ bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
+
void setData(NodeDBlurData *data) {this->data = data;}
};
#endif
Modified: branches/tile/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp 2012-04-24 16:08:37 UTC (rev 45930)
+++ branches/tile/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp 2012-04-24 16:08:39 UTC (rev 45931)
@@ -55,8 +55,8 @@
this->inputImageProgram->read(inImage, x, y, sampler, inputBuffers);
distance = sqrt(pow((inKey[0]-inImage[0]),2)+
- pow((inKey[1]-inImage[1]),2)+
- pow((inKey[2]-inImage[2]),2));
+ pow((inKey[1]-inImage[1]),2)+
+ pow((inKey[2]-inImage[2]),2));
/* store matte(alpha) value in [0] to go with
* COM_SetAlphaOperation and the Value output
Modified: branches/tile/source/blender/compositor/operations/COM_DistanceMatteOperation.h
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_DistanceMatteOperation.h 2012-04-24 16:08:37 UTC (rev 45930)
+++ branches/tile/source/blender/compositor/operations/COM_DistanceMatteOperation.h 2012-04-24 16:08:39 UTC (rev 45931)
@@ -34,19 +34,19 @@
SocketReader *inputImageProgram;
SocketReader *inputKeyProgram;
public:
- /**
- * Default constructor
- */
+ /**
+ * Default constructor
+ */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list