From 7862b2fa13c0437d9c17eae78e7b79a421dacf05 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 17 May 2012 22:55:28 +0000 Subject: style cleanup: compositor, pointer syntax, function brace placement, line length --- .../operations/COM_AlphaOverMixedOperation.cpp | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp') 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]; } } -- cgit v1.2.3