diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-26 05:22:05 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-26 05:22:05 +0400 |
commit | 6a1d82490e49d1f5d73b5082516b087d44010fb8 (patch) | |
tree | 0650cce3c1d47db6c5de1f4f2ba05b619c412f09 /source/blender/compositor/operations/COM_ZCombineOperation.cpp | |
parent | 7a0ab62d3f65f3b28da2a6ba9916c21132f8ea0d (diff) |
use m_ prefix for compositor class members (all compositor operations).
Diffstat (limited to 'source/blender/compositor/operations/COM_ZCombineOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_ZCombineOperation.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.cpp b/source/blender/compositor/operations/COM_ZCombineOperation.cpp index eb02b150fa4..c1ea63432b9 100644 --- a/source/blender/compositor/operations/COM_ZCombineOperation.cpp +++ b/source/blender/compositor/operations/COM_ZCombineOperation.cpp @@ -31,19 +31,19 @@ ZCombineOperation::ZCombineOperation() : NodeOperation() this->addInputSocket(COM_DT_VALUE); this->addOutputSocket(COM_DT_COLOR); - this->image1Reader = NULL; - this->depth1Reader = NULL; - this->image2Reader = NULL; - this->depth2Reader = NULL; + this->m_image1Reader = NULL; + this->m_depth1Reader = NULL; + this->m_image2Reader = NULL; + this->m_depth2Reader = NULL; } void ZCombineOperation::initExecution() { - this->image1Reader = this->getInputSocketReader(0); - this->depth1Reader = this->getInputSocketReader(1); - this->image2Reader = this->getInputSocketReader(2); - this->depth2Reader = this->getInputSocketReader(3); + this->m_image1Reader = this->getInputSocketReader(0); + this->m_depth1Reader = this->getInputSocketReader(1); + this->m_image2Reader = this->getInputSocketReader(2); + this->m_depth2Reader = this->getInputSocketReader(3); } void ZCombineOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) @@ -51,13 +51,13 @@ void ZCombineOperation::executePixel(float *color, float x, float y, PixelSample float depth1[4]; float depth2[4]; - this->depth1Reader->read(depth1, x, y, sampler, inputBuffers); - this->depth2Reader->read(depth2, x, y, sampler, inputBuffers); + this->m_depth1Reader->read(depth1, x, y, sampler, inputBuffers); + this->m_depth2Reader->read(depth2, x, y, sampler, inputBuffers); if (depth1[0] < depth2[0]) { - this->image1Reader->read(color, x, y, sampler, inputBuffers); + this->m_image1Reader->read(color, x, y, sampler, inputBuffers); } else { - this->image2Reader->read(color, x, y, sampler, inputBuffers); + this->m_image2Reader->read(color, x, y, sampler, inputBuffers); } } void ZCombineAlphaOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) @@ -67,15 +67,15 @@ void ZCombineAlphaOperation::executePixel(float *color, float x, float y, PixelS float color1[4]; float color2[4]; - this->depth1Reader->read(depth1, x, y, sampler, inputBuffers); - this->depth2Reader->read(depth2, x, y, sampler, inputBuffers); + this->m_depth1Reader->read(depth1, x, y, sampler, inputBuffers); + this->m_depth2Reader->read(depth2, x, y, sampler, inputBuffers); if (depth1[0] < depth2[0]) { - this->image1Reader->read(color1, x, y, sampler, inputBuffers); - this->image2Reader->read(color2, x, y, sampler, inputBuffers); + this->m_image1Reader->read(color1, x, y, sampler, inputBuffers); + this->m_image2Reader->read(color2, x, y, sampler, inputBuffers); } else { - this->image1Reader->read(color2, x, y, sampler, inputBuffers); - this->image2Reader->read(color1, x, y, sampler, inputBuffers); + this->m_image1Reader->read(color2, x, y, sampler, inputBuffers); + this->m_image2Reader->read(color1, x, y, sampler, inputBuffers); } float fac = color1[3]; float ifac = 1.0f - fac; @@ -87,8 +87,8 @@ void ZCombineAlphaOperation::executePixel(float *color, float x, float y, PixelS void ZCombineOperation::deinitExecution() { - this->image1Reader = NULL; - this->depth1Reader = NULL; - this->image2Reader = NULL; - this->depth2Reader = NULL; + this->m_image1Reader = NULL; + this->m_depth1Reader = NULL; + this->m_image2Reader = NULL; + this->m_depth2Reader = NULL; } |