[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36648] branches/bmesh/blender/source/ blender/bmesh: demoved some extraneous members from BMHeader
Joseph Eagar
joeedh at gmail.com
Thu May 12 20:17:23 CEST 2011
Revision: 36648
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36648
Author: joeedh
Date: 2011-05-12 18:17:23 +0000 (Thu, 12 May 2011)
Log Message:
-----------
demoved some extraneous members from BMHeader
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_class.h 2011-05-12 18:04:24 UTC (rev 36647)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_class.h 2011-05-12 18:17:23 UTC (rev 36648)
@@ -61,11 +61,9 @@
typedef struct BMHeader {
void *data; /*customdata layers*/
struct BMFlagLayer *flags;
- int eid; /*element id*/
short type; /*element geometric type (verts/edges/loops/faces)*/
short flag; /*this would be a CD layer, see below*/
- short eflag1, eflag2;
- int sysflag, index; /*note: do *not* touch sysflag! and use BMINDEX_GET/SET macros for index*/
+ int index; /*note: use BMINDEX_GET/SET macros for index*/
} BMHeader;
/*note: need some way to specify custom locations for custom data layers. so we can
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2011-05-12 18:04:24 UTC (rev 36647)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2011-05-12 18:17:23 UTC (rev 36648)
@@ -93,7 +93,7 @@
totsel = 0;
l=(BMLoop*) bm_firstfaceloop(f);
do{
- if(bmesh_test_sysflag(&(l->e->head), BM_SELECT))
+ if(BM_TestHFlag(&(l->e->head), BM_SELECT))
totsel++;
l = ((BMLoop*)(l->next));
}while(l!=bm_firstfaceloop(f));
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c 2011-05-12 18:04:24 UTC (rev 36647)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c 2011-05-12 18:17:23 UTC (rev 36648)
@@ -63,45 +63,6 @@
}
/*
- * BMESH SET SYSFLAG
- *
- * Sets a bitflag for a given element.
- *
-*/
-
-void bmesh_set_sysflag(BMHeader *head, int flag)
-{
- head->flag |= flag;
-}
-
-/*
- * BMESH CLEAR SYSFLAG
- *
- * Clears a bitflag for a given element.
- *
-*/
-
-void bmesh_clear_sysflag(BMHeader *head, int flag)
-{
- head->flag &= ~flag;
-}
-
-
-/*
- * BMESH TEST SYSFLAG
- *
- * Tests whether a bitflag is set for a given element.
- *
-*/
-
-int bmesh_test_sysflag(BMHeader *head, int flag)
-{
- if(head->flag & flag)
- return 1;
- return 0;
-}
-
-/*
* BMESH MAKE MESH
*
* Allocates a new BMesh structure.
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2011-05-12 18:04:24 UTC (rev 36647)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2011-05-12 18:17:23 UTC (rev 36648)
@@ -535,8 +535,6 @@
len = bmesh_loop_length(l);
for(i=0, curloop = l; i< len; i++, curloop= ((BMLoop*)(curloop->next)) ){
- curloop->e->head.eflag1 = 0;
- curloop->e->head.eflag2 = bmesh_radial_length(curloop);
bmesh_radial_remove_loop(curloop, curloop->e);
/*in case of border edges we HAVE to zero out curloop->radial Next/Prev*/
curloop->radial_next = curloop->radial_prev = NULL;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c 2011-05-12 18:04:24 UTC (rev 36647)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c 2011-05-12 18:17:23 UTC (rev 36648)
@@ -663,14 +663,14 @@
//for (i=0; i<nvert; i++) {
do {
- i = l->v->head.eflag2;
+ i = BMINDEX_GET(l->v);
if (i == v1i || i == v2i || i == v3i) {
l = (BMLoop*)l->next;
continue;
}
- VECCOPY(pv1, projectverts[l->v->head.eflag2]);
- VECCOPY(pv2, projectverts[((BMLoop*)l->next)->v->head.eflag2]);
+ VECCOPY(pv1, projectverts[BMINDEX_GET(l->v)]);
+ VECCOPY(pv2, projectverts[BMINDEX_GET(((BMLoop*)l->next)->v)]);
//if (linecrosses(pv1, pv2, v1, v3)) return 0;
if (point_in_triangle(v1, v2, v3, pv1)) return 0;
@@ -707,8 +707,8 @@
if (BM_Edge_Exist(v1, v3)) isear = 0;
- if (isear && !goodline(verts, f, v1->head.eflag2, v2->head.eflag2,
- v3->head.eflag2, nvert))
+ if (isear && !goodline(verts, f, BMINDEX_GET(v1), BMINDEX_GET(v2),
+ BMINDEX_GET(v3), nvert))
isear = 0;
if(isear) {
@@ -759,7 +759,7 @@
l = bm_firstfaceloop(f);
do{
VECCOPY(projectverts[i], l->v->co);
- l->v->head.eflag2 = i; /*warning, abuse! never duplicate in tools code! never you hear?*/ /*actually, get rid of this completely, use a new structure for this....*/
+ BMINDEX_SET(l->v, i);
i++;
l = (BMLoop*)(l->next);
}while(l != bm_firstfaceloop(f));
@@ -860,7 +860,7 @@
i = 0;
l = BMIter_New(&iter, bm, BM_LOOPS_OF_FACE, f);
for (; l; l=BMIter_Step(&iter)) {
- l->head.eflag2 = i;
+ BMINDEX_SET(l, i);
VECCOPY(projverts[i], l->v->co);
i++;
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h 2011-05-12 18:04:24 UTC (rev 36647)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h 2011-05-12 18:17:23 UTC (rev 36648)
@@ -63,11 +63,6 @@
void *bmesh_get_filter_callback(int type);
int bmesh_get_filter_argtype(int type);
-/*system flag access*/
-void bmesh_set_sysflag(struct BMHeader *element, int flag);
-void bmesh_clear_sysflag(struct BMHeader *element, int flag);
-int bmesh_test_sysflag(struct BMHeader *element, int flag);
-
/*NOTE: ensure different parts of the API do not conflict
on using these internal flags!*/
#define _FLAG_JF 1 /*join faces*/
More information about the Bf-blender-cvs
mailing list