diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp | 95 |
1 files changed, 46 insertions, 49 deletions
diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp index db91a8beb1a..967fa7ad653 100644 --- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp @@ -18,68 +18,65 @@ #include "COM_MovieClipAttributeOperation.h" extern "C" { -# include "BKE_tracking.h" -# include "BKE_movieclip.h" +#include "BKE_tracking.h" +#include "BKE_movieclip.h" } MovieClipAttributeOperation::MovieClipAttributeOperation() : NodeOperation() { - this->addOutputSocket(COM_DT_VALUE); - this->m_framenumber = 0; - this->m_attribute = MCA_X; - this->m_invert = false; + this->addOutputSocket(COM_DT_VALUE); + this->m_framenumber = 0; + this->m_attribute = MCA_X; + this->m_invert = false; } void MovieClipAttributeOperation::initExecution() { - if (this->m_clip == NULL) { - return; - } - float loc[2], scale, angle; - loc[0] = 0.0f; - loc[1] = 0.0f; - scale = 1.0f; - angle = 0.0f; - int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame( - this->m_clip, this->m_framenumber); - BKE_tracking_stabilization_data_get(this->m_clip, - clip_framenr, - getWidth(), getHeight(), - loc, &scale, &angle); - switch (this->m_attribute) { - case MCA_SCALE: - this->m_value = scale; - break; - case MCA_ANGLE: - this->m_value = angle; - break; - case MCA_X: - this->m_value = loc[0]; - break; - case MCA_Y: - this->m_value = loc[1]; - break; - } - if (this->m_invert) { - if (this->m_attribute != MCA_SCALE) { - this->m_value = -this->m_value; - } - else { - this->m_value = 1.0f / this->m_value; - } - } + if (this->m_clip == NULL) { + return; + } + float loc[2], scale, angle; + loc[0] = 0.0f; + loc[1] = 0.0f; + scale = 1.0f; + angle = 0.0f; + int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(this->m_clip, this->m_framenumber); + BKE_tracking_stabilization_data_get( + this->m_clip, clip_framenr, getWidth(), getHeight(), loc, &scale, &angle); + switch (this->m_attribute) { + case MCA_SCALE: + this->m_value = scale; + break; + case MCA_ANGLE: + this->m_value = angle; + break; + case MCA_X: + this->m_value = loc[0]; + break; + case MCA_Y: + this->m_value = loc[1]; + break; + } + if (this->m_invert) { + if (this->m_attribute != MCA_SCALE) { + this->m_value = -this->m_value; + } + else { + this->m_value = 1.0f / this->m_value; + } + } } void MovieClipAttributeOperation::executePixelSampled(float output[4], - float /*x*/, float /*y*/, + float /*x*/, + float /*y*/, PixelSampler /*sampler*/) { - output[0] = this->m_value; + output[0] = this->m_value; } -void MovieClipAttributeOperation::determineResolution( - unsigned int resolution[2], - unsigned int preferredResolution[2]) +void MovieClipAttributeOperation::determineResolution(unsigned int resolution[2], + unsigned int preferredResolution[2]) { - resolution[0] = preferredResolution[0]; - resolution[1] = preferredResolution[1]; + resolution[0] = preferredResolution[0]; + resolution[1] = preferredResolution[1]; } |