Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-09-16 13:43:51 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-09-24 18:20:16 +0300
commitdcee994af6a4ad7f84c4da084c85a875f8ed1f4c (patch)
tree41c42d4e3750169577fc253269352afc66379b2b /source/blender/editors/space_clip/clip_draw.c
parent9a0a556d3b58b487b3609dd01c56b2939841ad3a (diff)
Tracking: Highlight keyframes in path visualization
This gives better idea of what's going on with your track. Example: {F693806} Color of keyframes are configurable from theme editor of clip editor. Reviewers: keir, brecht, Severin Differential Revision: https://developer.blender.org/D2772
Diffstat (limited to 'source/blender/editors/space_clip/clip_draw.c')
-rw-r--r--source/blender/editors/space_clip/clip_draw.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index c847c7d07bb..80b58954c8f 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -473,6 +473,21 @@ static void draw_track_path_points(const TrackPathPoint *path,
immEnd();
}
+static void draw_track_path_keyframe_points(const TrackPathPoint *path,
+ uint position_attribute,
+ const int start_point,
+ const int num_points)
+{
+ immBeginAtMost(GPU_PRIM_POINTS, num_points);
+ for (int i = 0; i < num_points; i++) {
+ const TrackPathPoint *point = &path[i + start_point];
+ if (point->flag & PATH_POINT_FLAG_KEYFRAME) {
+ immVertex2fv(position_attribute, point->co);
+ }
+ }
+ immEnd();
+}
+
static void draw_track_path_lines(const TrackPathPoint *path,
uint position_attribute,
const int start_point,
@@ -533,6 +548,8 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
if (TRACK_VIEW_SELECTED(sc, track)) {
GPU_point_size(5.0f);
draw_track_path_points(path, position_attribute, path_start_index, num_all_points);
+ GPU_point_size(7.0f);
+ draw_track_path_keyframe_points(path, position_attribute, path_start_index, num_all_points);
}
/* Draw darker outline for actual path, all line segments at once. */
GPU_line_width(3.0f);
@@ -553,6 +570,13 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
immUniformThemeColor(TH_PATH_AFTER);
draw_track_path_lines(path, position_attribute, path_center_index, num_points_after);
+ /* Draw all bigger points corresponding to keyframes. */
+ GPU_point_size(5.0f);
+ immUniformThemeColor(TH_PATH_KEYFRAME_BEFORE);
+ draw_track_path_keyframe_points(path, position_attribute, path_start_index, num_points_before);
+ immUniformThemeColor(TH_PATH_KEYFRAME_AFTER);
+ draw_track_path_keyframe_points(path, position_attribute, path_center_index, num_points_after);
+
if (path != path_static) {
MEM_freeN(path);
}