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:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/editors/space_clip/clip_utils.c
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/editors/space_clip/clip_utils.c')
-rw-r--r--source/blender/editors/space_clip/clip_utils.c398
1 files changed, 206 insertions, 192 deletions
diff --git a/source/blender/editors/space_clip/clip_utils.c b/source/blender/editors/space_clip/clip_utils.c
index 882cafae5f6..37a28e6189a 100644
--- a/source/blender/editors/space_clip/clip_utils.c
+++ b/source/blender/editors/space_clip/clip_utils.c
@@ -50,245 +50,259 @@
#include "UI_resources.h"
#include "UI_view2d.h"
-#include "clip_intern.h" // own include
+#include "clip_intern.h" // own include
void clip_graph_tracking_values_iterate_track(
- SpaceClip *sc, MovieTrackingTrack *track, void *userdata,
- void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker, int coord,
- int scene_framenr, float val),
- void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord, bool is_point),
- void (*segment_end)(void *userdata, int coord))
+ SpaceClip *sc,
+ MovieTrackingTrack *track,
+ void *userdata,
+ void (*func)(void *userdata,
+ MovieTrackingTrack *track,
+ MovieTrackingMarker *marker,
+ int coord,
+ int scene_framenr,
+ float val),
+ void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord, bool is_point),
+ void (*segment_end)(void *userdata, int coord))
{
- MovieClip *clip = ED_space_clip_get_clip(sc);
- int width, height, coord;
-
- BKE_movieclip_get_size(clip, &sc->user, &width, &height);
-
- for (coord = 0; coord < 2; coord++) {
- int i, prevfra = track->markers[0].framenr;
- bool open = false;
- float prevval = 0.0f;
-
- for (i = 0; i < track->markersnr; i++) {
- MovieTrackingMarker *marker = &track->markers[i];
- float val;
-
- if (marker->flag & MARKER_DISABLED) {
- if (open) {
- if (segment_end)
- segment_end(userdata, coord);
-
- open = false;
- }
-
- continue;
- }
-
- if (!open) {
- if (segment_start) {
- if ((i + 1) == track->markersnr) {
- segment_start(userdata, track, coord, true);
- }
- else {
- segment_start(userdata, track, coord, (track->markers[i + 1].flag & MARKER_DISABLED));
- }
- }
-
- open = true;
- prevval = marker->pos[coord];
- }
-
- /* value is a pixels per frame speed */
- val = (marker->pos[coord] - prevval) * ((coord == 0) ? (width) : (height));
- val /= marker->framenr - prevfra;
-
- if (func) {
- int scene_framenr = BKE_movieclip_remap_clip_to_scene_frame(clip, marker->framenr);
-
- func(userdata, track, marker, coord, scene_framenr, val);
- }
-
- prevval = marker->pos[coord];
- prevfra = marker->framenr;
- }
-
- if (open) {
- if (segment_end)
- segment_end(userdata, coord);
- }
- }
+ MovieClip *clip = ED_space_clip_get_clip(sc);
+ int width, height, coord;
+
+ BKE_movieclip_get_size(clip, &sc->user, &width, &height);
+
+ for (coord = 0; coord < 2; coord++) {
+ int i, prevfra = track->markers[0].framenr;
+ bool open = false;
+ float prevval = 0.0f;
+
+ for (i = 0; i < track->markersnr; i++) {
+ MovieTrackingMarker *marker = &track->markers[i];
+ float val;
+
+ if (marker->flag & MARKER_DISABLED) {
+ if (open) {
+ if (segment_end)
+ segment_end(userdata, coord);
+
+ open = false;
+ }
+
+ continue;
+ }
+
+ if (!open) {
+ if (segment_start) {
+ if ((i + 1) == track->markersnr) {
+ segment_start(userdata, track, coord, true);
+ }
+ else {
+ segment_start(userdata, track, coord, (track->markers[i + 1].flag & MARKER_DISABLED));
+ }
+ }
+
+ open = true;
+ prevval = marker->pos[coord];
+ }
+
+ /* value is a pixels per frame speed */
+ val = (marker->pos[coord] - prevval) * ((coord == 0) ? (width) : (height));
+ val /= marker->framenr - prevfra;
+
+ if (func) {
+ int scene_framenr = BKE_movieclip_remap_clip_to_scene_frame(clip, marker->framenr);
+
+ func(userdata, track, marker, coord, scene_framenr, val);
+ }
+
+ prevval = marker->pos[coord];
+ prevfra = marker->framenr;
+ }
+
+ if (open) {
+ if (segment_end)
+ segment_end(userdata, coord);
+ }
+ }
}
void clip_graph_tracking_values_iterate(
- SpaceClip *sc, bool selected_only, bool include_hidden, void *userdata,
- void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker,
- int coord, int scene_framenr, float val),
- void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord, bool is_point),
- void (*segment_end)(void *userdata, int coord))
+ SpaceClip *sc,
+ bool selected_only,
+ bool include_hidden,
+ void *userdata,
+ void (*func)(void *userdata,
+ MovieTrackingTrack *track,
+ MovieTrackingMarker *marker,
+ int coord,
+ int scene_framenr,
+ float val),
+ void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord, bool is_point),
+ void (*segment_end)(void *userdata, int coord))
{
- MovieClip *clip = ED_space_clip_get_clip(sc);
- MovieTracking *tracking = &clip->tracking;
- ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
- MovieTrackingTrack *track;
+ MovieClip *clip = ED_space_clip_get_clip(sc);
+ MovieTracking *tracking = &clip->tracking;
+ ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+ MovieTrackingTrack *track;
- for (track = tracksbase->first; track; track = track->next) {
- if (!include_hidden && (track->flag & TRACK_HIDDEN) != 0)
- continue;
+ for (track = tracksbase->first; track; track = track->next) {
+ if (!include_hidden && (track->flag & TRACK_HIDDEN) != 0)
+ continue;
- if (selected_only && !TRACK_SELECTED(track))
- continue;
+ if (selected_only && !TRACK_SELECTED(track))
+ continue;
- clip_graph_tracking_values_iterate_track(sc, track, userdata, func, segment_start, segment_end);
- }
+ clip_graph_tracking_values_iterate_track(
+ sc, track, userdata, func, segment_start, segment_end);
+ }
}
-void clip_graph_tracking_iterate(SpaceClip *sc, bool selected_only, bool include_hidden, void *userdata,
+void clip_graph_tracking_iterate(SpaceClip *sc,
+ bool selected_only,
+ bool include_hidden,
+ void *userdata,
void (*func)(void *userdata, MovieTrackingMarker *marker))
{
- MovieClip *clip = ED_space_clip_get_clip(sc);
- MovieTracking *tracking = &clip->tracking;
- ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
- MovieTrackingTrack *track;
+ MovieClip *clip = ED_space_clip_get_clip(sc);
+ MovieTracking *tracking = &clip->tracking;
+ ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+ MovieTrackingTrack *track;
- for (track = tracksbase->first; track; track = track->next) {
- int i;
+ for (track = tracksbase->first; track; track = track->next) {
+ int i;
- if (!include_hidden && (track->flag & TRACK_HIDDEN) != 0)
- continue;
+ if (!include_hidden && (track->flag & TRACK_HIDDEN) != 0)
+ continue;
- if (selected_only && !TRACK_SELECTED(track))
- continue;
+ if (selected_only && !TRACK_SELECTED(track))
+ continue;
- for (i = 0; i < track->markersnr; i++) {
- MovieTrackingMarker *marker = &track->markers[i];
+ for (i = 0; i < track->markersnr; i++) {
+ MovieTrackingMarker *marker = &track->markers[i];
- if (marker->flag & MARKER_DISABLED)
- continue;
+ if (marker->flag & MARKER_DISABLED)
+ continue;
- if (func)
- func(userdata, marker);
- }
- }
+ if (func)
+ func(userdata, marker);
+ }
+ }
}
void clip_delete_track(bContext *C, MovieClip *clip, MovieTrackingTrack *track)
{
- MovieTracking *tracking = &clip->tracking;
- MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
- ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
- bool has_bundle = false;
- const bool used_for_stabilization =
- (track->flag & (TRACK_USE_2D_STAB | TRACK_USE_2D_STAB_ROT)) != 0;
- if (track == act_track) {
- tracking->act_track = NULL;
- }
- /* Handle reconstruction display in 3d viewport. */
- if (track->flag & TRACK_HAS_BUNDLE) {
- has_bundle = true;
- }
- /* Make sure no plane will use freed track */
- BKE_tracking_plane_tracks_remove_point_track(tracking, track);
- /* Delete f-curves associated with the track (such as weight, i.e.) */
- /* Escaped object name, escaped track name, rest of the path. */
- char rna_path[MAX_NAME * 4 + 64];
- BKE_tracking_get_rna_path_for_track(tracking,
- track,
- rna_path, sizeof(rna_path));
- if (BKE_animdata_fix_paths_remove(&clip->id, rna_path)) {
- DEG_relations_tag_update(CTX_data_main(C));
- }
- /* Delete track itself. */
- BKE_tracking_track_free(track);
- BLI_freelinkN(tracksbase, track);
- /* Send notifiers. */
- WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);
- if (used_for_stabilization) {
- WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip);
- }
- /* Inform dependency graph. */
- DEG_id_tag_update(&clip->id, 0);
- if (has_bundle) {
- WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL);
- }
+ MovieTracking *tracking = &clip->tracking;
+ MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
+ ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+ bool has_bundle = false;
+ const bool used_for_stabilization = (track->flag &
+ (TRACK_USE_2D_STAB | TRACK_USE_2D_STAB_ROT)) != 0;
+ if (track == act_track) {
+ tracking->act_track = NULL;
+ }
+ /* Handle reconstruction display in 3d viewport. */
+ if (track->flag & TRACK_HAS_BUNDLE) {
+ has_bundle = true;
+ }
+ /* Make sure no plane will use freed track */
+ BKE_tracking_plane_tracks_remove_point_track(tracking, track);
+ /* Delete f-curves associated with the track (such as weight, i.e.) */
+ /* Escaped object name, escaped track name, rest of the path. */
+ char rna_path[MAX_NAME * 4 + 64];
+ BKE_tracking_get_rna_path_for_track(tracking, track, rna_path, sizeof(rna_path));
+ if (BKE_animdata_fix_paths_remove(&clip->id, rna_path)) {
+ DEG_relations_tag_update(CTX_data_main(C));
+ }
+ /* Delete track itself. */
+ BKE_tracking_track_free(track);
+ BLI_freelinkN(tracksbase, track);
+ /* Send notifiers. */
+ WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);
+ if (used_for_stabilization) {
+ WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip);
+ }
+ /* Inform dependency graph. */
+ DEG_id_tag_update(&clip->id, 0);
+ if (has_bundle) {
+ WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL);
+ }
}
-void clip_delete_marker(bContext *C, MovieClip *clip, MovieTrackingTrack *track,
+void clip_delete_marker(bContext *C,
+ MovieClip *clip,
+ MovieTrackingTrack *track,
MovieTrackingMarker *marker)
{
- if (track->markersnr == 1) {
- clip_delete_track(C, clip, track);
- }
- else {
- BKE_tracking_marker_delete(track, marker->framenr);
-
- WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);
- }
+ if (track->markersnr == 1) {
+ clip_delete_track(C, clip, track);
+ }
+ else {
+ BKE_tracking_marker_delete(track, marker->framenr);
+
+ WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);
+ }
}
-void clip_delete_plane_track(bContext *C,
- MovieClip *clip,
- MovieTrackingPlaneTrack *plane_track)
+void clip_delete_plane_track(bContext *C, MovieClip *clip, MovieTrackingPlaneTrack *plane_track)
{
- MovieTracking *tracking = &clip->tracking;
- ListBase *plane_tracks_base = BKE_tracking_get_active_plane_tracks(tracking);
- /* Delete f-curves associated with the track (such as weight, i.e.) */
- /* Escaped object name, escaped track name, rest of the path. */
- char rna_path[MAX_NAME * 4 + 64];
- BKE_tracking_get_rna_path_for_plane_track(tracking,
- plane_track,
- rna_path, sizeof(rna_path));
- if (BKE_animdata_fix_paths_remove(&clip->id, rna_path)) {
- DEG_relations_tag_update(CTX_data_main(C));
- }
- /* Delete the plane track itself. */
- BKE_tracking_plane_track_free(plane_track);
- BLI_freelinkN(plane_tracks_base, plane_track);
- /* TODO(sergey): Any notifiers to be sent here? */
- (void) C;
- /* Inform dependency graph. */
- DEG_id_tag_update(&clip->id, 0);
+ MovieTracking *tracking = &clip->tracking;
+ ListBase *plane_tracks_base = BKE_tracking_get_active_plane_tracks(tracking);
+ /* Delete f-curves associated with the track (such as weight, i.e.) */
+ /* Escaped object name, escaped track name, rest of the path. */
+ char rna_path[MAX_NAME * 4 + 64];
+ BKE_tracking_get_rna_path_for_plane_track(tracking, plane_track, rna_path, sizeof(rna_path));
+ if (BKE_animdata_fix_paths_remove(&clip->id, rna_path)) {
+ DEG_relations_tag_update(CTX_data_main(C));
+ }
+ /* Delete the plane track itself. */
+ BKE_tracking_plane_track_free(plane_track);
+ BLI_freelinkN(plane_tracks_base, plane_track);
+ /* TODO(sergey): Any notifiers to be sent here? */
+ (void)C;
+ /* Inform dependency graph. */
+ DEG_id_tag_update(&clip->id, 0);
}
void clip_view_center_to_point(SpaceClip *sc, float x, float y)
{
- int width, height;
- float aspx, aspy;
+ int width, height;
+ float aspx, aspy;
- ED_space_clip_get_size(sc, &width, &height);
- ED_space_clip_get_aspect(sc, &aspx, &aspy);
+ ED_space_clip_get_size(sc, &width, &height);
+ ED_space_clip_get_aspect(sc, &aspx, &aspy);
- sc->xof = (x - 0.5f) * width * aspx;
- sc->yof = (y - 0.5f) * height * aspy;
+ sc->xof = (x - 0.5f) * width * aspx;
+ sc->yof = (y - 0.5f) * height * aspy;
}
void clip_draw_sfra_efra(View2D *v2d, Scene *scene)
{
- UI_view2d_view_ortho(v2d);
+ UI_view2d_view_ortho(v2d);
- /* currently clip editor supposes that editing clip length is equal to scene frame range */
- GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
- GPU_blend(true);
+ /* currently clip editor supposes that editing clip length is equal to scene frame range */
+ GPU_blend_set_func_separate(
+ GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
+ GPU_blend(true);
- uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- immUniformColor4f(0.0f, 0.0f, 0.0f, 0.4f);
- immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, (float)SFRA, v2d->cur.ymax);
- immRectf(pos, (float)EFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+ immUniformColor4f(0.0f, 0.0f, 0.0f, 0.4f);
+ immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, (float)SFRA, v2d->cur.ymax);
+ immRectf(pos, (float)EFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
- GPU_blend(false);
+ GPU_blend(false);
- immUniformThemeColorShade(TH_BACK, -60);
+ immUniformThemeColorShade(TH_BACK, -60);
- /* thin lines where the actual frames are */
- GPU_line_width(1.0f);
+ /* thin lines where the actual frames are */
+ GPU_line_width(1.0f);
- immBegin(GPU_PRIM_LINES, 4);
- immVertex2f(pos, (float)SFRA, v2d->cur.ymin);
- immVertex2f(pos, (float)SFRA, v2d->cur.ymax);
- immVertex2f(pos, (float)EFRA, v2d->cur.ymin);
- immVertex2f(pos, (float)EFRA, v2d->cur.ymax);
- immEnd();
+ immBegin(GPU_PRIM_LINES, 4);
+ immVertex2f(pos, (float)SFRA, v2d->cur.ymin);
+ immVertex2f(pos, (float)SFRA, v2d->cur.ymax);
+ immVertex2f(pos, (float)EFRA, v2d->cur.ymin);
+ immVertex2f(pos, (float)EFRA, v2d->cur.ymax);
+ immEnd();
- immUnbindProgram();
+ immUnbindProgram();
}