[Bf-blender-cvs] [589d1be147b] master: Cleanup: rename variables to distinguish between target and source
Germano Cavalcante
noreply at git.blender.org
Thu Jan 12 14:30:34 CET 2023
Commit: 589d1be147b02444fed2ebcc4006524c08e929c8
Author: Germano Cavalcante
Date: Thu Jan 12 10:16:25 2023 -0300
Branches: master
https://developer.blender.org/rB589d1be147b02444fed2ebcc4006524c08e929c8
Cleanup: rename variables to distinguish between target and source
>From --> To
**Struct Members:**
|snapTarget|snap_source
|snapPoint|snap_target
|snapTargetGrid|snap_target_grid
|calcSnap|snap_target_fn
|targetSnap|snap_source_fn
|applySnap|snap_mode_apply_fn
|distance|snap_mode_distance_fn
|source_select|source_operation
|target_select|target_operation
**Functions:**
|snap_calc_view3d_fn|snap_target_view3d_fn
|snap_calc_uv_fn|snap_target_uv_fn
|snap_calc_node_fn|snap_target_node_fn
|snap_calc_sequencer_fn|snap_target_sequencer_fn
|TargetSnapMedian|snap_source_median_fn
|TargetSnapCenter|snap_source_center_fn
|TargetSnapClosest|snap_source_closest_fn
|TargetSnapActive|snap_source_active_fn
**Enums:**
|TARGET_INIT|SNAP_SOURCE_FOUND
|TARGET_GRID_INIT|SNAP_TARGET_GRID_FOUND
|POINT_INIT|SNAP_TARGET_FOUND
|MULTI_POINTS|SNAP_MULTI_POINTS
**Types:**
|eSnapSourceSelect|eSnapSourceOP
|eSnapTargetSelect|eSnapTargetOP
Also rename Select to Operation.
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D16967
===================================================================
M source/blender/editors/include/ED_transform_snap_object_context.h
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_constraints.c
M source/blender/editors/transform/transform_mode_edge_seq_slide.c
M source/blender/editors/transform/transform_mode_edge_slide.c
M source/blender/editors/transform/transform_mode_resize.c
M source/blender/editors/transform/transform_mode_rotate.c
M source/blender/editors/transform/transform_mode_translate.c
M source/blender/editors/transform/transform_mode_vert_slide.c
M source/blender/editors/transform/transform_ops.c
M source/blender/editors/transform/transform_snap.cc
M source/blender/editors/transform/transform_snap_object.cc
M source/blender/editors/transform/transform_snap_sequencer.c
M source/blender/makesdna/DNA_scene_types.h
===================================================================
diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h
index f9ca578f282..99b7d95c74c 100644
--- a/source/blender/editors/include/ED_transform_snap_object_context.h
+++ b/source/blender/editors/include/ED_transform_snap_object_context.h
@@ -53,7 +53,7 @@ struct SnapObjectHitDepth {
/** parameters that define which objects will be used to snap. */
struct SnapObjectParams {
/* Special context sensitive handling for the active or selected object. */
- eSnapTargetSelect snap_target_select;
+ eSnapTargetOP snap_target_select;
/* Geometry for snapping in edit mode. */
eSnapEditType edit_mode_type;
/* snap to the closest element, use when using more than one snap type */
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index ff93bcaf8ca..c9cf572e9ad 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1573,9 +1573,9 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
if ((prop = RNA_struct_find_property(op->ptr, "snap_elements"))) {
RNA_property_enum_set(op->ptr, prop, t->tsnap.mode);
RNA_boolean_set(op->ptr, "use_snap_project", t->tsnap.project);
- RNA_enum_set(op->ptr, "snap_target", t->tsnap.source_select);
+ RNA_enum_set(op->ptr, "snap_target", t->tsnap.source_operation);
- eSnapTargetSelect target = t->tsnap.target_select;
+ eSnapTargetOP target = t->tsnap.target_operation;
RNA_boolean_set(op->ptr, "use_snap_self", (target & SCE_SNAP_TARGET_NOT_ACTIVE) == 0);
RNA_boolean_set(op->ptr, "use_snap_edit", (target & SCE_SNAP_TARGET_NOT_EDITED) == 0);
RNA_boolean_set(op->ptr, "use_snap_nonedit", (target & SCE_SNAP_TARGET_NOT_NONEDITED) == 0);
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 29df931e136..13362cee2b6 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -160,13 +160,13 @@ ENUM_OPERATORS(eTModifier, MOD_NODE_ATTACH)
typedef enum eTSnap {
SNAP_RESETTED = 0,
SNAP_FORCED = 1 << 0,
- TARGET_INIT = 1 << 1,
+ SNAP_SOURCE_FOUND = 1 << 1,
/* Special flag for snap to grid. */
- TARGET_GRID_INIT = 1 << 2,
- POINT_INIT = 1 << 3,
- MULTI_POINTS = 1 << 4,
+ SNAP_TARGET_GRID_FOUND = 1 << 2,
+ SNAP_TARGET_FOUND = 1 << 3,
+ SNAP_MULTI_POINTS = 1 << 4,
} eTSnap;
-ENUM_OPERATORS(eTSnap, MULTI_POINTS)
+ENUM_OPERATORS(eTSnap, SNAP_MULTI_POINTS)
/** #TransCon.mode, #TransInfo.con.mode */
typedef enum {
@@ -276,9 +276,9 @@ typedef struct TransSnap {
/* Method(s) used for snapping source to target */
eSnapMode mode;
/* Part of source to snap to target */
- eSnapSourceSelect source_select;
+ eSnapSourceOP source_operation;
/* Determines which objects are possible target */
- eSnapTargetSelect target_select;
+ eSnapTargetOP target_operation;
bool align;
bool project;
bool peel;
@@ -288,25 +288,25 @@ typedef struct TransSnap {
/* Snapped Element Type (currently for objects only). */
eSnapMode snapElem;
/** snapping from this point (in global-space). */
- float snapTarget[3];
+ float snap_source[3];
/** to this point (in global-space). */
- float snapPoint[3];
- float snapTargetGrid[3];
+ float snap_target[3];
+ float snap_target_grid[3];
float snapNormal[3];
char snapNodeBorder;
ListBase points;
TransSnapPoint *selectedPoint;
double last;
- void (*applySnap)(struct TransInfo *, float *);
- void (*calcSnap)(struct TransInfo *, float *);
- void (*targetSnap)(struct TransInfo *);
+ void (*snap_target_fn)(struct TransInfo *, float *);
+ void (*snap_source_fn)(struct TransInfo *);
/**
* Get the transform distance between two points (used by Closest snap)
*
* \note Return value can be anything,
* where the smallest absolute value defines what's closest.
*/
- float (*distance)(struct TransInfo *t, const float p1[3], const float p2[3]);
+ float (*snap_mode_distance_fn)(struct TransInfo *t, const float p1[3], const float p2[3]);
+ void (*snap_mode_apply_fn)(struct TransInfo *, float *);
/**
* Re-usable snap context data.
diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c
index b0db9398e80..61adc98c258 100644
--- a/source/blender/editors/transform/transform_constraints.c
+++ b/source/blender/editors/transform/transform_constraints.c
@@ -270,12 +270,12 @@ static void axisProjection(const TransInfo *t,
static void constraint_snap_plane_to_edge(const TransInfo *t, const float plane[4], float r_out[3])
{
float lambda;
- const float *edge_snap_point = t->tsnap.snapPoint;
+ const float *edge_snap_point = t->tsnap.snap_target;
const float *edge_dir = t->tsnap.snapNormal;
bool is_aligned = fabsf(dot_v3v3(edge_dir, plane)) < CONSTRAIN_EPSILON;
if (!is_aligned && isect_ray_plane_v3(edge_snap_point, edge_dir, plane, &lambda, false)) {
madd_v3_v3v3fl(r_out, edge_snap_point, edge_dir, lambda);
- sub_v3_v3(r_out, t->tsnap.snapTarget);
+ sub_v3_v3(r_out, t->tsnap.snap_source);
}
}
@@ -284,13 +284,13 @@ static void UNUSED_FUNCTION(constraint_snap_plane_to_face(const TransInfo *t,
float r_out[3]))
{
float face_plane[4], isect_orig[3], isect_dir[3];
- const float *face_snap_point = t->tsnap.snapPoint;
+ const float *face_snap_point = t->tsnap.snap_target;
const float *face_normal = t->tsnap.snapNormal;
plane_from_point_normal_v3(face_plane, face_snap_point, face_normal);
bool is_aligned = fabsf(dot_v3v3(plane, face_plane)) > (1.0f - CONSTRAIN_EPSILON);
if (!is_aligned && isect_plane_plane_v3(plane, face_plane, isect_orig, isect_dir)) {
closest_to_ray_v3(r_out, face_snap_point, isect_orig, isect_dir);
- sub_v3_v3(r_out, t->tsnap.snapTarget);
+ sub_v3_v3(r_out, t->tsnap.snap_source);
}
}
@@ -299,11 +299,11 @@ void transform_constraint_snap_axis_to_edge(const TransInfo *t,
float r_out[3])
{
float lambda;
- const float *edge_snap_point = t->tsnap.snapPoint;
+ const float *edge_snap_point = t->tsnap.snap_target;
const float *edge_dir = t->tsnap.snapNormal;
bool is_aligned = fabsf(dot_v3v3(axis, edge_dir)) > (1.0f - CONSTRAIN_EPSILON);
if (!is_aligned &&
- isect_ray_ray_v3(t->tsnap.snapTarget, axis, edge_snap_point, edge_dir, &lambda, NULL)) {
+ isect_ray_ray_v3(t->tsnap.snap_source, axis, edge_snap_point, edge_dir, &lambda, NULL)) {
mul_v3_v3fl(r_out, axis, lambda);
}
}
@@ -314,11 +314,11 @@ void transform_constraint_snap_axis_to_face(const TransInfo *t,
{
float lambda;
float face_plane[4];
- const float *face_snap_point = t->tsnap.snapPoint;
+ const float *face_snap_point = t->tsnap.snap_target;
const float *face_normal = t->tsnap.snapNormal;
plane_from_point_normal_v3(face_plane, face_snap_point, face_normal);
bool is_aligned = fabsf(dot_v3v3(axis, face_plane)) < CONSTRAIN_EPSILON;
- if (!is_aligned && isect_ray_plane_v3(t->tsnap.snapTarget, axis, face_plane, &lambda, false)) {
+ if (!is_aligned && isect_ray_plane_v3(t->tsnap.snap_source, axis, face_plane, &lambda, false)) {
mul_v3_v3fl(r_out, axis, lambda);
}
}
diff --git a/source/blender/editors/transform/transform_mode_edge_seq_slide.c b/source/blender/editors/transform/transform_mode_edge_seq_slide.c
index ae824b5a712..4c7670ae302 100644
--- a/source/blender/editors/transform/transform_mode_edge_seq_slide.c
+++ b/source/blender/editors/transform/transform_mode_edge_seq_slide.c
@@ -110,7 +110,7 @@ static void applySeqSlide(TransInfo *t, const int UNUSED(mval[2]))
void initSeqSlide(TransInfo *t)
{
t->transform = applySeqSlide;
- t->tsnap.applySnap = transform_snap_sequencer_apply_translate;
+ t->tsnap.snap_mode_apply_fn = transform_snap_sequencer_apply_translate;
initMouseInputMode(t, &t->mouse, INPUT_VECTOR);
diff --git a/source/blender/editors/transform/transform_mode_edge_slide.c b/source/blender/editors/transform/transform_mode_edge_slide.c
index 2d4cc7e2c76..6920deea574 100644
--- a/source/blender/editors/transform/transform_mode_edge_slide.c
+++ b/source/blender/editors/transform/transform_mode_edge_slide.c
@@ -1272,7 +1272,7 @@ static void edge_slide_snap_apply(TransInfo *t, float *value)
}
getSnapPoint(t, dvec);
- sub_v3_v3(dvec, t->tsnap.snapTarget);
+ sub_v3_v3(dvec, t->tsnap.snap_source);
add_v3_v3v3(snap_point, co_orig, dvec);
float perc = *value;
@@ -1498,8 +1498,8 @@ void initEdgeSlide_ex(
t->mode = TFM_EDGE_SLIDE;
t->transform = applyEdgeSlide;
t->handleEvent = handleEventEdgeSlide;
- t->tsnap.applySnap = edge_slide_snap_apply;
- t->tsnap.distance = transform_snap_distance_len_squared_fn;
+ t->tsnap.snap_mode_apply_fn = edge_slide_snap_apply;
+ t->tsnap.snap_mode_distance_fn = transform_snap_distance_len_squared_fn;
{
EdgeSlideParams *slp = MEM_callocN(sizeof(*slp), __func__);
diff --git a/source/blender/editors/transform/transform_mode_resize.c b/source/blender/editors/transform/transform_mode_resize.c
index 668e1ed567f..ae90463b7f3 100644
--- a/source/blender/editors/transform/transform_mode_resize.c
+++ b/source/blender/editors/transform/transform_mode_resize.c
@@ -79,7 +79,7 @@ static void ApplySnapResize(TransInfo *t, float vec[3])
float point[3];
getSnapPoint(t, point);
- float dist = ResizeBetween(t, t->tsnap.snapTarget, point);
+ float dist = ResizeBetween(t, t->tsnap.snap_source, point);
if (dist != TRANSFORM_DIST_INVALID) {
copy_v3_fl(vec, dist);
}
@@ -287,8 +287,8 @@ void initResize(TransInfo *t, float mouse_dir_constraint[3])
{
t->mode = TFM_RESIZE;
t->transform = applyResize;
- t->tsnap.applySnap = ApplySnapResize;
- t->tsnap.distance = ResizeBetween;
+ t->tsnap.snap_mode_apply_fn = ApplySnapResize;
+ t->tsnap.snap_mode_distance_fn = ResizeBetween;
if (is_zero_v3(mouse_dir_constraint)) {
initMouseInputMode(t, &t->mouse, INPUT_SPRING_FLIP);
diff --git a/source/blender/editors/transform
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list