diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-18 02:55:28 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-18 02:55:28 +0400 |
commit | 7862b2fa13c0437d9c17eae78e7b79a421dacf05 (patch) | |
tree | 08f9c26af3e71795d0f65803a415b5612d6b53ab /source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp | |
parent | 69b95e1a8a00c9ff146d803b8ec11183d7a68908 (diff) |
style cleanup: compositor, pointer syntax, function brace placement, line length
Diffstat (limited to 'source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp index 99d1eb1cd14..8675caca1e2 100644 --- a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp +++ b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp @@ -23,7 +23,8 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -DisplaceSimpleOperation::DisplaceSimpleOperation(): NodeOperation() { +DisplaceSimpleOperation::DisplaceSimpleOperation(): NodeOperation() +{ this->addInputSocket(COM_DT_COLOR); this->addInputSocket(COM_DT_VECTOR); this->addInputSocket(COM_DT_VALUE); @@ -36,7 +37,8 @@ DisplaceSimpleOperation::DisplaceSimpleOperation(): NodeOperation() { this->inputScaleYProgram = NULL; } -void DisplaceSimpleOperation::initExecution() { +void DisplaceSimpleOperation::initExecution() +{ this->inputColorProgram = this->getInputSocketReader(0); this->inputVectorProgram = this->getInputSocketReader(1); this->inputScaleXProgram = this->getInputSocketReader(2); @@ -51,7 +53,7 @@ void DisplaceSimpleOperation::initExecution() { * in order to take effect */ #define DISPLACE_EPSILON 0.01f -void DisplaceSimpleOperation::executePixel(float* color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) +void DisplaceSimpleOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) { float inVector[4]; float inScale[4]; @@ -83,14 +85,16 @@ void DisplaceSimpleOperation::executePixel(float* color, float x, float y, Pixel this->inputColorProgram->read(color, u, v, sampler, inputBuffers); } -void DisplaceSimpleOperation::deinitExecution() { +void DisplaceSimpleOperation::deinitExecution() +{ this->inputColorProgram = NULL; this->inputVectorProgram = NULL; this->inputScaleXProgram = NULL; this->inputScaleYProgram = NULL; } -bool DisplaceSimpleOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output) { +bool DisplaceSimpleOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output) +{ rcti colorInput; NodeOperation *operation=NULL; |