diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-04 14:47:31 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-04 14:47:31 +0400 |
commit | 4f410971c3e144d4404dd035f70b97271333b232 (patch) | |
tree | 5f11d7205041a1bcf08c277eb0abde5248fb8057 /release | |
parent | 96bda09d230f20f9402c5b1b54e2d27eec550b12 (diff) |
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
Diffstat (limited to 'release')
8 files changed, 72 insertions, 35 deletions
diff --git a/release/scripts/presets/tracking_settings/blurry_footage.py b/release/scripts/presets/tracking_settings/blurry_footage.py index f2df4a15320..0423f7662a2 100644 --- a/release/scripts/presets/tracking_settings/blurry_footage.py +++ b/release/scripts/presets/tracking_settings/blurry_footage.py @@ -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 diff --git a/release/scripts/presets/tracking_settings/blurry_movie.py b/release/scripts/presets/tracking_settings/blurry_movie.py deleted file mode 100644 index fe68f1352c1..00000000000 --- a/release/scripts/presets/tracking_settings/blurry_movie.py +++ /dev/null @@ -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 diff --git a/release/scripts/presets/tracking_settings/default.py b/release/scripts/presets/tracking_settings/default.py index 0cc3a21c845..0aef22195e7 100644 --- a/release/scripts/presets/tracking_settings/default.py +++ b/release/scripts/presets/tracking_settings/default.py @@ -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 diff --git a/release/scripts/presets/tracking_settings/fast_motion.py b/release/scripts/presets/tracking_settings/fast_motion.py index 5e6e44e6a42..f7f6b37db74 100644 --- a/release/scripts/presets/tracking_settings/fast_motion.py +++ b/release/scripts/presets/tracking_settings/fast_motion.py @@ -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 diff --git a/release/scripts/presets/tracking_settings/planar.py b/release/scripts/presets/tracking_settings/planar.py new file mode 100644 index 00000000000..b25df1fc466 --- /dev/null +++ b/release/scripts/presets/tracking_settings/planar.py @@ -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 diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index a30502b454e..c45d2f2e702 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -90,14 +90,17 @@ def CLIP_track_view_selected(sc, track): 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 @@ def CLIP_default_settings_from_track(clip, track): 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 @@ class CLIP_OT_track_settings_as_default(Operator): 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'} diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index 05f76208a5f..db492450e28 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -436,15 +436,19 @@ class AddPresetTrackingSettings(AddPresetBase, Operator): ] 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" diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 559cf7f93b7..efac7a66086 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -232,9 +232,9 @@ class CLIP_PT_tools_marker(CLIP_PT_tracking_panel, Panel): 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 @@ class CLIP_PT_footage(CLIP_PT_clip_view_panel, Panel): 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") |