[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43932] branches/bmesh/blender/source/ blender: Ported UvElementMap code to bmesh, still untested but at least compiling.
Antony Riakiotakis
kalast at gmail.com
Mon Feb 6 20:25:24 CET 2012
Revision: 43932
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43932
Author: psy-fi
Date: 2012-02-06 19:25:12 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
Ported UvElementMap code to bmesh, still untested but at least compiling.
Next, uv sculpting will be ported.
Also fixed "initializer element is not computable at load time" compile error caused due to bit-shifting a constant past its precision length (1L should be 1LL for 32 positions left shift).
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h 2012-02-06 17:24:51 UTC (rev 43931)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h 2012-02-06 19:25:12 UTC (rev 43932)
@@ -184,19 +184,9 @@
unsigned char tfindex, separate, flag;
} UvMapVert;
-typedef struct UvElementMap {
- /* address UvElements by their vertex */
- struct UvElement **vert;
- /* UvElement Store */
- struct UvElement *buf;
- /* Total number of UVs in the layer. Useful to know */
- int totalUVs;
- /* Number of Islands in the mesh */
- int totalIslands;
- /* Stores the starting index in buf where each island begins */
- int *islandIndices;
-} UvElementMap;
-
+/* UvElement stores per uv information so that we can quickly access information for a uv.
+ * it is actually an improved UvMapVert, including an island and a direct pointer to the face
+ * to avoid initialising face arrays */
typedef struct UvElement {
/* Next UvElement corresponding to same vertex */
struct UvElement *next;
@@ -212,6 +202,24 @@
unsigned short island;
} UvElement;
+
+/* UvElementMap is a container for UvElements of a mesh. It stores some UvElements belonging to the
+ * same uv island in sequence and the number of uvs per island so it is possible to access all uvs
+ * belonging to an island directly by iterating through the buffer.
+ */
+typedef struct UvElementMap {
+ /* address UvElements by their vertex */
+ struct UvElement **vert;
+ /* UvElement Store */
+ struct UvElement *buf;
+ /* Total number of UVs in the layer. Useful to know */
+ int totalUVs;
+ /* Number of Islands in the mesh */
+ int totalIslands;
+ /* Stores the starting index in buf where each island begins */
+ int *islandIndices;
+} UvElementMap;
+
/* invalid island index is max short. If any one has the patience
* to make that many islands, he can bite me :p */
#define INVALID_ISLAND 0xFFFF
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c 2012-02-06 17:24:51 UTC (rev 43931)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c 2012-02-06 19:25:12 UTC (rev 43932)
@@ -729,8 +729,8 @@
sub_v2_v2v2(uvdiff, uv2, uv);
- if (fabs(uv[0]-uv2[0]) < limit[0] && fabs(uv[1]-uv2[1]) < limit[1]) {
- if (lastv) lastv->next= next;
+ if(fabs(uvdiff[0]) < limit[0] && fabs(uvdiff[1]) < limit[1]) {
+ if(lastv) lastv->next= next;
else vlist= next;
iterv->next= newvlist;
newvlist= iterv;
@@ -761,15 +761,133 @@
}
/* from editmesh_lib.c in trunk */
-#if 0 /* BMESH_TODO */
+
/* A specialized vert map used by stitch operator */
-UvElementMap *EDBM_make_uv_element_map(EditMesh *em, int selected, int do_islands)
+UvElementMap *EDBM_make_uv_element_map(BMEditMesh *em, int selected, int do_islands)
{
+ BMVert *ev;
+ BMFace *efa;
+ BMLoop *l;
+ BMIter iter, liter;
+ /* vars from original func */
+ UvElementMap *element_map;
+ UvElement *buf;
+ UvElement *islandbuf;
+
+ MLoopUV *luv;
+ int totverts, i, totuv, j, nislands = 0, islandbufsize = 0;
+
+ unsigned int *map;
+ BMFace **stack;
+ int stacksize = 0;
+
+ BM_ElemIndex_Ensure(em->bm, BM_VERT);
+ BM_ElemIndex_Ensure(em->bm, BM_FACE);
+
+ totverts = em->bm->totvert;
+ totuv = 0;
+
+ /* generate UvElement array */
+ BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+ if(!selected || ((!BM_TestHFlag(efa, BM_HIDDEN)) && BM_TestHFlag(efa, BM_SELECT)))
+ totuv += efa->len;
+ }
+
+ if(totuv == 0) {
+ return NULL;
+ }
+ element_map = (UvElementMap*)MEM_callocN(sizeof(*element_map), "UvElementMap");
+ if (!element_map) {
+ return NULL;
+ }
+
+ element_map->vert = (UvElement**)MEM_callocN(sizeof(*element_map->vert)*totverts, "UvElementVerts");
+ buf = element_map->buf = (UvElement*)MEM_callocN(sizeof(*element_map->buf)*totuv, "UvElement");
+
+ if (!element_map->vert || !element_map->buf) {
+ EDBM_free_uv_element_map(element_map);
+ return NULL;
+ }
+
+ BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+ if(!selected || ((!BM_TestHFlag(efa, BM_HIDDEN)) && BM_TestHFlag(efa, BM_SELECT))) {
+ i = 0;
+ BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
+ buf->tfindex = i;
+ buf->face = efa;
+ buf->separate = 0;
+ buf->island = INVALID_ISLAND;
+
+ buf->next = element_map->vert[BM_GetIndex(l->v)];
+ element_map->vert[BM_GetIndex(l->v)] = buf;
+
+ buf++;
+ i++;
+ }
+ }
+ }
+
+ /* sort individual uvs for each vert */
+ i = 0;
+ BM_ITER(ev, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+ UvElement *newvlist= NULL, *vlist=element_map->vert[i];
+ UvElement *iterv, *v, *lastv, *next;
+ float *uv, *uv2, uvdiff[2];
+
+ while(vlist) {
+ v= vlist;
+ vlist= vlist->next;
+ v->next= newvlist;
+ newvlist= v;
+
+ efa = v->face;
+ /* tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */
+
+ l = BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, efa, v->tfindex);
+ luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
+ uv = luv->uv;
+
+ lastv= NULL;
+ iterv= vlist;
+
+ while(iterv) {
+ next= iterv->next;
+ efa = iterv->face;
+ /* tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */
+
+ l = BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, efa, iterv->tfindex);
+ luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
+ uv2 = luv->uv;
+
+ sub_v2_v2v2(uvdiff, uv2, uv);
+
+ if(fabsf(uvdiff[0]) < STD_UV_CONNECT_LIMIT && fabsf(uvdiff[1]) < STD_UV_CONNECT_LIMIT) {
+ if(lastv) lastv->next= next;
+ else vlist= next;
+ iterv->next= newvlist;
+ newvlist= iterv;
+ }
+ else
+ lastv=iterv;
+
+ iterv= next;
+ }
+
+ newvlist->separate = 1;
+ }
+
+ element_map->vert[i]= newvlist;
+ i++;
+ }
+
+
+ ////////////////////
+
+ /*
EditVert *ev;
EditFace *efa;
- /* vars from original func */
UvElementMap *vmap;
UvElement *buf;
UvElement *islandbuf;
@@ -777,11 +895,9 @@
unsigned int a;
int i,j, totuv, nverts, nislands = 0, islandbufsize = 0;
unsigned int *map;
- /* for uv island creation */
EditFace **stack;
int stacksize = 0;
- /* we need the vert */
for(ev = em->verts.first, i = 0; ev; ev = ev->next, i++)
ev->tmp.l = i;
@@ -828,7 +944,6 @@
efa->tmp.l = INVALID_ISLAND;
}
- /* sort individual uvs for each vert */
for(a = 0, ev = em->verts.first; ev; a++, ev = ev->next) {
UvElement *newvlist = NULL, *vlist = vmap->vert[a];
UvElement *iterv, *v, *lastv, *next;
@@ -870,28 +985,28 @@
vmap->vert[a] = newvlist;
}
-
+*/
if (do_islands) {
/* at this point, every UvElement in vert points to a UvElement sharing the same vertex. Now we should sort uv's in islands. */
-
+ int *island_number;
/* map holds the map from current vmap->buf to the new, sorted map*/
map = MEM_mallocN(sizeof(*map)*totuv, "uvelement_remap");
- stack = MEM_mallocN(sizeof(*stack)*em->totface, "uv_island_face_stack");
+ stack = MEM_mallocN(sizeof(*stack)*em->bm->totface, "uv_island_face_stack");
islandbuf = MEM_callocN(sizeof(*islandbuf)*totuv, "uvelement_island_buffer");
+ island_number = MEM_mallocN(sizeof(*stack)*em->bm->totface, "uv_island_number_face");
for(i = 0; i < totuv; i++) {
- if (vmap->buf[i].island == INVALID_ISLAND) {
- vmap->buf[i].island = nislands;
- stack[0] = vmap->buf[i].face;
- stack[0]->tmp.l = nislands;
+ if (element_map->buf[i].island == INVALID_ISLAND) {
+ element_map->buf[i].island = nislands;
+ stack[0] = element_map->buf[i].face;
+ island_number[BM_GetIndex(stack[0])] = nislands;
stacksize=1;
while(stacksize > 0) {
efa = stack[--stacksize];
- nverts = efa->v4? 4 : 3;
- for(j = 0; j < nverts; j++) {
- UvElement *element, *initelement = vmap->vert[(*(&efa->v1 + j))->tmp.l];
+ BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
+ UvElement *element, *initelement = element_map->vert[BM_GetIndex(l->v)];
for(element = initelement; element; element = element->next) {
if (element->separate)
@@ -900,7 +1015,7 @@
if (element->face == efa) {
/* found the uv corresponding to our face and vertex. Now fill it to the buffer */
element->island = nislands;
- map[element - vmap->buf] = islandbufsize;
+ map[element - element_map->buf] = islandbufsize;
islandbuf[islandbufsize].tfindex = element->tfindex;
islandbuf[islandbufsize].face = element->face;
islandbuf[islandbufsize].separate = element->separate;
@@ -911,9 +1026,9 @@
if (element->separate && element != initelement)
break;
- if (element->face->tmp.l == INVALID_ISLAND) {
+ if (island_number[BM_GetIndex(element->face)] == INVALID_ISLAND) {
stack[stacksize++] = element->face;
- element->face->tmp.l = nislands;
+ island_number[BM_GetIndex(element->face)] = nislands;
}
}
break;
@@ -927,58 +1042,48 @@
}
/* remap */
- for(i = 0; i < em->totvert; i++) {
+ for(i = 0; i < em->bm->totvert; i++) {
/* important since we may do selection only. Some of these may be NULL */
- if (vmap->vert[i])
- vmap->vert[i] = &islandbuf[map[vmap->vert[i] - vmap->buf]];
+ if(element_map->vert[i])
+ element_map->vert[i] = &islandbuf[map[element_map->vert[i] - element_map->buf]];
}
- vmap->islandIndices = MEM_callocN(sizeof(*vmap->islandIndices)*nislands,"UvVertMap2_island_indices");
- if (!vmap->islandIndices) {
+ element_map->islandIndices = MEM_callocN(sizeof(*element_map->islandIndices)*nislands,"UvElementMap_island_indices");
+ if(!element_map->islandIndices) {
MEM_freeN(islandbuf);
MEM_freeN(stack);
MEM_freeN(map);
- EDBM_free_uv_element_map(vmap);
+ EDBM_free_uv_element_map(element_map);
+ MEM_freeN(island_number);
}
j = 0;
for(i = 0; i < totuv; i++) {
- UvElement *element = vmap->buf[i].next;
+ UvElement *element = element_map->buf[i].next;
if (element == NULL)
islandbuf[map[i]].next = NULL;
else
- islandbuf[map[i]].next = &islandbuf[map[element - vmap->buf]];
+ islandbuf[map[i]].next = &islandbuf[map[element - element_map->buf]];
if (islandbuf[i].island != j) {
j++;
- vmap->islandIndices[j] = i;
+ element_map->islandIndices[j] = i;
}
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list