[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57414] trunk/blender/source/blender: Track Position node now could output absolute position of track at a given frame

[Sergey Sharybin]

Revision: 57414
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57414
Author:   nazgul
Date:     2013-06-12 14:28:36 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
Track Position node now could output absolute position of track at a given frame

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_node.h
    trunk/blender/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c

Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h	2013-06-12 12:55:44 UTC (rev 57413)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h	2013-06-12 14:28:36 UTC (rev 57414)
@@ -921,6 +921,7 @@
 #define CMP_TRACKPOS_ABSOLUTE			0
 #define CMP_TRACKPOS_RELATIVE_START	1
 #define CMP_TRACKPOS_RELATIVE_FRAME	2
+#define CMP_TRACKPOS_ABSOLUTE_FRAME	3
 
 /* API */
 struct CompBuf;

Modified: trunk/blender/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_TrackPositionNode.cpp	2013-06-12 12:55:44 UTC (rev 57413)
+++ trunk/blender/source/blender/compositor/nodes/COM_TrackPositionNode.cpp	2013-06-12 14:28:36 UTC (rev 57414)
@@ -27,6 +27,8 @@
 
 extern "C" {
 	#include "DNA_movieclip_types.h"
+
+	#include "BKE_node.h"
 }
 
 TrackPositionNode::TrackPositionNode(bNode *editorNode) : Node(editorNode)
@@ -44,13 +46,21 @@
 
 	NodeTrackPosData *trackpos_data = (NodeTrackPosData *) editorNode->storage;
 
+	int frame_number;
+	if (editorNode->custom1 == CMP_TRACKPOS_ABSOLUTE_FRAME) {
+		frame_number = editorNode->custom2;
+	}
+	else {
+		frame_number = context->getFramenumber();
+	}
+
 	TrackPositionOperation *operationX = new TrackPositionOperation();
 	TrackPositionOperation *operationY = new TrackPositionOperation();
 
 	operationX->setMovieClip(clip);
 	operationX->setTrackingObject(trackpos_data->tracking_object);
 	operationX->setTrackName(trackpos_data->track_name);
-	operationX->setFramenumber(context->getFramenumber());
+	operationX->setFramenumber(frame_number);
 	operationX->setAxis(0);
 	operationX->setPosition(editorNode->custom1);
 	operationX->setRelativeFrame(editorNode->custom2);
@@ -58,7 +68,7 @@
 	operationY->setMovieClip(clip);
 	operationY->setTrackingObject(trackpos_data->tracking_object);
 	operationY->setTrackName(trackpos_data->track_name);
-	operationY->setFramenumber(context->getFramenumber());
+	operationY->setFramenumber(frame_number);
 	operationY->setAxis(1);
 	operationY->setPosition(editorNode->custom1);
 	operationY->setRelativeFrame(editorNode->custom2);

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2013-06-12 12:55:44 UTC (rev 57413)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2013-06-12 14:28:36 UTC (rev 57414)
@@ -2216,7 +2216,7 @@
 
 		uiItemR(layout, ptr, "position", 0, NULL, ICON_NONE);
 
-		if (node->custom1 == 2) {
+		if (ELEM(node->custom1, CMP_TRACKPOS_RELATIVE_FRAME, CMP_TRACKPOS_ABSOLUTE_FRAME)) {
 			uiItemR(layout, ptr, "frame_relative", 0, NULL, ICON_NONE);
 		}
 	}

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-06-12 12:55:44 UTC (rev 57413)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-06-12 14:28:36 UTC (rev 57414)
@@ -5720,6 +5720,8 @@
 		 "Relative Start",  "Output position of a marker relative to first marker of a track"},
 		{CMP_TRACKPOS_RELATIVE_FRAME, "RELATIVE_FRAME", 0,
 		 "Relative Frame",  "Output position of a marker relative to marker at given frame number"},
+		{CMP_TRACKPOS_ABSOLUTE_FRAME, "ABSOLUTE_FRAME", 0,
+		 "Absolute Frame",  "Output absolute position of a marker at given frame number"},
 		{0, NULL, 0, NULL, NULL}
 	};