[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42775] branches/bmesh/blender: svn merge ^/trunk/blender -r42759:42761
Campbell Barton
ideasman42 at gmail.com
Tue Dec 20 22:29:05 CET 2011
Revision: 42775
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42775
Author: campbellbarton
Date: 2011-12-20 21:28:57 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42759:42761
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42759
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenlib/BLI_dynstr.h
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
branches/bmesh/blender/source/blender/editors/mesh/editface.c
branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_uvproject.c
Property Changed:
----------------
branches/bmesh/blender/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42759
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42761
Modified: branches/bmesh/blender/source/blender/blenlib/BLI_dynstr.h
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/BLI_dynstr.h 2011-12-20 21:12:23 UTC (rev 42774)
+++ branches/bmesh/blender/source/blender/blenlib/BLI_dynstr.h 2011-12-20 21:28:57 UTC (rev 42775)
@@ -103,7 +103,7 @@
/**
* Get a DynStr's contents as a c-string.
* <i> The str argument must be allocated to be at
- * least the size of BLI_dynstr_get_len(ds). </i>
+ * least the size of BLI_dynstr_get_len(ds) + 1. </i>
*
* @param ds The DynStr of interest.
* @param str The string to fill.
Modified: branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/include/ED_mesh.h 2011-12-20 21:12:23 UTC (rev 42774)
+++ branches/bmesh/blender/source/blender/editors/include/ED_mesh.h 2011-12-20 21:28:57 UTC (rev 42775)
@@ -303,6 +303,19 @@
#include "../mesh/editbmesh_bvh.h"
+
+/* mirrtopo */
+typedef struct MirrTopoStore_t {
+ intptr_t *index_lookup;
+ int prev_vert_tot;
+ int prev_edge_tot;
+ int prev_ob_mode;
+} MirrTopoStore_t;
+
+int ED_mesh_mirrtopo_recalc_check(struct Mesh *me, const int ob_mode, MirrTopoStore_t *mesh_topo_store);
+void ED_mesh_mirrtopo_init(struct Mesh *me, const int ob_mode, MirrTopoStore_t *mesh_topo_store);
+void ED_mesh_mirrtopo_free(MirrTopoStore_t *mesh_topo_store);
+
#ifdef __cplusplus
}
#endif
Modified: branches/bmesh/blender/source/blender/editors/mesh/editface.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/editface.c 2011-12-20 21:12:23 UTC (rev 42774)
+++ branches/bmesh/blender/source/blender/editors/mesh/editface.c 2011-12-20 21:28:57 UTC (rev 42775)
@@ -766,3 +766,208 @@
paintvert_flush_flags(ob);
}
}
+
+
+/* ********************* MESH VERTEX MIRR TOPO LOOKUP *************** */
+/* note, this is not the best place for the function to be but moved
+ * here to for the purpose of syncing with bmesh */
+
+typedef int MirrTopoHash_t;
+
+typedef struct MirrTopoPair_t {
+ MirrTopoHash_t hash;
+ int v_index;
+} MirrTopoPair_t;
+
+static int MirrTopo_long_sort(const void *l1, const void *l2)
+{
+ if ((MirrTopoHash_t)(intptr_t)l1 > (MirrTopoHash_t)(intptr_t)l2 ) return 1;
+ else if ((MirrTopoHash_t)(intptr_t)l1 < (MirrTopoHash_t)(intptr_t)l2 ) return -1;
+ return 0;
+}
+
+static int MirrTopo_item_sort(const void *v1, const void *v2)
+{
+ if (((MirrTopoPair_t *)v1)->hash > ((MirrTopoPair_t *)v2)->hash ) return 1;
+ else if (((MirrTopoPair_t *)v1)->hash < ((MirrTopoPair_t *)v2)->hash ) return -1;
+ return 0;
+}
+
+int ED_mesh_mirrtopo_recalc_check(Mesh *me, const int ob_mode, MirrTopoStore_t *mesh_topo_store)
+{
+ int totvert;
+ int totedge;
+
+ if (me->edit_btmesh) {
+ totvert= me->edit_btmesh->bm->totvert;
+ totedge= me->edit_btmesh->bm->totedge;
+ }
+ else {
+ totvert= me->totvert;
+ totedge= me->totedge;
+ }
+
+ if( (mesh_topo_store->index_lookup==NULL) ||
+ (mesh_topo_store->prev_ob_mode != ob_mode) ||
+ (totvert != mesh_topo_store->prev_vert_tot) ||
+ (totedge != mesh_topo_store->prev_edge_tot))
+ {
+ return TRUE;
+ }
+ else {
+ return FALSE;
+ }
+
+}
+
+void ED_mesh_mirrtopo_init(Mesh *me, const int ob_mode, MirrTopoStore_t *mesh_topo_store)
+{
+ MEdge *medge;
+ BMEditMesh *em= me->edit_btmesh;
+ BMEdge *eed;
+ BMIter iter;
+ int a, last;
+ int totvert, totedge;
+ int totUnique= -1, totUniqueOld= -1;
+
+ MirrTopoHash_t *MirrTopoHash = NULL;
+ MirrTopoHash_t *MirrTopoHash_Prev = NULL;
+ MirrTopoPair_t *MirrTopoPairs;
+
+ /* reallocate if needed */
+ ED_mesh_mirrtopo_free(mesh_topo_store);
+
+ mesh_topo_store->prev_ob_mode= ob_mode;
+
+ if(em) {
+ BM_ElemIndex_Ensure(em->bm, BM_VERT);
+
+ totvert= em->bm->totvert;
+ }
+ else {
+ totvert = me->totvert;
+ }
+
+ MirrTopoHash = MEM_callocN( totvert * sizeof(MirrTopoHash_t), "TopoMirr" );
+
+ /* Initialize the vert-edge-user counts used to detect unique topology */
+ if(em) {
+ totedge= me->edit_btmesh->bm->totedge;
+ BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+ MirrTopoHash[BM_GetIndex(eed->v1)]++;
+ MirrTopoHash[BM_GetIndex(eed->v2)]++;
+ }
+ } else {
+ totedge= me->totedge;
+
+ for(a=0, medge=me->medge; a < me->totedge; a++, medge++) {
+ MirrTopoHash[medge->v1]++;
+ MirrTopoHash[medge->v2]++;
+ }
+ }
+
+ MirrTopoHash_Prev = MEM_dupallocN( MirrTopoHash );
+
+ totUniqueOld = -1;
+ while(1) {
+ /* use the number of edges per vert to give verts unique topology IDs */
+
+ if(em) {
+ BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+ MirrTopoHash[BM_GetIndex(eed->v1)] += MirrTopoHash_Prev[BM_GetIndex(eed->v2)];
+ MirrTopoHash[BM_GetIndex(eed->v2)] += MirrTopoHash_Prev[BM_GetIndex(eed->v1)];
+ }
+ } else {
+ for(a=0, medge=me->medge; a<me->totedge; a++, medge++) {
+ /* This can make really big numbers, wrapping around here is fine */
+ MirrTopoHash[medge->v1] += MirrTopoHash_Prev[medge->v2];
+ MirrTopoHash[medge->v2] += MirrTopoHash_Prev[medge->v1];
+ }
+ }
+ memcpy(MirrTopoHash_Prev, MirrTopoHash, sizeof(MirrTopoHash_t) * totvert);
+
+ /* sort so we can count unique values */
+ qsort(MirrTopoHash_Prev, totvert, sizeof(MirrTopoHash_t), MirrTopo_long_sort);
+
+ totUnique = 1; /* account for skiping the first value */
+ for(a=1; a<totvert; a++) {
+ if (MirrTopoHash_Prev[a-1] != MirrTopoHash_Prev[a]) {
+ totUnique++;
+ }
+ }
+
+ if (totUnique <= totUniqueOld) {
+ /* Finish searching for unique valus when 1 loop dosnt give a
+ * higher number of unique values compared to the previous loop */
+ break;
+ } else {
+ totUniqueOld = totUnique;
+ }
+ /* Copy the hash calculated this iter, so we can use them next time */
+ memcpy(MirrTopoHash_Prev, MirrTopoHash, sizeof(MirrTopoHash_t) * totvert);
+ }
+
+ /* Hash/Index pairs are needed for sorting to find index pairs */
+ MirrTopoPairs= MEM_callocN( sizeof(MirrTopoPair_t) * totvert, "MirrTopoPairs");
+
+ /* since we are looping through verts, initialize these values here too */
+ mesh_topo_store->index_lookup = MEM_mallocN( totvert * sizeof(long), "mesh_topo_lookup" );
+
+ if(em) {
+ EDBM_init_index_arrays(em,1,0,0);
+ }
+
+
+ for(a=0; a<totvert; a++) {
+ MirrTopoPairs[a].hash= MirrTopoHash[a];
+ MirrTopoPairs[a].v_index = a;
+
+ /* initialize lookup */
+ mesh_topo_store->index_lookup[a] = -1;
+ }
+
+ qsort(MirrTopoPairs, totvert, sizeof(MirrTopoPair_t), MirrTopo_item_sort);
+
+ /* Since the loop starts at 2, we must define the last index where the hash's differ */
+ last = ((totvert >= 2) && (MirrTopoPairs[0].hash == MirrTopoPairs[1].hash)) ? 0 : 1;
+
+ /* Get the pairs out of the sorted hashes, note, totvert+1 means we can use the previous 2,
+ * but you cant ever access the last 'a' index of MirrTopoPairs */
+ for(a=2; a <= totvert; a++) {
+ /* printf("I %d %ld %d\n", (a-last), MirrTopoPairs[a ].hash, MirrTopoPairs[a ].v_index ); */
+ if ((a==totvert) || (MirrTopoPairs[a-1].hash != MirrTopoPairs[a].hash)) {
+ if (a-last==2) {
+ if(em) {
+ mesh_topo_store->index_lookup[MirrTopoPairs[a-1].v_index] = (intptr_t)EDBM_get_vert_for_index(em, MirrTopoPairs[a-2].v_index);
+ mesh_topo_store->index_lookup[MirrTopoPairs[a-2].v_index] = (intptr_t)EDBM_get_vert_for_index(em, MirrTopoPairs[a-1].v_index);
+ } else {
+ mesh_topo_store->index_lookup[MirrTopoPairs[a-1].v_index] = MirrTopoPairs[a-2].v_index;
+ mesh_topo_store->index_lookup[MirrTopoPairs[a-2].v_index] = MirrTopoPairs[a-1].v_index;
+ }
+ }
+ last= a;
+ }
+ }
+ if(em) {
+ EDBM_free_index_arrays(em);
+ }
+
+ MEM_freeN( MirrTopoPairs );
+ MirrTopoPairs = NULL;
+
+ MEM_freeN( MirrTopoHash );
+ MEM_freeN( MirrTopoHash_Prev );
+
+ mesh_topo_store->prev_vert_tot = totvert;
+ mesh_topo_store->prev_edge_tot = totedge;
+}
+
+void ED_mesh_mirrtopo_free(MirrTopoStore_t *mesh_topo_store)
+{
+ if (mesh_topo_store->index_lookup) {
+ MEM_freeN(mesh_topo_store->index_lookup);
+ }
+ mesh_topo_store->index_lookup = NULL;
+ mesh_topo_store->prev_vert_tot = -1;
+ mesh_topo_store->prev_edge_tot = -1;
+}
Modified: branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/meshtools.c 2011-12-20 21:12:23 UTC (rev 42774)
+++ branches/bmesh/blender/source/blender/editors/mesh/meshtools.c 2011-12-20 21:28:57 UTC (rev 42775)
@@ -816,7 +816,7 @@
if(mode=='u') { /* use table */
if(MeshOctree.table==NULL)
mesh_octree_table(ob, em, NULL, 's');
-
+
if(MeshOctree.table) {
Mesh *me= ob->data;
bt= MeshOctree.table + mesh_octree_get_base_offs(co, MeshOctree.offs, MeshOctree.div);
@@ -901,203 +901,24 @@
return 0;
}
+MirrTopoStore_t mesh_topo_store= {NULL, -1. -1, -1};
-/* ********************* MESH VERTEX MIRR TOPO LOOKUP *************** */
-
-typedef int MirrTopoHash_t;
-
-typedef struct MirrTopoPair_t {
- MirrTopoHash_t hash;
- int vIndex;
-} MirrTopoPair_t;
-
-static int MirrTopo_long_sort(const void *l1, const void *l2)
-{
- if ((MirrTopoHash_t)(intptr_t)l1 > (MirrTopoHash_t)(intptr_t)l2 ) return 1;
- else if ((MirrTopoHash_t)(intptr_t)l1 < (MirrTopoHash_t)(intptr_t)l2 ) return -1;
- return 0;
-}
-
-static int MirrTopo_item_sort(const void *v1, const void *v2)
-{
- if (((MirrTopoPair_t *)v1)->hash > ((MirrTopoPair_t *)v2)->hash ) return 1;
- else if (((MirrTopoPair_t *)v1)->hash < ((MirrTopoPair_t *)v2)->hash ) return -1;
- return 0;
-}
-
-static intptr_t *mesh_topo_lookup = NULL;
-static int mesh_topo_lookup_vert_tot = -1;
-static int mesh_topo_lookup_edge_tot = -1;
-static int mesh_topo_lookup_mode = -1;
-
/* mode is 's' start, or 'e' end, or 'u' use */
/* if end, ob can be NULL */
/* note, is supposed return -1 on error, which callers are currently checking for, but is not used so far */
int mesh_mirrtopo_table(Object *ob, char mode)
{
if(mode=='u') { /* use table */
- Mesh *me= ob->data;
- if( (mesh_topo_lookup==NULL) ||
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list