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

Sergey Sharybin g.ulairi at gmail.com
Sat Nov 5 17:32:07 CET 2011


Revision: 41568
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41568
Author:   nazgul
Date:     2011-11-05 16:32:06 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Camera tracking integration
===========================

Code cleanup and minor refactor. Moved some functions from movieclip.c
to tracking.c due to they're operating on tracking data only.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_movieclip.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_movieclip.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_movieclip.h	2011-11-05 15:14:28 UTC (rev 41567)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_movieclip.h	2011-11-05 16:32:06 UTC (rev 41568)
@@ -55,7 +55,6 @@
 void BKE_movieclip_user_set_frame(struct MovieClipUser *user, int framenr);
 
 void BKE_movieclip_select_track(struct MovieClip *clip, struct MovieTrackingTrack *track, int area, int extend);
-void BKE_movieclip_deselect_track(struct MovieClip *clip, struct MovieTrackingTrack *track, int area);
 
 void BKE_movieclip_update_scopes(struct MovieClip *clip, struct MovieClipUser *user, struct MovieClipScopes *scopes);
 

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h	2011-11-05 15:14:28 UTC (rev 41567)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h	2011-11-05 16:32:06 UTC (rev 41568)
@@ -46,10 +46,12 @@
 
 void BKE_tracking_clamp_track(struct MovieTrackingTrack *track, int event);
 void BKE_tracking_track_flag(struct MovieTrackingTrack *track, int area, int flag, int clear);
+
 struct MovieTrackingTrack *BKE_tracking_add_track(struct MovieTracking *tracking, float x, float y,
 			int framenr, int width, int height);
 void BKE_tracking_insert_marker(struct MovieTrackingTrack *track, struct MovieTrackingMarker *marker);
 void BKE_tracking_delete_marker(struct MovieTrackingTrack *track, int framenr);
+
 struct MovieTrackingMarker *BKE_tracking_get_marker(struct MovieTrackingTrack *track, int framenr);
 struct MovieTrackingMarker *BKE_tracking_ensure_marker(struct MovieTrackingTrack *track, int framenr);
 struct MovieTrackingMarker *BKE_tracking_exact_marker(struct MovieTrackingTrack *track, int framenr);
@@ -57,7 +59,9 @@
 
 void BKE_tracking_free_track(struct MovieTrackingTrack *track);
 struct MovieTrackingTrack *BKE_tracking_copy_track(struct MovieTrackingTrack *track);
+
 void BKE_tracking_clear_path(struct MovieTrackingTrack *track, int ref_frame, int action);
+
 int BKE_tracking_test_join_tracks(struct MovieTrackingTrack *dst_track, struct MovieTrackingTrack *src_track);
 void BKE_tracking_join_tracks(struct MovieTrackingTrack *dst_track, struct MovieTrackingTrack *src_track);
 void BKE_tracking_free(struct MovieTracking *tracking);
@@ -67,6 +71,18 @@
 struct ImBuf *BKE_tracking_get_search_imbuf(struct ImBuf *ibuf, struct MovieTrackingTrack *track,
 			struct MovieTrackingMarker *marker, int margin, int anchored, float pos[2], int origin[2]);
 
+void BKE_track_unique_name(struct MovieTracking *tracking, struct MovieTrackingTrack *track);
+
+struct MovieTrackingTrack *BKE_tracking_named_track(struct MovieTracking *tracking, const char *name);
+struct MovieTrackingTrack *BKE_tracking_indexed_track(struct MovieTracking *tracking, int tracknr);
+
+void BKE_tracking_camera_shift(struct MovieTracking *tracking, int winx, int winy, float *shiftx, float *shifty);
+void BKE_tracking_camera_to_blender(struct MovieTracking *tracking, struct Scene *scene, struct Camera *camera, int width, int height);
+
+void BKE_get_tracking_mat(struct Scene *scene, struct Object *ob, float mat[4][4]);
+void BKE_tracking_projection_matrix(struct MovieTracking *tracking, int framenr, int winx, int winy, float mat[4][4]);
+
+/* 2D tracking */
 struct MovieTrackingContext *BKE_tracking_context_new(struct MovieClip *clip, struct MovieClipUser *user,
 			short backwards, short disable_failed);
 void BKE_tracking_context_free(struct MovieTrackingContext *context);
@@ -74,33 +90,26 @@
 void BKE_tracking_sync_user(struct MovieClipUser *user, struct MovieTrackingContext *context);
 int BKE_tracking_next(struct MovieTrackingContext *context);
 
+/* Camera solving */
 float BKE_tracking_solve_reconstruction(struct MovieTracking *tracking, int width, int height);
 
-void BKE_track_unique_name(struct MovieTracking *tracking, struct MovieTrackingTrack *track);
-struct MovieTrackingTrack *BKE_find_track_by_name(struct MovieTracking *tracking, const char *name);
-
 struct MovieReconstructedCamera *BKE_tracking_get_reconstructed_camera(struct MovieTracking *tracking, int framenr);
 void BKE_tracking_get_interpolated_camera(struct MovieTracking *tracking, int framenr, float mat[4][4]);
 
-void BKE_tracking_camera_shift(struct MovieTracking *tracking, int winx, int winy, float *shiftx, float *shifty);
-void BKE_tracking_camera_to_blender(struct MovieTracking *tracking, struct Scene *scene, struct Camera *camera, int width, int height);
-
-void BKE_get_tracking_mat(struct Scene *scene, struct Object *ob, float mat[4][4]);
-void BKE_tracking_projection_matrix(struct MovieTracking *tracking, int framenr, int winx, int winy, float mat[4][4]);
-void BKE_tracking_apply_intrinsics(struct MovieTracking *tracking, float co[2], float nco[2]);
-void BKE_tracking_invert_intrinsics(struct MovieTracking *tracking, float co[2], float nco[2]);
-
+/* Feature detection */
 void BKE_tracking_detect_fast(struct MovieTracking *tracking, struct ImBuf *imbuf,
 			int framenr, int margin, int min_trackness, int min_distance, struct bGPDlayer *layer,
 			int place_outside_layer);
 
-struct MovieTrackingTrack *BKE_tracking_indexed_bundle(struct MovieTracking *tracking, int bundlenr);
-
+/* 2D stabilization */
 void BKE_tracking_stabilization_data(struct MovieTracking *tracking, int framenr, int width, int height, float loc[2], float *scale, float *angle);
 struct ImBuf *BKE_tracking_stabilize(struct MovieTracking *tracking, int framenr, struct ImBuf *ibuf, float loc[2], float *scale, float *angle);
 void BKE_tracking_stabdata_to_mat4(int width, int height, float loc[2], float scale, float angle, float mat[4][4]);
 
 /* Distortion/Undistortion */
+void BKE_tracking_apply_intrinsics(struct MovieTracking *tracking, float co[2], float nco[2]);
+void BKE_tracking_invert_intrinsics(struct MovieTracking *tracking, float co[2], float nco[2]);
+
 struct MovieDistortion *BKE_tracking_distortion_create(void);
 struct MovieDistortion *BKE_tracking_distortion_copy(struct MovieDistortion *distortion);
 struct ImBuf *BKE_tracking_distortion_exec(struct MovieDistortion *distortion, struct MovieTracking *tracking,
@@ -110,6 +119,10 @@
 struct ImBuf *BKE_tracking_undistort(struct MovieTracking *tracking, struct ImBuf *ibuf, int width, int height, float overscan);
 struct ImBuf *BKE_tracking_distort(struct MovieTracking *tracking, struct ImBuf *ibuf, int width, int height, float overscan);
 
+/* Select */
+void BKE_tracking_select_track(struct MovieTracking *tracking, struct MovieTrackingTrack *track, int area, int extend);
+void BKE_tracking_deselect_track(struct MovieTrackingTrack *track, int area);
+
 #define TRACK_SELECTED(track)				((((track)->flag&TRACK_HIDDEN)==0) && ((track)->flag&SELECT || (track)->pat_flag&SELECT || (track)->search_flag&SELECT))
 #define TRACK_AREA_SELECTED(track, area)	((((track)->flag&TRACK_HIDDEN)==0) && ((area)==TRACK_AREA_POINT?(track)->flag&SELECT : ((area)==TRACK_AREA_PAT?(track)->pat_flag&SELECT:(track)->search_flag&SELECT)))
 #define TRACK_VIEW_SELECTED(sc, track)		((TRACK_AREA_SELECTED(track, TRACK_AREA_POINT) || (((sc)->flag&SC_SHOW_MARKER_PATTERN && TRACK_AREA_SELECTED(track, TRACK_AREA_PAT))) || (((sc)->flag&SC_SHOW_MARKER_SEARCH && TRACK_AREA_SELECTED(track, TRACK_AREA_SEARCH)))))

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c	2011-11-05 15:14:28 UTC (rev 41567)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c	2011-11-05 16:32:06 UTC (rev 41568)
@@ -3962,7 +3962,7 @@
 	if(!clip || !data->track[0])
 		return;
 
-	track= BKE_find_track_by_name(&clip->tracking, data->track);
+	track= BKE_tracking_named_track(&clip->tracking, data->track);
 
 	if(!track)
 		return;

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c	2011-11-05 15:14:28 UTC (rev 41567)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c	2011-11-05 16:32:06 UTC (rev 41568)
@@ -835,33 +835,6 @@
 	else clip->source= MCLIP_SRC_SEQUENCE;
 }
 
-/* area - which part of marker should be selected. see TRACK_AREA_* constants */
-void BKE_movieclip_select_track(MovieClip *clip, MovieTrackingTrack *track, int area, int extend)
-{
-	if(extend) {
-		BKE_tracking_track_flag(track, area, SELECT, 0);
-	} else {
-		MovieTrackingTrack *cur= clip->tracking.tracks.first;
-
-		while(cur) {
-			if(cur==track) {
-				BKE_tracking_track_flag(cur, TRACK_AREA_ALL, SELECT, 1);
-				BKE_tracking_track_flag(cur, area, SELECT, 0);
-			}
-			else {
-				BKE_tracking_track_flag(cur, TRACK_AREA_ALL, SELECT, 1);
-			}
-
-			cur= cur->next;
-		}
-	}
-}
-
-void BKE_movieclip_deselect_track(MovieClip *UNUSED(clip), MovieTrackingTrack *track, int area)
-{
-	BKE_tracking_track_flag(track, area, SELECT, 1);
-}
-
 void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClipScopes *scopes)
 {
 	if(scopes->ok) return;

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-11-05 15:14:28 UTC (rev 41567)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-11-05 16:32:06 UTC (rev 41568)
@@ -1387,7 +1387,7 @@
 	BLI_uniquename(&tracking->tracks, track, "Track", '.', offsetof(MovieTrackingTrack, name), sizeof(track->name));
 }
 
-MovieTrackingTrack *BKE_find_track_by_name(MovieTracking *tracking, const char *name)
+MovieTrackingTrack *BKE_tracking_named_track(MovieTracking *tracking, const char *name)
 {
 	MovieTrackingTrack *track= tracking->tracks.first;
 
@@ -1689,14 +1689,14 @@
 #endif
 }
 
-MovieTrackingTrack *BKE_tracking_indexed_bundle(MovieTracking *tracking, int bundlenr)
+MovieTrackingTrack *BKE_tracking_indexed_track(MovieTracking *tracking, int tracknr)
 {

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list