[Bf-blender-cvs] [b8fd6f94a06] blender2.8: Cleanup: replace num/ct/tot with 'len'
Campbell Barton
noreply at git.blender.org
Tue Apr 18 16:15:14 CEST 2017
Commit: b8fd6f94a06c65f6bfe90d9cc45ae1406cd0dc27
Author: Campbell Barton
Date: Wed Apr 19 00:10:32 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBb8fd6f94a06c65f6bfe90d9cc45ae1406cd0dc27
Cleanup: replace num/ct/tot with 'len'
===================================================================
M source/blender/blenkernel/intern/mesh_render.c
===================================================================
diff --git a/source/blender/blenkernel/intern/mesh_render.c b/source/blender/blenkernel/intern/mesh_render.c
index c442cf0bc73..7dd8c00f181 100644
--- a/source/blender/blenkernel/intern/mesh_render.c
+++ b/source/blender/blenkernel/intern/mesh_render.c
@@ -50,27 +50,27 @@
/* ---------------------------------------------------------------------- */
/* Mesh/BMesh Interface, direct access to basic data. */
-static int mesh_render_verts_num_get(Mesh *me)
+static int mesh_render_verts_len_get(Mesh *me)
{
return me->edit_btmesh ? me->edit_btmesh->bm->totvert : me->totvert;
}
-static int mesh_render_edges_num_get(Mesh *me)
+static int mesh_render_edges_len_get(Mesh *me)
{
return me->edit_btmesh ? me->edit_btmesh->bm->totedge : me->totedge;
}
-static int mesh_render_looptri_num_get(Mesh *me)
+static int mesh_render_looptri_len_get(Mesh *me)
{
return me->edit_btmesh ? me->edit_btmesh->tottri : poly_to_tri_count(me->totpoly, me->totloop);
}
-static int mesh_render_polys_num_get(Mesh *me)
+static int mesh_render_polys_len_get(Mesh *me)
{
return me->edit_btmesh ? me->edit_btmesh->bm->totface : me->totpoly;
}
-static int UNUSED_FUNCTION(mesh_render_loops_num_get)(Mesh *me)
+static int UNUSED_FUNCTION(mesh_render_loops_len_get)(Mesh *me)
{
return me->edit_btmesh ? me->edit_btmesh->bm->totloop : me->totloop;
}
@@ -93,13 +93,13 @@ typedef struct EdgeDrawAttr {
typedef struct MeshRenderData {
int types;
- int totvert;
- int totedge;
- int tottri;
- int totloop;
- int totpoly;
- int totlvert;
- int totledge;
+ int vert_len;
+ int edge_len;
+ int tri_len;
+ int loop_len;
+ int poly_len;
+ int loose_vert_len;
+ int loose_edge_len;
BMEditMesh *edit_bmesh;
MVert *mvert;
@@ -177,23 +177,23 @@ static MeshRenderData *mesh_render_data_create(Mesh *me, const int types)
int bm_ensure_types = 0;
if (types & (MR_DATATYPE_VERT)) {
- mrdata->totvert = bm->totvert;
+ mrdata->vert_len = bm->totvert;
bm_ensure_types |= BM_VERT;
}
if (types & (MR_DATATYPE_EDGE)) {
- mrdata->totedge = bm->totedge;
+ mrdata->edge_len = bm->totedge;
bm_ensure_types |= BM_EDGE;
}
if (types & MR_DATATYPE_LOOPTRI) {
BKE_editmesh_tessface_calc(embm);
- mrdata->tottri = embm->tottri;
+ mrdata->tri_len = embm->tottri;
}
if (types & MR_DATATYPE_LOOP) {
- mrdata->totloop = bm->totloop;
+ mrdata->loop_len = bm->totloop;
bm_ensure_types |= BM_LOOP;
}
if (types & MR_DATATYPE_POLY) {
- mrdata->totpoly = bm->totface;
+ mrdata->poly_len = bm->totface;
bm_ensure_types |= BM_FACE;
}
if (types & MR_DATATYPE_OVERLAY) {
@@ -206,10 +206,10 @@ static MeshRenderData *mesh_render_data_create(Mesh *me, const int types)
BM_mesh_elem_index_ensure(bm, bm_ensure_types);
BM_mesh_elem_table_ensure(bm, bm_ensure_types & ~BM_LOOP);
if (types & MR_DATATYPE_OVERLAY) {
- mrdata->totlvert = mrdata->totledge = 0;
+ mrdata->loose_vert_len = mrdata->loose_edge_len = 0;
- int *lverts = mrdata->loose_verts = MEM_mallocN(mrdata->totvert * sizeof(int), "Loose Vert");
- int *ledges = mrdata->loose_edges = MEM_mallocN(mrdata->totedge * sizeof(int), "Loose Edges");
+ int *lverts = mrdata->loose_verts = MEM_mallocN(mrdata->vert_len * sizeof(int), "Loose Vert");
+ int *ledges = mrdata->loose_edges = MEM_mallocN(mrdata->edge_len * sizeof(int), "Loose Edges");
{
BLI_assert((bm->elem_table_dirty & BM_VERT) == 0);
@@ -219,7 +219,7 @@ static MeshRenderData *mesh_render_data_create(Mesh *me, const int types)
if (!BM_elem_flag_test(v, BM_ELEM_HIDDEN)) {
/* Loose vert */
if (v->e == NULL || !bm_vert_has_visible_edge(v)) {
- lverts[mrdata->totlvert++] = i;
+ lverts[mrdata->loose_vert_len++] = i;
}
}
}
@@ -233,36 +233,36 @@ static MeshRenderData *mesh_render_data_create(Mesh *me, const int types)
if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN)) {
/* Loose edge */
if (e->l == NULL || !bm_edge_has_visible_face(e)) {
- ledges[mrdata->totledge++] = i;
+ ledges[mrdata->loose_edge_len++] = i;
}
}
}
}
- mrdata->loose_verts = MEM_reallocN(mrdata->loose_verts, mrdata->totlvert * sizeof(int));
- mrdata->loose_edges = MEM_reallocN(mrdata->loose_edges, mrdata->totledge * sizeof(int));
+ mrdata->loose_verts = MEM_reallocN(mrdata->loose_verts, mrdata->loose_vert_len * sizeof(int));
+ mrdata->loose_edges = MEM_reallocN(mrdata->loose_edges, mrdata->loose_edge_len * sizeof(int));
}
}
else {
if (types & (MR_DATATYPE_VERT)) {
- mrdata->totvert = me->totvert;
+ mrdata->vert_len = me->totvert;
mrdata->mvert = CustomData_get_layer(&me->vdata, CD_MVERT);
}
if (types & (MR_DATATYPE_EDGE)) {
- mrdata->totedge = me->totedge;
+ mrdata->edge_len = me->totedge;
mrdata->medge = CustomData_get_layer(&me->edata, CD_MEDGE);
}
if (types & MR_DATATYPE_LOOPTRI) {
- const int tottri = mrdata->tottri = poly_to_tri_count(me->totpoly, me->totloop);
- mrdata->mlooptri = MEM_mallocN(sizeof(*mrdata->mlooptri) * tottri, __func__);
+ const int tri_len = mrdata->tri_len = poly_to_tri_count(me->totpoly, me->totloop);
+ mrdata->mlooptri = MEM_mallocN(sizeof(*mrdata->mlooptri) * tri_len, __func__);
BKE_mesh_recalc_looptri(me->mloop, me->mpoly, me->mvert, me->totloop, me->totpoly, mrdata->mlooptri);
}
if (types & MR_DATATYPE_LOOP) {
- mrdata->totloop = me->totloop;
+ mrdata->loop_len = me->totloop;
mrdata->mloop = CustomData_get_layer(&me->ldata, CD_MLOOP);
}
if (types & MR_DATATYPE_POLY) {
- mrdata->totpoly = me->totpoly;
+ mrdata->poly_len = me->totpoly;
mrdata->mpoly = CustomData_get_layer(&me->pdata, CD_MPOLY);
}
}
@@ -296,46 +296,46 @@ static void mesh_render_data_free(MeshRenderData *mrdata)
MEM_freeN(mrdata);
}
-static int mesh_render_data_verts_num_get(const MeshRenderData *mrdata)
+static int mesh_render_data_verts_len_get(const MeshRenderData *mrdata)
{
BLI_assert(mrdata->types & MR_DATATYPE_VERT);
- return mrdata->totvert;
+ return mrdata->vert_len;
}
-static int mesh_render_data_loose_verts_num_get(const MeshRenderData *mrdata)
+static int mesh_render_data_loose_verts_len_get(const MeshRenderData *mrdata)
{
BLI_assert(mrdata->types & MR_DATATYPE_OVERLAY);
- return mrdata->totlvert;
+ return mrdata->loose_vert_len;
}
-static int mesh_render_data_edges_num_get(const MeshRenderData *mrdata)
+static int mesh_render_data_edges_len_get(const MeshRenderData *mrdata)
{
BLI_assert(mrdata->types & MR_DATATYPE_EDGE);
- return mrdata->totedge;
+ return mrdata->edge_len;
}
-static int mesh_render_data_loose_edges_num_get(const MeshRenderData *mrdata)
+static int mesh_render_data_loose_edges_len_get(const MeshRenderData *mrdata)
{
BLI_assert(mrdata->types & MR_DATATYPE_OVERLAY);
- return mrdata->totledge;
+ return mrdata->loose_edge_len;
}
-static int mesh_render_data_looptri_num_get(const MeshRenderData *mrdata)
+static int mesh_render_data_looptri_len_get(const MeshRenderData *mrdata)
{
BLI_assert(mrdata->types & MR_DATATYPE_LOOPTRI);
- return mrdata->tottri;
+ return mrdata->tri_len;
}
-static int UNUSED_FUNCTION(mesh_render_data_loops_num_get)(const MeshRenderData *mrdata)
+static int UNUSED_FUNCTION(mesh_render_data_loops_len_get)(const MeshRenderData *mrdata)
{
BLI_assert(mrdata->types & MR_DATATYPE_LOOP);
- return mrdata->totloop;
+ return mrdata->loop_len;
}
-static int mesh_render_data_polys_num_get(const MeshRenderData *mrdata)
+static int mesh_render_data_polys_len_get(const MeshRenderData *mrdata)
{
BLI_assert(mrdata->types & MR_DATATYPE_POLY);
- return mrdata->totpoly;
+ return mrdata->poly_len;
}
static float *mesh_render_data_vert_co(const MeshRenderData *mrdata, const int vert_idx)
@@ -451,15 +451,15 @@ static bool mesh_render_data_edge_vcos_manifold_pnors(
if (!eap) {
const MLoop *mloop = mrdata->mloop;
const MPoly *mpoly = mrdata->mpoly;
- const int poly_ct = mrdata->totpoly;
+ const int poly_len = mrdata->poly_len;
const bool do_pnors = (pnors == NULL);
- eap = mrdata->edges_adjacent_polys = MEM_callocN(sizeof(*eap) * mrdata->totedge, __func__);
+ eap = mrdata->edges_adjacent_polys = MEM_callocN(sizeof(*eap) * mrdata->edge_len, __func__);
if (do_pnors) {
- pnors = mrdata->poly_normals = MEM_mallocN(sizeof(*pnors) * poly_ct, __func__);
+ pnors = mrdata->poly_normals = MEM_mallocN(sizeof(*pnors) * poly_len, __func__);
}
- for (int i = 0; i < poly_ct; i++, mpoly++) {
+ for (int i = 0; i < poly_len; i++, mpoly++) {
if (do_pnors) {
BKE_mesh_calc_poly_normal(mpoly, mloop + mpoly->loopstart, mvert, pnors[i]);
}
@@ -603,7 +603,7 @@ static bool mesh_render_data_looptri_cos_nors_smooth_get(
BMFace *face;
int i;
- pnors_short = mrdata->poly_normals_short = MEM_mallocN(sizeof(*pnors_short) * mrdata->totpoly, __func__);
+ pnors_short = mrdata->poly_normals_short = MEM_mallocN(sizeof(*pnors_short) * mrdata->poly_len, __func__);
BM_ITER_MESH_INDEX(face, &fiter, bm, BM_FACES_OF_MESH, i) {
normal_float_to_short_v3(pnors_short[i], face->no);
}
@@ -614,7 +614,7 @@ static bool mesh_render_data_looptri_cos_nors_smooth_get(
BMVert *vert;
int i;
- vnors_short = mrdata->vert_normals_short = MEM_mallocN(sizeof(*vnors_short) * mrdata->totvert, __func__);
+ vnors_short = mrdata->vert_normals_short = MEM_mallocN(sizeof(*vnors_short) * mrdata->vert_len, __func__);
BM_ITER_MESH_INDEX(vert, &viter, bm, BM_VERT, i) {
normal_float_to_short_v3(vnors_short[i], vert->no);
}
@@ -638,14 +638,14 @@ static bool mesh_render_data_looptri_cos_nors_smooth_get(
float (*pnors)[3] = mrdata->poly_normals;
if (!pnors) {
- pnors = mrdata->poly_normals = MEM_mallocN(sizeof(*pnors) * mrdata->totpoly, __func__);
+ pnors = mrdata->poly_normals = MEM_mallocN(sizeof(*pnors) * mrdata->poly_len, __func__);
BKE_mesh_calc_normals_poly(
- mrdata->mvert, NULL, mrdata->totvert,
- mrdata->mloop, mrdata->mpoly, mrdata->totloop, mrdata->totpoly, pnors, true);
+ mrdata->mvert, NULL, mrdata->vert_len,
+ mrdata->mloop, mrdata->mpoly, mrdata->loop_len, mrdata->poly_len, pnors, t
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list