[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50331] trunk/blender/source/blender: style cleanup: also add debugging print function for derived mesh DM_debug_print_cdlayers ()
Campbell Barton
ideasman42 at gmail.com
Mon Sep 3 04:41:15 CEST 2012
Revision: 50331
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50331
Author: campbellbarton
Date: 2012-09-03 02:41:12 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
style cleanup: also add debugging print function for derived mesh DM_debug_print_cdlayers()
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/editors/interface/interface_style.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/makesdna/DNA_ipo_types.h
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/nodes/shader/node_shader_tree.c
trunk/blender/source/blender/nodes/texture/node_texture_tree.c
trunk/blender/source/blender/quicktime/apple/qtkit_export.m
Modified: trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2012-09-03 02:20:26 UTC (rev 50330)
+++ trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2012-09-03 02:41:12 UTC (rev 50331)
@@ -698,6 +698,7 @@
#ifndef NDEBUG
char *DM_debug_info(DerivedMesh *dm);
void DM_debug_print(DerivedMesh *dm);
+void DM_debug_print_cdlayers(CustomData *cdata);
#endif
#endif
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-09-03 02:20:26 UTC (rev 50330)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-09-03 02:41:12 UTC (rev 50331)
@@ -3187,4 +3187,25 @@
MEM_freeN(str);
}
+void DM_debug_print_cdlayers(CustomData *data)
+{
+ int i;
+ CustomDataLayer *layer;
+
+ printf("{\n");
+
+ for (i = 0, layer = data->layers; i < data->totlayer; i++, layer++) {
+
+ const char *name = CustomData_layertype_name(layer->type);
+ const int size = CustomData_sizeof(layer->type);
+ const char *structname;
+ int structnum;
+ CustomData_file_write_info(layer->type, &structname, &structnum);
+ printf(" dict(name='%s', struct='%s', type=%d, ptr='%p', elem=%d, length=%d),\n",
+ name, structname, layer->type, (void *)layer->data, size, (int)(MEM_allocN_len(layer->data) / size));
+ }
+
+ printf("}\n");
+}
+
#endif /* NDEBUG */
Modified: trunk/blender/source/blender/editors/interface/interface_style.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_style.c 2012-09-03 02:20:26 UTC (rev 50330)
+++ trunk/blender/source/blender/editors/interface/interface_style.c 2012-09-03 02:41:12 UTC (rev 50331)
@@ -257,7 +257,7 @@
{
uiStyle *style = NULL;
/* offset is two struct uiStyle pointers */
- /* style = BLI_findstring( &U.uistyles, "Unifont Style", sizeof(style)*2 ) */;
+ /* style = BLI_findstring(&U.uistyles, "Unifont Style", sizeof(style) * 2) */;
return (style != NULL) ? style : U.uistyles.first;
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2012-09-03 02:20:26 UTC (rev 50330)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2012-09-03 02:41:12 UTC (rev 50331)
@@ -160,7 +160,7 @@
int totlinehit;
/* Data for mouse-position-derived data (cur) and previous click (prev) */
- KnifePosData cur, prev;
+ KnifePosData curr, prev;
int totkedge, totkvert;
@@ -368,22 +368,22 @@
* Copy the current position data into prev. */
static void knife_start_cut(KnifeTool_OpData *kcd)
{
- kcd->prev = kcd->cur;
- kcd->cur.is_space = 0; /*TODO: why do we do this? */
+ kcd->prev = kcd->curr;
+ kcd->curr.is_space = 0; /*TODO: why do we do this? */
if (kcd->prev.vert == NULL && kcd->prev.edge == NULL && is_zero_v3(kcd->prev.cage)) {
/* Make prevcage a point on the view ray to mouse closest to a point on model: choose vertex 0 */
float origin[3], ray[3], co[3];
BMVert *v0;
- knife_input_ray_cast(kcd, kcd->cur.mval, origin, ray);
+ knife_input_ray_cast(kcd, kcd->curr.mval, origin, ray);
add_v3_v3v3(co, origin, ray);
v0 = BM_vert_at_index(kcd->em->bm, 0);
if (v0) {
closest_to_line_v3(kcd->prev.cage, v0->co, co, origin);
copy_v3_v3(kcd->prev.co, kcd->prev.cage); /*TODO: do we need this? */
- copy_v3_v3(kcd->cur.cage, kcd->prev.cage);
- copy_v3_v3(kcd->cur.co, kcd->prev.co);
+ copy_v3_v3(kcd->curr.cage, kcd->prev.cage);
+ copy_v3_v3(kcd->curr.co, kcd->prev.co);
}
}
}
@@ -471,15 +471,15 @@
return newkfe->v2;
}
-/* Make a single KnifeEdge for cut from kcd->prev to kcd->cur.
+/* Make a single KnifeEdge for cut from kcd->prev to kcd->curr.
* and move cur data to prev. */
static void knife_add_single_cut(KnifeTool_OpData *kcd)
{
KnifeEdge *kfe = new_knife_edge(kcd), *kfe2 = NULL, *kfe3 = NULL;
- if (kcd->prev.vert && kcd->prev.vert == kcd->cur.vert)
+ if (kcd->prev.vert && kcd->prev.vert == kcd->curr.vert)
return;
- if (kcd->prev.edge && kcd->prev.edge == kcd->cur.edge)
+ if (kcd->prev.edge && kcd->prev.edge == kcd->curr.edge)
return;
kfe->draw = 1;
@@ -500,25 +500,25 @@
knife_append_list(kcd, &kfe->v1->faces, kcd->prev.bmface);
}
- if (kcd->cur.vert) {
- kfe->v2 = kcd->cur.vert;
+ if (kcd->curr.vert) {
+ kfe->v2 = kcd->curr.vert;
}
- else if (kcd->cur.edge) {
- kfe->v2 = knife_split_edge(kcd, kcd->cur.edge, kcd->cur.co, &kfe3);
- kcd->cur.vert = kfe->v2;
+ else if (kcd->curr.edge) {
+ kfe->v2 = knife_split_edge(kcd, kcd->curr.edge, kcd->curr.co, &kfe3);
+ kcd->curr.vert = kfe->v2;
}
else {
- kfe->v2 = new_knife_vert(kcd, kcd->cur.co, kcd->cur.co);
- kfe->v2->draw = !kcd->cur.is_space;
+ kfe->v2 = new_knife_vert(kcd, kcd->curr.co, kcd->curr.co);
+ kfe->v2->draw = !kcd->curr.is_space;
kfe->v2->isface = 1;
- kfe->v2->inspace = kcd->cur.is_space;
- if (kfe->v2->draw && kcd->cur.bmface)
- knife_append_list(kcd, &kfe->v2->faces, kcd->cur.bmface);
+ kfe->v2->inspace = kcd->curr.is_space;
+ if (kfe->v2->draw && kcd->curr.bmface)
+ knife_append_list(kcd, &kfe->v2->faces, kcd->curr.bmface);
- if (kcd->cur.is_space)
+ if (kcd->curr.is_space)
kfe->draw = 0;
- kcd->cur.vert = kfe->v2;
+ kcd->curr.vert = kfe->v2;
}
knife_find_basef(kfe);
@@ -529,12 +529,12 @@
knife_edge_append_face(kcd, kfe, kfe->basef);
/* sanity check to make sure we're in the right edge/face lists */
- if (kcd->cur.bmface) {
- if (!find_ref(&kfe->faces, kcd->cur.bmface)) {
- knife_edge_append_face(kcd, kfe, kcd->cur.bmface);
+ if (kcd->curr.bmface) {
+ if (!find_ref(&kfe->faces, kcd->curr.bmface)) {
+ knife_edge_append_face(kcd, kfe, kcd->curr.bmface);
}
- if (kcd->prev.bmface && kcd->prev.bmface != kcd->cur.bmface) {
+ if (kcd->prev.bmface && kcd->prev.bmface != kcd->curr.bmface) {
if (!find_ref(&kfe->faces, kcd->prev.bmface)) {
knife_edge_append_face(kcd, kfe, kcd->prev.bmface);
}
@@ -542,7 +542,7 @@
}
/* set up for next cut */
- kcd->prev = kcd->cur;
+ kcd->prev = kcd->curr;
}
static int verge_linehit(const void *vlh1, const void *vlh2)
@@ -622,25 +622,25 @@
splitkfe = MEM_callocN(kcd->totlinehit * sizeof(KnifeEdge *), "knife_cut_through");
if (kcd->prev.vert) {
- if (kcd->prev.vert == kcd->cur.vert)
+ if (kcd->prev.vert == kcd->curr.vert)
return;
firstv = kcd->prev.vert;
knife_get_vert_faces(kcd, firstv, kcd->prev.bmface, &firstfaces);
}
else if (kcd->prev.edge) {
- if (kcd->prev.edge == kcd->cur.edge)
+ if (kcd->prev.edge == kcd->curr.edge)
return;
firstv = knife_split_edge(kcd, kcd->prev.edge, kcd->prev.co, &kfe3);
knife_get_edge_faces(kcd, kcd->prev.edge, &firstfaces);
}
- if (kcd->cur.vert) {
- lastv = kcd->cur.vert;
- knife_get_vert_faces(kcd, lastv, kcd->cur.bmface, &lastfaces);
+ if (kcd->curr.vert) {
+ lastv = kcd->curr.vert;
+ knife_get_vert_faces(kcd, lastv, kcd->curr.bmface, &lastfaces);
}
- else if (kcd->cur.edge) {
- lastv = knife_split_edge(kcd, kcd->cur.edge, kcd->cur.co, &kfe3);
- knife_get_edge_faces(kcd, kcd->cur.edge, &lastfaces);
+ else if (kcd->curr.edge) {
+ lastv = knife_split_edge(kcd, kcd->curr.edge, kcd->curr.co, &kfe3);
+ knife_get_edge_faces(kcd, kcd->curr.edge, &lastfaces);
}
if (firstv) {
@@ -709,7 +709,7 @@
kcd->totlinehit = 0;
/* set up for next cut */
- kcd->prev = kcd->cur;
+ kcd->prev = kcd->curr;
}
/* User has just left-clicked after the first time.
@@ -717,7 +717,7 @@
* If that line crossed edges then kcd->linehits will be non-NULL. */
static void knife_add_cut(KnifeTool_OpData *kcd)
{
- KnifePosData savcur = kcd->cur;
+ KnifePosData savcur = kcd->curr;
if (kcd->cut_through) {
knife_cut_through(kcd);
@@ -755,7 +755,7 @@
if (len_v3v3(kcd->prev.cage, lh->realhit) < FLT_EPSILON * 80)
continue;
- if (len_v3v3(kcd->cur.cage, lh->realhit) < FLT_EPSILON * 80)
+ if (len_v3v3(kcd->curr.cage, lh->realhit) < FLT_EPSILON * 80)
continue;
if (kcd->prev.is_space) {
@@ -768,12 +768,12 @@
continue;
}
- kcd->cur.is_space = 0;
- kcd->cur.edge = lh->kfe;
- kcd->cur.bmface = lh->f;
- kcd->cur.vert = lh->v;
- copy_v3_v3(kcd->cur.co, lh->hit);
- copy_v3_v3(kcd->cur.cage, lh->cagehit);
+ kcd->curr.is_space = 0;
+ kcd->curr.edge = lh->kfe;
+ kcd->curr.bmface = lh->f;
+ kcd->curr.vert = lh->v;
+ copy_v3_v3(kcd->curr.co, lh->hit);
+ copy_v3_v3(kcd->curr.cage, lh->cagehit);
knife_add_single_cut(kcd);
}
@@ -782,7 +782,7 @@
kcd->prev = savcur;
}
else {
- kcd->cur = savcur;
+ kcd->curr = savcur;
knife_add_single_cut(kcd);
}
@@ -935,38 +935,38 @@
glBegin(GL_LINES);
glVertex3fv(kcd->prev.cage);
- glVertex3fv(kcd->cur.cage);
+ glVertex3fv(kcd->curr.cage);
glEnd();
glLineWidth(1.0);
}
- if (kcd->cur.edge) {
+ if (kcd->curr.edge) {
glColor3ubv(kcd->colors.edge);
glLineWidth(2.0);
glBegin(GL_LINES);
- glVertex3fv(kcd->cur.edge->v1->cageco);
- glVertex3fv(kcd->cur.edge->v2->cageco);
+ glVertex3fv(kcd->curr.edge->v1->cageco);
+ glVertex3fv(kcd->curr.edge->v2->cageco);
glEnd();
glLineWidth(1.0);
}
- else if (kcd->cur.vert) {
+ else if (kcd->curr.vert) {
glColor3ubv(kcd->colors.point);
glPointSize(11);
glBegin(GL_POINTS);
- glVertex3fv(kcd->cur.cage);
+ glVertex3fv(kcd->curr.cage);
glEnd();
}
- if (kcd->cur.bmface) {
+ if (kcd->curr.bmface) {
glColor3ubv(kcd->colors.curpoint);
glPointSize(9);
glBegin(GL_POINTS);
- glVertex3fv(kcd->cur.cage);
+ glVertex3fv(kcd->curr.cage);
glEnd();
}
@@ -1121,13 +1121,17 @@
interp_v3_v3v3(p, kfe->v1->cageco, kfe->v2->cageco, lambda);
- if (kcd->cur.vert && len_squared_v3v3(kcd->cur.vert->cageco, p) < depsilon_squared)
+ if (kcd->curr.vert && len_squared_v3v3(kcd->curr.vert->cageco, p) < depsilon_squared) {
continue;
- if (kcd->prev.vert && len_squared_v3v3(kcd->prev.vert->cageco, p) < depsilon_squared)
+ }
+ if (kcd->prev.vert && len_squared_v3v3(kcd->prev.vert->cageco, p) < depsilon_squared) {
continue;
+ }
if (len_squared_v3v3(kcd->prev.cage, p) < depsilon_squared ||
- len_squared_v3v3(kcd->cur.cage, p) < depsilon_squared)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list