diff options
Diffstat (limited to 'source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp index 3e80de78223..c891142b808 100644 --- a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp +++ b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp @@ -22,10 +22,12 @@ #include "COM_AlphaOverKeyOperation.h" -AlphaOverKeyOperation::AlphaOverKeyOperation(): MixBaseOperation() { +AlphaOverKeyOperation::AlphaOverKeyOperation(): MixBaseOperation() +{ } -void AlphaOverKeyOperation::executePixel(float* outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) { +void AlphaOverKeyOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) +{ float inputColor1[4]; float inputOverColor[4]; float value[4]; @@ -34,25 +36,25 @@ void AlphaOverKeyOperation::executePixel(float* outputValue, float x, float y, P 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 premul= value[0]*inputOverColor[3]; - float mul= 1.0f - premul; + 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]; + 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]; } } |