Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/nodes/COM_TrackPositionNode.cpp
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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/nodes/COM_TrackPositionNode.cpp')
-rw-r--r--source/blender/compositor/nodes/COM_TrackPositionNode.cpp131
1 files changed, 64 insertions, 67 deletions
diff --git a/source/blender/compositor/nodes/COM_TrackPositionNode.cpp b/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
index 7c9cd395890..da9f50a590b 100644
--- a/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
+++ b/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
@@ -23,14 +23,14 @@
#include "COM_TrackPositionOperation.h"
extern "C" {
-# include "DNA_movieclip_types.h"
+#include "DNA_movieclip_types.h"
-# include "BKE_node.h"
+#include "BKE_node.h"
}
TrackPositionNode::TrackPositionNode(bNode *editorNode) : Node(editorNode)
{
- /* pass */
+ /* pass */
}
static TrackPositionOperation *create_motion_operation(NodeConverter &converter,
@@ -40,77 +40,74 @@ static TrackPositionOperation *create_motion_operation(NodeConverter &converter,
int frame_number,
int delta)
{
- TrackPositionOperation *operation = new TrackPositionOperation();
- operation->setMovieClip(clip);
- operation->setTrackingObject(trackpos_data->tracking_object);
- operation->setTrackName(trackpos_data->track_name);
- operation->setFramenumber(frame_number);
- operation->setAxis(axis);
- operation->setPosition(CMP_TRACKPOS_ABSOLUTE);
- operation->setRelativeFrame(frame_number + delta);
- operation->setSpeedOutput(true);
- converter.addOperation(operation);
- return operation;
+ TrackPositionOperation *operation = new TrackPositionOperation();
+ operation->setMovieClip(clip);
+ operation->setTrackingObject(trackpos_data->tracking_object);
+ operation->setTrackName(trackpos_data->track_name);
+ operation->setFramenumber(frame_number);
+ operation->setAxis(axis);
+ operation->setPosition(CMP_TRACKPOS_ABSOLUTE);
+ operation->setRelativeFrame(frame_number + delta);
+ operation->setSpeedOutput(true);
+ converter.addOperation(operation);
+ return operation;
}
-void TrackPositionNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const
+void TrackPositionNode::convertToOperations(NodeConverter &converter,
+ const CompositorContext &context) const
{
- bNode *editorNode = this->getbNode();
- MovieClip *clip = (MovieClip *) editorNode->id;
- NodeTrackPosData *trackpos_data = (NodeTrackPosData *) editorNode->storage;
+ bNode *editorNode = this->getbNode();
+ MovieClip *clip = (MovieClip *)editorNode->id;
+ NodeTrackPosData *trackpos_data = (NodeTrackPosData *)editorNode->storage;
- NodeOutput *outputX = this->getOutputSocket(0);
- NodeOutput *outputY = this->getOutputSocket(1);
- NodeOutput *outputSpeed = this->getOutputSocket(2);
+ NodeOutput *outputX = this->getOutputSocket(0);
+ NodeOutput *outputY = this->getOutputSocket(1);
+ NodeOutput *outputSpeed = this->getOutputSocket(2);
- int frame_number;
- if (editorNode->custom1 == CMP_TRACKPOS_ABSOLUTE_FRAME) {
- frame_number = editorNode->custom2;
- }
- else {
- frame_number = context.getFramenumber();
- }
+ int frame_number;
+ if (editorNode->custom1 == CMP_TRACKPOS_ABSOLUTE_FRAME) {
+ frame_number = editorNode->custom2;
+ }
+ else {
+ frame_number = context.getFramenumber();
+ }
- TrackPositionOperation *operationX = new TrackPositionOperation();
- operationX->setMovieClip(clip);
- operationX->setTrackingObject(trackpos_data->tracking_object);
- operationX->setTrackName(trackpos_data->track_name);
- operationX->setFramenumber(frame_number);
- operationX->setAxis(0);
- operationX->setPosition(editorNode->custom1);
- operationX->setRelativeFrame(editorNode->custom2);
- converter.addOperation(operationX);
- converter.mapOutputSocket(outputX, operationX->getOutputSocket());
+ TrackPositionOperation *operationX = new TrackPositionOperation();
+ operationX->setMovieClip(clip);
+ operationX->setTrackingObject(trackpos_data->tracking_object);
+ operationX->setTrackName(trackpos_data->track_name);
+ operationX->setFramenumber(frame_number);
+ operationX->setAxis(0);
+ operationX->setPosition(editorNode->custom1);
+ operationX->setRelativeFrame(editorNode->custom2);
+ converter.addOperation(operationX);
+ converter.mapOutputSocket(outputX, operationX->getOutputSocket());
- TrackPositionOperation *operationY = new TrackPositionOperation();
- operationY->setMovieClip(clip);
- operationY->setTrackingObject(trackpos_data->tracking_object);
- operationY->setTrackName(trackpos_data->track_name);
- operationY->setFramenumber(frame_number);
- operationY->setAxis(1);
- operationY->setPosition(editorNode->custom1);
- operationY->setRelativeFrame(editorNode->custom2);
- converter.addOperation(operationY);
- converter.mapOutputSocket(outputY, operationY->getOutputSocket());
+ TrackPositionOperation *operationY = new TrackPositionOperation();
+ operationY->setMovieClip(clip);
+ operationY->setTrackingObject(trackpos_data->tracking_object);
+ operationY->setTrackName(trackpos_data->track_name);
+ operationY->setFramenumber(frame_number);
+ operationY->setAxis(1);
+ operationY->setPosition(editorNode->custom1);
+ operationY->setRelativeFrame(editorNode->custom2);
+ converter.addOperation(operationY);
+ converter.mapOutputSocket(outputY, operationY->getOutputSocket());
- TrackPositionOperation *operationMotionPreX =
- create_motion_operation(converter, clip, trackpos_data, 0, frame_number, -1);
- TrackPositionOperation *operationMotionPreY =
- create_motion_operation(converter, clip, trackpos_data, 1, frame_number, -1);
- TrackPositionOperation *operationMotionPostX =
- create_motion_operation(converter, clip, trackpos_data, 0, frame_number, 1);
- TrackPositionOperation *operationMotionPostY =
- create_motion_operation(converter, clip, trackpos_data, 1, frame_number, 1);
+ TrackPositionOperation *operationMotionPreX = create_motion_operation(
+ converter, clip, trackpos_data, 0, frame_number, -1);
+ TrackPositionOperation *operationMotionPreY = create_motion_operation(
+ converter, clip, trackpos_data, 1, frame_number, -1);
+ TrackPositionOperation *operationMotionPostX = create_motion_operation(
+ converter, clip, trackpos_data, 0, frame_number, 1);
+ TrackPositionOperation *operationMotionPostY = create_motion_operation(
+ converter, clip, trackpos_data, 1, frame_number, 1);
- CombineChannelsOperation *combine_operation = new CombineChannelsOperation();
- converter.addOperation(combine_operation);
- converter.addLink(operationMotionPreX->getOutputSocket(),
- combine_operation->getInputSocket(0));
- converter.addLink(operationMotionPreY->getOutputSocket(),
- combine_operation->getInputSocket(1));
- converter.addLink(operationMotionPostX->getOutputSocket(),
- combine_operation->getInputSocket(2));
- converter.addLink(operationMotionPostY->getOutputSocket(),
- combine_operation->getInputSocket(3));
- converter.mapOutputSocket(outputSpeed, combine_operation->getOutputSocket());
+ CombineChannelsOperation *combine_operation = new CombineChannelsOperation();
+ converter.addOperation(combine_operation);
+ converter.addLink(operationMotionPreX->getOutputSocket(), combine_operation->getInputSocket(0));
+ converter.addLink(operationMotionPreY->getOutputSocket(), combine_operation->getInputSocket(1));
+ converter.addLink(operationMotionPostX->getOutputSocket(), combine_operation->getInputSocket(2));
+ converter.addLink(operationMotionPostY->getOutputSocket(), combine_operation->getInputSocket(3));
+ converter.mapOutputSocket(outputSpeed, combine_operation->getOutputSocket());
}