[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49552] trunk/blender: Camera tracking presets
Sergey Sharybin
sergey.vfx at gmail.com
Sat Aug 4 12:47:31 CEST 2012
Revision: 49552
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49552
Author: nazgul
Date: 2012-08-04 10:47:31 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
Camera tracking presets
- Fix for copy default settings from active track operator
- Add meaningful tracking presets
API changes:
- Added parameter exact to Marker.find_frame, so now it's
possible to get estimated marker
- Added Marker.pattern_bound_box to get pattern's bound box
Modified Paths:
--------------
trunk/blender/release/scripts/presets/tracking_settings/blurry_footage.py
trunk/blender/release/scripts/presets/tracking_settings/default.py
trunk/blender/release/scripts/presets/tracking_settings/fast_motion.py
trunk/blender/release/scripts/startup/bl_operators/clip.py
trunk/blender/release/scripts/startup/bl_operators/presets.py
trunk/blender/release/scripts/startup/bl_ui/space_clip.py
trunk/blender/source/blender/makesrna/intern/rna_movieclip.c
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
Added Paths:
-----------
trunk/blender/release/scripts/presets/tracking_settings/planar.py
Removed Paths:
-------------
trunk/blender/release/scripts/presets/tracking_settings/blurry_movie.py
Modified: trunk/blender/release/scripts/presets/tracking_settings/blurry_footage.py
===================================================================
--- trunk/blender/release/scripts/presets/tracking_settings/blurry_footage.py 2012-08-04 10:36:48 UTC (rev 49551)
+++ trunk/blender/release/scripts/presets/tracking_settings/blurry_footage.py 2012-08-04 10:47:31 UTC (rev 49552)
@@ -1,12 +1,17 @@
import bpy
settings = bpy.context.edit_movieclip.tracking.settings
-settings.default_correlation_min = 0.75
-settings.default_pattern_size = 21
-settings.default_search_size = 100
+
+settings.default_pattern_size = 31
+settings.default_search_size = 91
+settings.default_motion_model = 'Loc'
+settings.use_default_brute = True
+settings.use_default_normalization = False
+settings.use_default_mask = False
settings.default_frames_limit = 0
settings.default_pattern_match = 'PREV_FRAME'
settings.default_margin = 0
settings.use_default_red_channel = True
settings.use_default_green_channel = True
settings.use_default_blue_channel = True
+settings.default_correlation_min = 0.6
\ No newline at end of file
Deleted: trunk/blender/release/scripts/presets/tracking_settings/blurry_movie.py
===================================================================
--- trunk/blender/release/scripts/presets/tracking_settings/blurry_movie.py 2012-08-04 10:36:48 UTC (rev 49551)
+++ trunk/blender/release/scripts/presets/tracking_settings/blurry_movie.py 2012-08-04 10:47:31 UTC (rev 49552)
@@ -1,9 +0,0 @@
-import bpy
-settings = bpy.context.edit_movieclip.tracking.settings
-
-settings.default_correlation_min = 0.75
-settings.default_pattern_size = 11
-settings.default_search_size = 202
-settings.default_frames_limit = 25
-settings.default_pattern_match = 'KEYFRAME'
-settings.default_margin = 0
Modified: trunk/blender/release/scripts/presets/tracking_settings/default.py
===================================================================
--- trunk/blender/release/scripts/presets/tracking_settings/default.py 2012-08-04 10:36:48 UTC (rev 49551)
+++ trunk/blender/release/scripts/presets/tracking_settings/default.py 2012-08-04 10:47:31 UTC (rev 49552)
@@ -1,12 +1,17 @@
import bpy
settings = bpy.context.edit_movieclip.tracking.settings
-settings.default_correlation_min = 0.75
-settings.default_pattern_size = 11
-settings.default_search_size = 61
+
+settings.default_pattern_size = 15
+settings.default_search_size = 51
+settings.default_motion_model = 'Loc'
+settings.use_default_brute = True
+settings.use_default_normalization = False
+settings.use_default_mask = False
settings.default_frames_limit = 0
settings.default_pattern_match = 'KEYFRAME'
settings.default_margin = 0
settings.use_default_red_channel = True
settings.use_default_green_channel = True
settings.use_default_blue_channel = True
+settings.default_correlation_min = 0.75
\ No newline at end of file
Modified: trunk/blender/release/scripts/presets/tracking_settings/fast_motion.py
===================================================================
--- trunk/blender/release/scripts/presets/tracking_settings/fast_motion.py 2012-08-04 10:36:48 UTC (rev 49551)
+++ trunk/blender/release/scripts/presets/tracking_settings/fast_motion.py 2012-08-04 10:47:31 UTC (rev 49552)
@@ -1,12 +1,17 @@
import bpy
settings = bpy.context.edit_movieclip.tracking.settings
-settings.default_correlation_min = 0.7
+
settings.default_pattern_size = 31
-settings.default_search_size = 300
+settings.default_search_size = 151
+settings.default_motion_model = 'LocRot'
+settings.use_default_brute = True
+settings.use_default_normalization = True
+settings.use_default_mask = False
settings.default_frames_limit = 0
settings.default_pattern_match = 'PREV_FRAME'
-settings.default_margin = 5
+settings.default_margin = 0
settings.use_default_red_channel = True
settings.use_default_green_channel = True
settings.use_default_blue_channel = True
+settings.default_correlation_min = 0.6
\ No newline at end of file
Copied: trunk/blender/release/scripts/presets/tracking_settings/planar.py (from rev 49545, trunk/blender/release/scripts/presets/tracking_settings/default.py)
===================================================================
--- trunk/blender/release/scripts/presets/tracking_settings/planar.py (rev 0)
+++ trunk/blender/release/scripts/presets/tracking_settings/planar.py 2012-08-04 10:47:31 UTC (rev 49552)
@@ -0,0 +1,17 @@
+import bpy
+settings = bpy.context.edit_movieclip.tracking.settings
+
+
+settings.default_pattern_size = 41
+settings.default_search_size = 91
+settings.default_motion_model = 'Perspective'
+settings.use_default_brute = False
+settings.use_default_normalization = False
+settings.use_default_mask = False
+settings.default_frames_limit = 0
+settings.default_pattern_match = 'KEYFRAME'
+settings.default_margin = 0
+settings.use_default_red_channel = True
+settings.use_default_green_channel = True
+settings.use_default_blue_channel = True
+settings.default_correlation_min = 0.75
\ No newline at end of file
Modified: trunk/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/clip.py 2012-08-04 10:36:48 UTC (rev 49551)
+++ trunk/blender/release/scripts/startup/bl_operators/clip.py 2012-08-04 10:47:31 UTC (rev 49552)
@@ -90,15 +90,18 @@
return False
-def CLIP_default_settings_from_track(clip, track):
+def CLIP_default_settings_from_track(clip, track, framenr):
settings = clip.tracking.settings
width = clip.size[0]
height = clip.size[1]
- pattern = track.pattern_max - track.pattern_min
- search = track.search_max - track.search_min
+ marker = track.markers.find_frame(framenr, False)
+ pattern_bb = marker.pattern_bound_box
+ pattern = Vector(pattern_bb[1]) - Vector(pattern_bb[0])
+ search = marker.search_max - marker.search_min
+
pattern[0] = pattern[0] * width
pattern[1] = pattern[1] * height
@@ -111,6 +114,10 @@
settings.default_frames_limit = track.frames_limit
settings.default_pattern_match = track.pattern_match
settings.default_margin = track.margin
+ settings.default_motion_model = track.motion_model
+ settings.use_default_brute = track.use_brute
+ settings.use_default_normalization = track.use_normalization
+ settings.use_default_mask = track.use_mask
settings.use_default_red_channel = track.use_red_channel
settings.use_default_green_channel = track.use_green_channel
settings.use_default_blue_channel = track.use_blue_channel
@@ -862,6 +869,9 @@
sc = context.space_data
clip = sc.clip
- CLIP_default_settings_from_track(clip, clip.tracking.tracks.active)
+ track = clip.tracking.tracks.active
+ framenr = context.scene.frame_current - clip.frame_start + 1
+ CLIP_default_settings_from_track(clip, track, framenr)
+
return {'FINISHED'}
Modified: trunk/blender/release/scripts/startup/bl_operators/presets.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/presets.py 2012-08-04 10:36:48 UTC (rev 49551)
+++ trunk/blender/release/scripts/startup/bl_operators/presets.py 2012-08-04 10:47:31 UTC (rev 49552)
@@ -436,15 +436,19 @@
]
preset_values = [
- "settings.default_correlation_min",
- "settings.default_pattern_size",
- "settings.default_search_size",
- "settings.default_frames_limit",
- "settings.default_pattern_match",
- "settings.default_margin",
- "settings.use_default_red_channel",
- "settings.use_default_green_channel",
- "settings.use_default_blue_channel"
+ "default_correlation_min",
+ "default_pattern_size",
+ "default_search_size",
+ "default_frames_limit",
+ "default_pattern_match",
+ "default_margin",
+ "default_motion_model",
+ "use_default_brute",
+ "use_default_normalization",
+ "use_default_mask",
+ "use_default_red_channel",
+ "use_default_green_channel",
+ "use_default_blue_channel"
]
preset_subdir = "tracking_settings"
Modified: trunk/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_clip.py 2012-08-04 10:36:48 UTC (rev 49551)
+++ trunk/blender/release/scripts/startup/bl_ui/space_clip.py 2012-08-04 10:47:31 UTC (rev 49552)
@@ -232,9 +232,9 @@
col.label(text="Tracker:")
col.prop(settings, "default_motion_model")
- col.prop(settings, "default_use_brute")
- col.prop(settings, "default_use_normalization")
- col.prop(settings, "default_use_mask")
+ col.prop(settings, "use_default_brute")
+ col.prop(settings, "use_default_normalization")
+ col.prop(settings, "use_default_mask")
col.prop(settings, "default_correlation_min")
col.separator()
@@ -843,7 +843,7 @@
col = layout.column()
col.template_movieclip(sc, "clip", compact=True)
- col.prop(clip, "start_frame")
+ col.prop(clip, "frame_start")
col.prop(clip, "frame_offset")
Modified: trunk/blender/source/blender/makesrna/intern/rna_movieclip.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_movieclip.c 2012-08-04 10:36:48 UTC (rev 49551)
+++ trunk/blender/source/blender/makesrna/intern/rna_movieclip.c 2012-08-04 10:47:31 UTC (rev 49552)
@@ -287,7 +287,7 @@
RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
/* start_frame */
- prop = RNA_def_property(srna, "start_frame", PROP_INT, PROP_NONE);
+ prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "start_frame");
RNA_def_property_ui_text(prop, "Start Frame", "Global scene frame number at which this movie starts playing "
"(affects all data associated with a clip)");
Modified: trunk/blender/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_tracking.c 2012-08-04 10:36:48 UTC (rev 49551)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list