[Bf-blender-cvs] [9a8669ac81b] master: Cleanup: Use bool, remove unnecessary struct keywords
Hans Goudey
noreply at git.blender.org
Wed Apr 27 01:45:46 CEST 2022
Commit: 9a8669ac81b99b2648b12e936bfcbc8a69a0fbbb
Author: Hans Goudey
Date: Tue Apr 26 18:45:40 2022 -0500
Branches: master
https://developer.blender.org/rB9a8669ac81b99b2648b12e936bfcbc8a69a0fbbb
Cleanup: Use bool, remove unnecessary struct keywords
===================================================================
M source/blender/editors/transform/transform_snap_object.cc
===================================================================
diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc
index 584c9642e5a..27b8e858f32 100644
--- a/source/blender/editors/transform/transform_snap_object.cc
+++ b/source/blender/editors/transform/transform_snap_object.cc
@@ -69,10 +69,10 @@ struct SnapData_Mesh {
/* Looptris. */
BVHTreeFromMesh treedata_mesh;
- const struct MPoly *poly;
- uint has_looptris : 1;
- uint has_loose_edge : 1;
- uint has_loose_vert : 1;
+ const MPoly *poly;
+ bool has_looptris = true;
+ bool has_loose_edge = true;
+ bool has_loose_vert = true;
void clear()
{
@@ -317,7 +317,7 @@ static SnapData_Mesh *snap_object_data_mesh_get(SnapObjectContext *sctx,
/* Searches for the #Mesh_Runtime associated with the object that is most likely to be updated due
* to changes in the `edit_mesh`. */
-static struct Mesh_Runtime *snap_object_data_editmesh_runtime_get(Object *ob_eval)
+static Mesh_Runtime *snap_object_data_editmesh_runtime_get(Object *ob_eval)
{
Mesh *editmesh_eval_final = BKE_object_get_editmesh_eval_final(ob_eval);
if (editmesh_eval_final) {
@@ -405,7 +405,7 @@ static SnapData_EditMesh *snap_object_data_editmesh_get(SnapObjectContext *sctx,
* \{ */
using IterSnapObjsCallback = void (*)(SnapObjectContext *sctx,
- const struct SnapObjectParams *params,
+ const SnapObjectParams *params,
Object *ob_eval,
const float obmat[4][4],
bool is_object_active,
@@ -457,7 +457,7 @@ static bool snap_object_is_snappable(const SnapObjectContext *sctx,
* Walks through all objects in the scene to create the list of objects to snap.
*/
static void iter_snap_objects(SnapObjectContext *sctx,
- const struct SnapObjectParams *params,
+ const SnapObjectParams *params,
IterSnapObjsCallback sob_callback,
void *data)
{
@@ -515,15 +515,15 @@ struct RayCastAll_Data {
bool retval;
};
-static struct SnapObjectHitDepth *hit_depth_create(const float depth,
- const float co[3],
- const float no[3],
- int index,
- Object *ob_eval,
- const float obmat[4][4],
- uint ob_uuid)
+static SnapObjectHitDepth *hit_depth_create(const float depth,
+ const float co[3],
+ const float no[3],
+ int index,
+ Object *ob_eval,
+ const float obmat[4][4],
+ uint ob_uuid)
{
- struct SnapObjectHitDepth *hit = MEM_new<SnapObjectHitDepth>(__func__);
+ SnapObjectHitDepth *hit = MEM_new<SnapObjectHitDepth>(__func__);
hit->depth = depth;
copy_v3_v3(hit->co, co);
@@ -539,8 +539,8 @@ static struct SnapObjectHitDepth *hit_depth_create(const float depth,
static int hit_depth_cmp(const void *arg1, const void *arg2)
{
- const struct SnapObjectHitDepth *h1 = static_cast<const struct SnapObjectHitDepth *>(arg1);
- const struct SnapObjectHitDepth *h2 = static_cast<const struct SnapObjectHitDepth *>(arg2);
+ const SnapObjectHitDepth *h1 = static_cast<const SnapObjectHitDepth *>(arg1);
+ const SnapObjectHitDepth *h2 = static_cast<const SnapObjectHitDepth *>(arg2);
int val = 0;
if (h1->depth < h2->depth) {
@@ -555,7 +555,7 @@ static int hit_depth_cmp(const void *arg1, const void *arg2)
static void raycast_all_cb(void *userdata, int index, const BVHTreeRay *ray, BVHTreeRayHit *hit)
{
- struct RayCastAll_Data *data = static_cast<struct RayCastAll_Data *>(userdata);
+ RayCastAll_Data *data = static_cast<RayCastAll_Data *>(userdata);
data->raycast_callback(data->bvhdata, index, ray, hit);
if (hit->index != -1) {
/* Get all values in world-space. */
@@ -571,7 +571,7 @@ static void raycast_all_cb(void *userdata, int index, const BVHTreeRay *ray, BVH
mul_m3_v3((float(*)[3])data->timat, normal);
normalize_v3(normal);
- struct SnapObjectHitDepth *hit_item = hit_depth_create(
+ SnapObjectHitDepth *hit_item = hit_depth_create(
depth, location, normal, hit->index, data->ob_eval, data->obmat, data->ob_uuid);
BLI_addtail(data->hit_list, hit_item);
}
@@ -642,7 +642,7 @@ static void editmesh_looptri_raycast_backface_culling_cb(void *userdata,
}
static bool raycastMesh(SnapObjectContext *sctx,
- const struct SnapObjectParams *params,
+ const SnapObjectParams *params,
const float ray_start[3],
const float ray_dir[3],
Object *ob_eval,
@@ -717,7 +717,7 @@ static bool raycastMesh(SnapObjectContext *sctx,
BLI_assert(treedata->raycast_callback != nullptr);
if (r_hit_list) {
- struct RayCastAll_Data data;
+ RayCastAll_Data data;
data.bvhdata = treedata;
data.raycast_callback = treedata->raycast_callback;
@@ -782,7 +782,7 @@ static bool raycastMesh(SnapObjectContext *sctx,
}
static bool raycastEditMesh(SnapObjectContext *sctx,
- const struct SnapObjectParams *params,
+ const SnapObjectParams *params,
const float ray_start[3],
const float ray_dir[3],
Object *ob_eval,
@@ -883,7 +883,7 @@ static bool raycastEditMesh(SnapObjectContext *sctx,
transpose_m3_m4(timat, imat);
if (r_hit_list) {
- struct RayCastAll_Data data;
+ RayCastAll_Data data;
data.bvhdata = treedata;
data.raycast_callback = treedata->raycast_callback;
@@ -970,7 +970,7 @@ struct RaycastObjUserData {
* \note Duplicate args here are documented at #snapObjectsRay
*/
static void raycast_obj_fn(SnapObjectContext *sctx,
- const struct SnapObjectParams *params,
+ const SnapObjectParams *params,
Object *ob_eval,
const float obmat[4][4],
bool is_object_active,
@@ -1094,7 +1094,7 @@ static void raycast_obj_fn(SnapObjectContext *sctx,
* \param r_hit_list: List of #SnapObjectHitDepth (caller must free).
*/
static bool raycastObjects(SnapObjectContext *sctx,
- const struct SnapObjectParams *params,
+ const SnapObjectParams *params,
const float ray_start[3],
const float ray_dir[3],
/* read/write args */
@@ -1154,7 +1154,7 @@ static bool snap_bound_box_check_dist(const float min[3],
/* In vertex and edges you need to get the pixel distance from ray to BoundBox,
* see: T46099, T46816 */
- struct DistProjectedAABBPrecalc data_precalc;
+ DistProjectedAABBPrecalc data_precalc;
dist_squared_to_projected_aabb_precalc(&data_precalc, lpmat, win_size, mval);
bool dummy[3];
@@ -1175,20 +1175,20 @@ static bool snap_bound_box_check_dist(const float min[3],
struct Nearest2dUserData;
using Nearest2DGetVertCoCallback = void (*)(const int index,
- const struct Nearest2dUserData *data,
+ const Nearest2dUserData *data,
const float **r_co);
using Nearest2DGetEdgeVertsCallback = void (*)(const int index,
- const struct Nearest2dUserData *data,
+ const Nearest2dUserData *data,
int r_v_index[2]);
using Nearest2DGetTriVertsCallback = void (*)(const int index,
- const struct Nearest2dUserData *data,
+ const Nearest2dUserData *data,
int r_v_index[3]);
/* Equal the previous one */
using Nearest2DGetTriEdgesCallback = void (*)(const int index,
- const struct Nearest2dUserData *data,
+ const Nearest2dUserData *data,
int r_e_index[3]);
using Nearest2DCopyVertNoCallback = void (*)(const int index,
- const struct Nearest2dUserData *data,
+ const Nearest2dUserData *data,
float r_no[3]);
struct Nearest2dUserData {
@@ -1200,14 +1200,14 @@ struct Nearest2dUserData {
union {
struct {
- struct BMesh *bm;
+ BMesh *bm;
};
struct {
- const struct MVert *vert;
+ const MVert *vert;
const float (*vert_normals)[3];
- const struct MEdge *edge; /* only used for #BVHTreeFromMeshEdges */
- const struct MLoop *loop;
- const struct MLoopTri *looptri;
+ const MEdge *edge; /* only used for #BVHTreeFromMeshEdges */
+ const MLoop *loop;
+ const MLoopTri *looptri;
};
};
@@ -1282,7 +1282,7 @@ static void cb_mlooptri_verts_get(const int index, const Nearest2dUserData *data
r_v_index[2] = loop[looptri->tri[2]].v;
}
-static bool test_projected_vert_dist(const struct DistProjectedAABBPrecalc *precalc,
+static bool test_projected_vert_dist(const DistProjectedAABBPrecalc *precalc,
const float (*clip_plane)[4],
const int clip_plane_len,
const bool is_persp,
@@ -1313,7 +1313,7 @@ static bool test_projected_vert_dist(const struct DistProj
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list