[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38658] branches/soc-2011-tomato: Camera tracking integration

Sergey Sharybin g.ulairi at gmail.com
Sun Jul 24 14:36:14 CEST 2011


Revision: 38658
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38658
Author:   nazgul
Date:     2011-07-24 12:36:14 +0000 (Sun, 24 Jul 2011)
Log Message:
-----------
Camera tracking integration
===========================

- Fixed incorrect mouse sliding when resizing area which isn't
  symmetrical to marker's position.
- Added "Clip" group to User Preferences -> Input lust.
  Now hotkeys can be investigated there and also, they can be changed there.

Modified Paths:
--------------
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py	2011-07-24 12:32:18 UTC (rev 38657)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py	2011-07-24 12:36:14 UTC (rev 38658)
@@ -95,6 +95,7 @@
     ('Script', 'SCRIPTS_WINDOW', 'WINDOW', []),
     ('Text', 'TEXT_EDITOR', 'WINDOW', []),
     ('Console', 'CONSOLE', 'WINDOW', []),
+    ('Clip', 'CLIP_EDITOR', 'WINDOW', []),
 
     ('View3D Gesture Circle', 'EMPTY', 'WINDOW', []),
     ('Gesture Border', 'EMPTY', 'WINDOW', []),

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2011-07-24 12:32:18 UTC (rev 38657)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2011-07-24 12:36:14 UTC (rev 38658)
@@ -1767,7 +1767,8 @@
 	data->width= width;
 	data->height= height;
 
-	data->lock= 1;
+	if(act==SLIDE_ACTION_SIZE)
+		data->lock= 1;
 
 	return data;
 }
@@ -1909,7 +1910,7 @@
 		case RIGHTCTRLKEY:
 		case LEFTSHIFTKEY:
 		case RIGHTSHIFTKEY:
-			if(data->area != TRACK_AREA_POINT)
+			if(data->action == SLIDE_ACTION_SIZE)
 				if(ELEM(event->type, LEFTCTRLKEY, RIGHTCTRLKEY))
 					data->lock= event->val==KM_RELEASE;
 
@@ -1923,8 +1924,10 @@
 			mdelta[1]= event->mval[1]-data->mval[1];
 
 			dx= mdelta[0]/data->width/sc->zoom;
-			dy= mdelta[1]/data->height/sc->zoom;
 
+			if(data->lock) dy= -dx/data->height*data->width;
+			else dy= mdelta[1]/data->height/sc->zoom;
+
 			if(data->accurate) {
 				dx/= 5;
 				dy/= 5;
@@ -1943,14 +1946,7 @@
 					data->min[1]= data->smin[1]+dy;
 					data->max[1]= data->smax[1]-dy;
 
-					if(data->lock) {
-						float h= (data->max[0]-data->min[0])*data->width/data->height;
 
-						data->min[1]= data->spos[1]-h/2;
-						data->max[1]= data->spos[1]+h/2;
-					}
-
-
 					if(data->area==TRACK_AREA_SEARCH) BKE_tracking_clamp_track(data->track, CLAMP_SEARCH_DIM);
 					else BKE_tracking_clamp_track(data->track, CLAMP_PAT_DIM);
 				} else {




More information about the Bf-blender-cvs mailing list