[Bf-blender-cvs] [016f9c2cf56] master: Cleanup: Variable naming in tracking files
Sergey Sharybin
noreply at git.blender.org
Tue Nov 22 11:54:22 CET 2022
Commit: 016f9c2cf565b36bd66e59d79718ed3bca40e82c
Author: Sergey Sharybin
Date: Wed Oct 5 18:01:29 2022 +0200
Branches: master
https://developer.blender.org/rB016f9c2cf565b36bd66e59d79718ed3bca40e82c
Cleanup: Variable naming in tracking files
Make it obvious that the object is the motion tracking one, and
not the ID_OB type.
===================================================================
M source/blender/blenkernel/BKE_tracking.h
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/tracking.c
M source/blender/blenkernel/intern/tracking_solver.c
M source/blender/blenkernel/intern/tracking_util.c
M source/blender/blenloader/intern/versioning_260.c
M source/blender/compositor/operations/COM_PlaneTrackOperation.cc
M source/blender/compositor/operations/COM_TrackPositionOperation.cc
M source/blender/editors/space_clip/clip_dopesheet_ops.c
M source/blender/editors/space_clip/clip_draw.c
M source/blender/editors/space_clip/clip_graph_ops.c
M source/blender/editors/space_clip/tracking_ops.c
M source/blender/editors/space_clip/tracking_ops_solve.c
M source/blender/makesrna/intern/rna_mask.c
M source/blender/makesrna/intern/rna_tracking.c
M source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
M source/blender/nodes/composite/nodes/node_composite_trackpos.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h
index ff12cf4d2bf..11356aa0384 100644
--- a/source/blender/blenkernel/BKE_tracking.h
+++ b/source/blender/blenkernel/BKE_tracking.h
@@ -95,7 +95,7 @@ void BKE_tracking_get_camera_object_matrix(struct Object *camera_object, float m
* \note frame number should be in clip space, not scene space.
*/
void BKE_tracking_get_projection_matrix(struct MovieTracking *tracking,
- struct MovieTrackingObject *object,
+ struct MovieTrackingObject *tracking_object,
int framenr,
int winx,
int winy,
@@ -113,7 +113,7 @@ void BKE_tracking_clipboard_free(void);
* Copy selected tracks from specified object to the clipboard.
*/
void BKE_tracking_clipboard_copy_tracks(struct MovieTracking *tracking,
- struct MovieTrackingObject *object);
+ struct MovieTrackingObject *tracking_object);
/**
* Check whether there are any tracks in the clipboard.
*/
@@ -124,7 +124,7 @@ bool BKE_tracking_clipboard_has_tracks(void);
* Names of new tracks in object are guaranteed to be unique here.
*/
void BKE_tracking_clipboard_paste_tracks(struct MovieTracking *tracking,
- struct MovieTrackingObject *object);
+ struct MovieTrackingObject *tracking_object);
/* **** Track **** */
@@ -248,9 +248,8 @@ void BKE_tracking_tracks_average(struct MovieTrackingTrack *dst_track,
/*const*/ struct MovieTrackingTrack **src_tracks,
int num_src_tracks);
-struct MovieTrackingTrack *BKE_tracking_track_get_named(struct MovieTracking *tracking,
- struct MovieTrackingObject *object,
- const char *name);
+struct MovieTrackingTrack *BKE_tracking_track_get_named(
+ struct MovieTracking *tracking, struct MovieTrackingObject *tracking_object, const char *name);
struct MovieTrackingTrack *BKE_tracking_track_get_indexed(struct MovieTracking *tracking,
int tracknr,
struct ListBase **r_tracksbase);
@@ -382,7 +381,7 @@ bool BKE_tracking_plane_track_has_enabled_marker_at_frame(
struct MovieTrackingPlaneTrack *plane_track, int framenr);
struct MovieTrackingPlaneTrack *BKE_tracking_plane_track_get_named(
- struct MovieTracking *tracking, struct MovieTrackingObject *object, const char *name);
+ struct MovieTracking *tracking, struct MovieTrackingObject *tracking_object, const char *name);
struct MovieTrackingPlaneTrack *BKE_tracking_plane_track_get_active(
struct MovieTracking *tracking);
@@ -440,10 +439,10 @@ void BKE_tracking_plane_marker_get_subframe_corners(struct MovieTrackingPlaneTra
struct MovieTrackingObject *BKE_tracking_object_add(struct MovieTracking *tracking,
const char *name);
bool BKE_tracking_object_delete(struct MovieTracking *tracking,
- struct MovieTrackingObject *object);
+ struct MovieTrackingObject *tracking_object);
void BKE_tracking_object_unique_name(struct MovieTracking *tracking,
- struct MovieTrackingObject *object);
+ struct MovieTrackingObject *tracking_object);
struct MovieTrackingObject *BKE_tracking_object_get_named(struct MovieTracking *tracking,
const char *name);
@@ -467,9 +466,9 @@ void BKE_tracking_camera_to_blender(struct MovieTracking *tracking,
int height);
struct MovieReconstructedCamera *BKE_tracking_camera_get_reconstructed(
- struct MovieTracking *tracking, struct MovieTrackingObject *object, int framenr);
+ struct MovieTracking *tracking, struct MovieTrackingObject *tracking_object, int framenr);
void BKE_tracking_camera_get_reconstructed_interpolate(struct MovieTracking *tracking,
- struct MovieTrackingObject *object,
+ struct MovieTrackingObject *tracking_object,
float framenr,
float mat[4][4]);
@@ -619,7 +618,7 @@ void BKE_tracking_homography_between_two_quads(/*const*/ float reference_corners
* Perform early check on whether everything is fine to start reconstruction.
*/
bool BKE_tracking_reconstruction_check(struct MovieTracking *tracking,
- struct MovieTrackingObject *object,
+ struct MovieTrackingObject *tracking_object,
char *error_msg,
int error_size);
@@ -630,7 +629,7 @@ bool BKE_tracking_reconstruction_check(struct MovieTracking *tracking,
*/
struct MovieReconstructContext *BKE_tracking_reconstruction_context_new(
struct MovieClip *clip,
- struct MovieTrackingObject *object,
+ struct MovieTrackingObject *tracking_object,
int keyframe1,
int keyframe2,
int width,
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index bcc4ad0cb55..986f432b2fe 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -5232,11 +5232,11 @@ static void camerasolver_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
if (clip) {
float mat[4][4], obmat[4][4];
MovieTracking *tracking = &clip->tracking;
- MovieTrackingObject *object = BKE_tracking_object_get_camera(tracking);
- float ctime = DEG_get_ctime(depsgraph);
- float framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, ctime);
+ MovieTrackingObject *tracking_object = BKE_tracking_object_get_camera(tracking);
+ const float ctime = DEG_get_ctime(depsgraph);
+ const float framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, ctime);
- BKE_tracking_camera_get_reconstructed_interpolate(tracking, object, framenr, mat);
+ BKE_tracking_camera_get_reconstructed_interpolate(tracking, tracking_object, framenr, mat);
copy_m4_m4(obmat, cob->matrix);
@@ -5294,10 +5294,8 @@ static void objectsolver_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
}
MovieTracking *tracking = &clip->tracking;
- MovieTrackingObject *object;
-
- object = BKE_tracking_object_get_named(tracking, data->object);
- if (!object) {
+ MovieTrackingObject *tracking_object = BKE_tracking_object_get_named(tracking, data->object);
+ if (!tracking_object) {
return;
}
@@ -5305,7 +5303,7 @@ static void objectsolver_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
float ctime = DEG_get_ctime(depsgraph);
float framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, ctime);
- BKE_tracking_camera_get_reconstructed_interpolate(tracking, object, framenr, mat);
+ BKE_tracking_camera_get_reconstructed_interpolate(tracking, tracking_object, framenr, mat);
invert_m4_m4(imat, mat);
mul_m4_m4m4(parmat, camob->object_to_world, imat);
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index 5036218b1a9..32e31cdfc0f 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -101,11 +101,11 @@ static void tracking_reconstruction_free(MovieTrackingReconstruction *reconstruc
*
* All the pointers inside structure becomes invalid after this call.
*/
-static void tracking_object_free(MovieTrackingObject *object)
+static void tracking_object_free(MovieTrackingObject *tracking_object)
{
- tracking_tracks_free(&object->tracks);
- tracking_plane_tracks_free(&object->plane_tracks);
- tracking_reconstruction_free(&object->reconstruction);
+ tracking_tracks_free(&tracking_object->tracks);
+ tracking_plane_tracks_free(&tracking_object->plane_tracks);
+ tracking_reconstruction_free(&tracking_object->reconstruction);
}
/* Free list of tracking objects, list's head and tail is set to NULL. */
@@ -252,43 +252,45 @@ static void tracking_stabilization_copy(MovieTrackingStabilization *stabilizatio
}
/* Copy tracking object. */
-static void tracking_object_copy(MovieTrackingObject *object_dst,
- const MovieTrackingObject *object_src,
+static void tracking_object_copy(MovieTrackingObject *tracking_object_dst,
+ const MovieTrackingObject *tracking_object_src,
const int flag)
{
TrackingCopyContext ctx = tracking_copy_context_new();
- *object_dst = *object_src;
- tracking_tracks_copy(&ctx, &object_dst->tracks, &object_src->tracks, flag);
- tracking_plane_tracks_copy(&ctx, &object_dst->plane_tracks, &object_src->plane_tracks, flag);
+ *tracking_object_dst = *tracking_object_src;
+
+ tracking_tracks_copy(&ctx, &tracking_object_dst->tracks, &tracking_object_src->tracks, flag);
+ tracking_plane_tracks_copy(
+ &ctx, &tracking_object_dst->plane_tracks, &tracking_object_src->plane_tracks, flag);
tracking_reconstruction_copy(
- &ctx, &object_dst->reconstruction, &object_src->reconstruction, flag);
+ &ctx, &tracking_object_dst->reconstruction, &tracking_object_src->reconstruction, flag);
- if (object_src->active_track) {
- object_dst->active_track = BLI_ghash_lookup(ctx.old_to_new_track_map,
- object_src->active_track);
- BLI_assert(object_dst->active_track != NULL);
+ if (tracking_object_src->active_track) {
+ tracking_object_dst->active_track = BLI_ghash_lookup(ctx.old_to_new_track_map,
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list