[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45937] branches/tile/source/blender/ compositor/operations: TileBranch
Jeroen Bakker
j.bakker at atmind.nl
Tue Apr 24 18:55:19 CEST 2012
Revision: 45937
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45937
Author: jbakker
Date: 2012-04-24 16:55:19 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
TileBranch
* converted spaces to tabs
Modified Paths:
--------------
branches/tile/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
branches/tile/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
branches/tile/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
branches/tile/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
branches/tile/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
branches/tile/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
branches/tile/source/blender/compositor/operations/COM_BilateralBlurOperation.h
branches/tile/source/blender/compositor/operations/COM_BlurBaseOperation.h
branches/tile/source/blender/compositor/operations/COM_BokehBlurOperation.h
branches/tile/source/blender/compositor/operations/COM_BokehImageOperation.cpp
branches/tile/source/blender/compositor/operations/COM_BokehImageOperation.h
branches/tile/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
branches/tile/source/blender/compositor/operations/COM_BoxMaskOperation.h
branches/tile/source/blender/compositor/operations/COM_BrightnessOperation.cpp
branches/tile/source/blender/compositor/operations/COM_BrightnessOperation.h
branches/tile/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
branches/tile/source/blender/compositor/operations/COM_CalculateMeanOperation.h
branches/tile/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
branches/tile/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ChangeHSVOperation.h
branches/tile/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
branches/tile/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
branches/tile/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
branches/tile/source/blender/compositor/operations/COM_ColorCurveOperation.h
branches/tile/source/blender/compositor/operations/COM_ColorRampOperation.h
branches/tile/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
branches/tile/source/blender/compositor/operations/COM_CombineChannelsOperation.h
branches/tile/source/blender/compositor/operations/COM_CompositorOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
branches/tile/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
branches/tile/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
branches/tile/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
branches/tile/source/blender/compositor/operations/COM_MixBaseOperation.cpp
Modified: branches/tile/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h 2012-04-24 16:36:34 UTC (rev 45936)
+++ branches/tile/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h 2012-04-24 16:55:19 UTC (rev 45937)
@@ -31,14 +31,14 @@
*/
class AlphaOverKeyOperation : public MixBaseOperation {
public:
- /**
- * Default constructor
- */
- AlphaOverKeyOperation();
-
- /**
- * the inner loop of this program
- */
+ /**
+ * Default constructor
+ */
+ AlphaOverKeyOperation();
+
+ /**
+ * the inner loop of this program
+ */
void executePixel(float* color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
};
#endif
Modified: branches/tile/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp 2012-04-24 16:36:34 UTC (rev 45936)
+++ branches/tile/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp 2012-04-24 16:55:19 UTC (rev 45937)
@@ -23,39 +23,39 @@
#include "COM_AlphaOverMixedOperation.h"
AlphaOverMixedOperation::AlphaOverMixedOperation(): MixBaseOperation() {
- this->x = 0.0f;
+ this->x = 0.0f;
}
void AlphaOverMixedOperation::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 addfac= 1.0f - this->x + inputOverColor[3]*this->x;
- float premul= value[0]*addfac;
- float mul= 1.0f - value[0]*inputOverColor[3];
-
- 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 addfac= 1.0f - this->x + inputOverColor[3]*this->x;
+ float premul= value[0]*addfac;
+ float mul= 1.0f - value[0]*inputOverColor[3];
+
+ 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_AlphaOverMixedOperation.h
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h 2012-04-24 16:36:34 UTC (rev 45936)
+++ branches/tile/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h 2012-04-24 16:55:19 UTC (rev 45937)
@@ -31,18 +31,18 @@
*/
class AlphaOverMixedOperation : public MixBaseOperation {
private:
- float x;
+ float x;
public:
- /**
- * Default constructor
- */
- AlphaOverMixedOperation();
-
- /**
- * the inner loop of this program
- */
+ /**
+ * Default constructor
+ */
+ AlphaOverMixedOperation();
+
+ /**
+ * the inner loop of this program
+ */
void executePixel(float* color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
-
- void setX(float x) {this->x = x;}
+
+ void setX(float x) {this->x = x;}
};
#endif
Modified: branches/tile/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp 2012-04-24 16:36:34 UTC (rev 45936)
+++ branches/tile/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp 2012-04-24 16:55:19 UTC (rev 45937)
@@ -26,34 +26,34 @@
}
void AlphaOverPremultiplyOperation::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);
-
+
/* Zero alpha values should still permit an add of RGB data */
- 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 mul= 1.0f - value[0]*inputOverColor[3];
-
- outputValue[0]= (mul*inputColor1[0]) + value[0]*inputOverColor[0];
- outputValue[1]= (mul*inputColor1[1]) + value[0]*inputOverColor[1];
- outputValue[2]= (mul*inputColor1[2]) + value[0]*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 mul= 1.0f - value[0]*inputOverColor[3];
+
+ outputValue[0]= (mul*inputColor1[0]) + value[0]*inputOverColor[0];
+ outputValue[1]= (mul*inputColor1[1]) + value[0]*inputOverColor[1];
+ outputValue[2]= (mul*inputColor1[2]) + value[0]*inputOverColor[2];
+ outputValue[3]= (mul*inputColor1[3]) + value[0]*inputOverColor[3];
+ }
}
Modified: branches/tile/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h 2012-04-24 16:36:34 UTC (rev 45936)
+++ branches/tile/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h 2012-04-24 16:55:19 UTC (rev 45937)
@@ -31,14 +31,14 @@
*/
class AlphaOverPremultiplyOperation : public MixBaseOperation {
public:
- /**
- * Default constructor
- */
- AlphaOverPremultiplyOperation();
-
- /**
- * the inner loop of this program
- */
+ /**
+ * Default constructor
+ */
+ AlphaOverPremultiplyOperation();
+
+ /**
+ * the inner loop of this program
+ */
void executePixel(float* color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
};
Modified: branches/tile/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp 2012-04-24 16:36:34 UTC (rev 45936)
+++ branches/tile/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp 2012-04-24 16:55:19 UTC (rev 45937)
@@ -68,8 +68,8 @@
// read determinator
this->inputDeterminatorProgram->read(determinator, xi, yi, inputBuffers, data);
deltaColor = fabsf(determinatorReferenceColor[0] - determinator[0])+
- fabsf(determinatorReferenceColor[1] - determinator[1])+
- fabsf(determinatorReferenceColor[2] - determinator[2]); // do not take the alpha channel into account
+ fabsf(determinatorReferenceColor[1] - determinator[1])+
+ fabsf(determinatorReferenceColor[2] - determinator[2]); // do not take the alpha channel into account
if (deltaColor< sigmacolor) {
// add this to the blur
this->inputColorProgram->read(tempColor, xi, yi, inputBuffers, data);
Modified: branches/tile/source/blender/compositor/operations/COM_BilateralBlurOperation.h
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_BilateralBlurOperation.h 2012-04-24 16:36:34 UTC (rev 45936)
+++ branches/tile/source/blender/compositor/operations/COM_BilateralBlurOperation.h 2012-04-24 16:55:19 UTC (rev 45937)
@@ -34,23 +34,23 @@
public:
BilateralBlurOperation();
- /**
- * 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);
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list