[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45861] trunk/blender/source/blender: code cleanup: change C naming convention (so py and C api match), eg:
Campbell Barton
ideasman42 at gmail.com
Mon Apr 23 03:19:52 CEST 2012
Revision: 45861
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45861
Author: campbellbarton
Date: 2012-04-23 01:19:50 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
code cleanup: change C naming convention (so py and C api match), eg:
C: BM_face_calc_area(f), Py: BMFace.calc_area()
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.h
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.h
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.h
trunk/blender/source/blender/bmesh/intern/bmesh_private.h
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.h
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_inset.c
trunk/blender/source/blender/bmesh/operators/bmo_utils.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/editors/mesh/editmesh_rip.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-04-23 01:11:42 UTC (rev 45860)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-04-23 01:19:50 UTC (rev 45861)
@@ -579,7 +579,7 @@
}
else if (ese->htype == BM_FACE) {
BMFace *efa = (BMFace *)ese->ele;
- BM_face_center_bounds_calc(efa, r_center);
+ BM_face_calc_center_bounds(efa, r_center);
}
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-04-23 01:11:42 UTC (rev 45860)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-04-23 01:19:50 UTC (rev 45861)
@@ -585,6 +585,18 @@
}
/**
+ * Return the amount of element of type 'type' in a given bmesh.
+ */
+int BM_mesh_elem_count(BMesh *bm, const char htype)
+{
+ if (htype == BM_VERT) return bm->totvert;
+ else if (htype == BM_EDGE) return bm->totedge;
+ else if (htype == BM_FACE) return bm->totface;
+
+ return 0;
+}
+
+/**
* Remaps the vertices, edges and/or faces of the bmesh as indicated by vert/edge/face_idx arrays
* (xxx_idx[org_index] = new_index).
*
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.h 2012-04-23 01:11:42 UTC (rev 45860)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.h 2012-04-23 01:19:50 UTC (rev 45861)
@@ -43,6 +43,8 @@
void BM_mesh_elem_index_ensure(BMesh *bm, const char hflag);
void BM_mesh_elem_index_validate(BMesh *bm, const char *location, const char *func,
const char *msg_a, const char *msg_b);
+int BM_mesh_elem_count(BMesh *bm, const char htype);
+
void BM_mesh_remap(BMesh *bm, int *vert_idx, int *edge_idx, int *face_idx);
BMVert *BM_vert_at_index(BMesh *bm, const int index);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-04-23 01:11:42 UTC (rev 45860)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-04-23 01:19:50 UTC (rev 45861)
@@ -817,7 +817,7 @@
*
* \note #BM_edge_rotate_check must have already run.
*/
-void BM_edge_rotate_calc(BMEdge *e, int ccw,
+void BM_edge_calc_rotate(BMEdge *e, int ccw,
BMLoop **r_l1, BMLoop **r_l2)
{
BMVert *v1, *v2;
@@ -889,7 +889,7 @@
* 2) does the newly formed edge cause a zero area corner (or close enough to be almost zero)
*
* \param l1,l2 are the loops of the proposed verts to rotate too and should
- * be the result of calling #BM_edge_rotate_calc
+ * be the result of calling #BM_edge_calc_rotate
*/
int BM_edge_rotate_check_degenerate(BMEdge *e, BMLoop *l1, BMLoop *l2)
{
@@ -1016,7 +1016,7 @@
return NULL;
}
- BM_edge_rotate_calc(e, ccw, &l1, &l2);
+ BM_edge_calc_rotate(e, ccw, &l1, &l2);
/* the loops will be freed so assign verts */
v1 = l1->v;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.h 2012-04-23 01:11:42 UTC (rev 45860)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.h 2012-04-23 01:19:50 UTC (rev 45861)
@@ -59,7 +59,7 @@
int BM_face_validate(BMesh *bm, BMFace *face, FILE *err);
-void BM_edge_rotate_calc(BMEdge *e, int ccw,
+void BM_edge_calc_rotate(BMEdge *e, int ccw,
BMLoop **r_l1, BMLoop **r_l2);
int BM_edge_rotate_check(BMEdge *e);
int BM_edge_rotate_check_degenerate(BMEdge *e,
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-04-23 01:11:42 UTC (rev 45860)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-04-23 01:19:50 UTC (rev 45861)
@@ -75,7 +75,7 @@
* polygon See Graphics Gems for
* computing newell normal.
*/
-static void compute_poly_normal(float normal[3], float verts[][3], int nverts)
+static void calc_poly_normal(float normal[3], float verts[][3], int nverts)
{
float const *v_prev = verts[nverts - 1];
float const *v_curr = verts[0];
@@ -95,9 +95,9 @@
/**
* \brief COMPUTE POLY NORMAL (BMFace)
*
- * Same as #compute_poly_normal but operates directly on a bmesh face.
+ * Same as #calc_poly_normal but operates directly on a bmesh face.
*/
-static void bm_face_compute_poly_normal(BMFace *f)
+static void bm_face_calc_poly_normal(BMFace *f)
{
BMLoop *l_first = BM_FACE_FIRST_LOOP(f);
BMLoop *l_iter = l_first;
@@ -123,11 +123,11 @@
/**
* \brief COMPUTE POLY NORMAL (BMFace)
*
- * Same as #compute_poly_normal and #bm_face_compute_poly_normal
+ * Same as #calc_poly_normal and #bm_face_calc_poly_normal
* but takes an array of vertex locations.
*/
-static void bm_face_compute_poly_normal_vertex_cos(BMFace *f, float n[3],
- float const (*vertexCos)[3])
+static void bm_face_calc_poly_normal_vertex_cos(BMFace *f, float n[3],
+ float const (*vertexCos)[3])
{
BMLoop *l_first = BM_FACE_FIRST_LOOP(f);
BMLoop *l_iter = l_first;
@@ -153,7 +153,7 @@
/**
* get the area of the face
*/
-float BM_face_area_calc(BMFace *f)
+float BM_face_calc_area(BMFace *f)
{
BMLoop *l;
BMIter iter;
@@ -175,7 +175,7 @@
area = area_quad_v3(verts[0], verts[1], verts[2], verts[3]);
}
else {
- compute_poly_normal(normal, verts, f->len);
+ calc_poly_normal(normal, verts, f->len);
area = area_poly_v3(f->len, verts, normal);
}
@@ -187,7 +187,7 @@
/**
* compute the perimeter of an ngon
*/
-float BM_face_perimeter_calc(BMFace *f)
+float BM_face_calc_perimeter(BMFace *f)
{
BMLoop *l_iter, *l_first;
float perimeter = 0.0f;
@@ -203,7 +203,7 @@
/**
* computes center of face in 3d. uses center of bounding box.
*/
-void BM_face_center_bounds_calc(BMFace *f, float r_cent[3])
+void BM_face_calc_center_bounds(BMFace *f, float r_cent[3])
{
BMLoop *l_iter;
BMLoop *l_first;
@@ -222,7 +222,7 @@
/**
* computes the center of a face, using the mean average
*/
-void BM_face_center_mean_calc(BMFace *f, float r_cent[3])
+void BM_face_calc_center_mean(BMFace *f, float r_cent[3])
{
BMLoop *l_iter;
BMLoop *l_first;
@@ -245,7 +245,7 @@
* a plane defined by the average
* of its edges cross products
*/
-void compute_poly_plane(float (*verts)[3], const int nverts)
+void calc_poly_plane(float (*verts)[3], const int nverts)
{
float avgc[3], norm[3], mag, avgn[3];
@@ -432,7 +432,7 @@
}
default:
{
- bm_face_compute_poly_normal(f);
+ bm_face_calc_poly_normal(f);
break;
}
}
@@ -474,7 +474,7 @@
}
default:
{
- bm_face_compute_poly_normal_vertex_cos(f, no, vertexCos);
+ bm_face_calc_poly_normal_vertex_cos(f, no, vertexCos);
break;
}
}
@@ -610,9 +610,9 @@
return crosses % 2 != 0;
}
-static int goodline(float const (*projectverts)[3], BMFace *f,
- int v1i, int v2i, int v3i,
- int UNUSED(nvert))
+static int bm_face_goodline(float const (*projectverts)[3], BMFace *f,
+ int v1i, int v2i, int v3i,
+ int UNUSED(nvert))
{
BMLoop *l_iter;
BMLoop *l_first;
@@ -697,9 +697,9 @@
if (BM_edge_exists(v1, v3)) {
isear = FALSE;
}
- else if (!goodline((float const (*)[3])verts, f,
- BM_elem_index_get(v1), BM_elem_index_get(v2), BM_elem_index_get(v3),
- nvert))
+ else if (!bm_face_goodline((float const (*)[3])verts, f,
+ BM_elem_index_get(v1), BM_elem_index_get(v2), BM_elem_index_get(v3),
+ nvert))
{
isear = FALSE;
}
@@ -765,12 +765,12 @@
///bmesh_face_normal_update(bm, f, f->no, projectverts);
- compute_poly_normal(f->no, projectverts, f->len);
+ calc_poly_normal(f->no, projectverts, f->len);
poly_rotate_plane(f->no, projectverts, i);
nvert = f->len;
- //compute_poly_plane(projectverts, i);
+ //calc_poly_plane(projectverts, i);
for (i = 0; i < nvert; i++) {
projectverts[i][2] = 0.0f;
}
@@ -879,7 +879,7 @@
a++;
}
- compute_poly_normal(no, projverts, f->len);
+ calc_poly_normal(no, projverts, f->len);
poly_rotate_plane(no, projverts, f->len);
poly_rotate_plane(no, edgeverts, len * 2);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.h 2012-04-23 01:11:42 UTC (rev 45860)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.h 2012-04-23 01:19:50 UTC (rev 45861)
@@ -27,10 +27,10 @@
* \ingroup bmesh
*/
-float BM_face_area_calc(BMFace *f);
-float BM_face_perimeter_calc(BMFace *f);
-void BM_face_center_bounds_calc(BMFace *f, float center[3]);
-void BM_face_center_mean_calc(BMFace *f, float center[3]);
+float BM_face_calc_area(BMFace *f);
+float BM_face_calc_perimeter(BMFace *f);
+void BM_face_calc_center_bounds(BMFace *f, float center[3]);
+void BM_face_calc_center_mean(BMFace *f, float center[3]);
void BM_face_normal_update(BMFace *f);
void BM_face_normal_update_vcos(BMesh *bm, BMFace *f, float no[3],
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_private.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_private.h 2012-04-23 01:11:42 UTC (rev 45860)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_private.h 2012-04-23 01:19:50 UTC (rev 45861)
@@ -65,7 +65,7 @@
#define BM_ELEM_API_FLAG_DISABLE(element, f) ((element)->oflags[0].pflag &= ~(f))
#define BM_ELEM_API_FLAG_TEST(element, f) ((element)->oflags[0].pflag & (f))
-void compute_poly_plane(float (*verts)[3], const int nverts);
+void calc_poly_plane(float (*verts)[3], const int nverts);
void poly_rotate_plane(const float normal[3], float (*verts)[3], const int nverts);
/* include the rest of our private declarations */
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list