Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-18 02:55:28 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-18 02:55:28 +0400
commit7862b2fa13c0437d9c17eae78e7b79a421dacf05 (patch)
tree08f9c26af3e71795d0f65803a415b5612d6b53ab /source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
parent69b95e1a8a00c9ff146d803b8ec11183d7a68908 (diff)
style cleanup: compositor, pointer syntax, function brace placement, line length
Diffstat (limited to 'source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp24
1 files changed, 13 insertions, 11 deletions
diff --git a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
index 48762e6370e..aedf6ec5e9e 100644
--- a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
+++ b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
@@ -22,11 +22,13 @@
#include "COM_AlphaOverMixedOperation.h"
-AlphaOverMixedOperation::AlphaOverMixedOperation(): MixBaseOperation() {
+AlphaOverMixedOperation::AlphaOverMixedOperation(): MixBaseOperation()
+{
this->x = 0.0f;
}
-void AlphaOverMixedOperation::executePixel(float* outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) {
+void AlphaOverMixedOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+{
float inputColor1[4];
float inputOverColor[4];
float value[4];
@@ -35,27 +37,27 @@ void AlphaOverMixedOperation::executePixel(float* outputValue, float x, float y,
inputColor1Operation->read(inputColor1, x, y, sampler, inputBuffers);
inputColor2Operation->read(inputOverColor, x, y, sampler, inputBuffers);
- if (inputOverColor[3]<=0.0f) {
+ 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) {
+ 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];
+ 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];
+ 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];
}
}