[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26998] trunk/blender: topology based mirror, (from apricot branch)

Campbell Barton ideasman42 at gmail.com
Wed Feb 17 20:50:43 CET 2010


Revision: 26998
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26998
Author:   campbellbarton
Date:     2010-02-17 20:50:42 +0100 (Wed, 17 Feb 2010)

Log Message:
-----------
topology based mirror, (from apricot branch)
- correct errors with non-mirrored meshes
- mirror weight paint on asymmetrical meshes

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy/utils.py
    trunk/blender/release/scripts/ui/space_view3d_toolbar.py
    trunk/blender/source/blender/editors/include/ED_mesh.h
    trunk/blender/source/blender/editors/mesh/editmesh_mods.c
    trunk/blender/source/blender/editors/mesh/meshtools.c
    trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/makesdna/DNA_mesh_types.h
    trunk/blender/source/blender/makesrna/intern/rna_mesh.c

Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py	2010-02-17 18:48:02 UTC (rev 26997)
+++ trunk/blender/release/scripts/modules/bpy/utils.py	2010-02-17 19:50:42 UTC (rev 26998)
@@ -187,8 +187,11 @@
     for module_name in sorted(used_ext):
         mod = _test_import(module_name, loaded_modules)
         test_register(mod)
+    
+    if reload_scripts:
+        import gc
+        print("gc.collect() -> %d" % gc.collect())
 
-
     if _bpy.app.debug:
         print("Time %.4f" % (time.time() - t_main))
 

Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d_toolbar.py	2010-02-17 18:48:02 UTC (rev 26997)
+++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py	2010-02-17 19:50:42 UTC (rev 26998)
@@ -156,6 +156,7 @@
             mesh = context.active_object.data
             col = layout.column(align=True)
             col.prop(mesh, "use_mirror_x")
+            col.prop(mesh, "use_mirror_topology")
             col.prop(context.tool_settings, "edge_path_mode")
 
 # ********** default tools for editmode_curve ****************
@@ -810,7 +811,9 @@
 
         obj = context.weight_paint_object
         if obj.type == 'MESH':
-            col.prop(obj.data, "use_mirror_x")
+            mesh = obj.data
+            col.prop(mesh, "use_mirror_x")
+            col.prop(mesh, "use_mirror_topology")
 
 # Commented out because the Apply button isn't an operator yet, making these settings useless
 #		col.label(text="Gamma:")

Modified: trunk/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mesh.h	2010-02-17 18:48:02 UTC (rev 26997)
+++ trunk/blender/source/blender/editors/include/ED_mesh.h	2010-02-17 19:50:42 UTC (rev 26998)
@@ -78,7 +78,7 @@
 /* meshtools.c */
 
 intptr_t	mesh_octree_table(struct Object *ob, struct EditMesh *em, float *co, char mode);
-struct EditVert   *editmesh_get_x_mirror_vert(struct Object *ob, struct EditMesh *em, float *co);
+struct EditVert   *editmesh_get_x_mirror_vert(struct Object *ob, struct EditMesh *em, struct EditVert *eve, float *co, int index);
 int			mesh_get_x_mirror_vert(struct Object *ob, int index);
 int			*mesh_get_x_mirror_faces(struct Object *ob, struct EditMesh *em);
 

Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c	2010-02-17 18:48:02 UTC (rev 26997)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c	2010-02-17 19:50:42 UTC (rev 26998)
@@ -104,14 +104,15 @@
 void EM_cache_x_mirror_vert(struct Object *ob, struct EditMesh *em)
 {
 	EditVert *eve, *eve_mirror;
+	int index= 0;
 
 	for(eve= em->verts.first; eve; eve= eve->next) {
 		eve->tmp.v= NULL;
 	}
 
-	for(eve= em->verts.first; eve; eve= eve->next) {
+	for(eve= em->verts.first; eve; eve= eve->next, index++) {
 		if(eve->tmp.v==NULL) {
-			eve_mirror = editmesh_get_x_mirror_vert(ob, em, eve->co);
+			eve_mirror = editmesh_get_x_mirror_vert(ob, em, eve, eve->co, index);
 			if(eve_mirror) {
 				eve->tmp.v= eve_mirror;
 				eve_mirror->tmp.v = eve;
@@ -4239,6 +4240,7 @@
 	float fvec[3];
 	int teller=0;
 	ModifierData *md;
+	int index;
 
 	/* count */
 	eve= em->verts.first;
@@ -4313,13 +4315,14 @@
 		eed= eed->next;
 	}
 
+	index= 0;
 	eve= em->verts.first;
 	while(eve) {
 		if(eve->f & SELECT) {
 			if(eve->f1) {
 				
 				if (((Mesh *)obedit->data)->editflag & ME_EDIT_MIRROR_X) {
-					eve_mir= editmesh_get_x_mirror_vert(obedit, em, eve->co);
+					eve_mir= editmesh_get_x_mirror_vert(obedit, em, eve, eve->co, index);
 				}
 				
 				adr = eve->tmp.p;
@@ -4352,6 +4355,7 @@
 			}
 			eve->tmp.p= NULL;
 		}
+		index++;
 		eve= eve->next;
 	}
 	MEM_freeN(adror);

Modified: trunk/blender/source/blender/editors/mesh/meshtools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/meshtools.c	2010-02-17 18:48:02 UTC (rev 26997)
+++ trunk/blender/source/blender/editors/mesh/meshtools.c	2010-02-17 19:50:42 UTC (rev 26998)
@@ -989,8 +989,201 @@
 	return 0;
 }
 
-int mesh_get_x_mirror_vert(Object *ob, int index)
+
+/* ********************* MESH VERTEX MIRR TOPO LOOKUP *************** */
+
+#define MIRRHASH_TYPE int
+
+typedef struct MirrTopoPair {
+	long hash;
+	int vIndex;
+} MirrTopoPair;
+
+static int MirrTopo_long_sort(const void *l1, const void *l2)
 {
+	if(			(MIRRHASH_TYPE)(intptr_t)l1 > (MIRRHASH_TYPE)(intptr_t)l2 ) return  1;
+	else if(	(MIRRHASH_TYPE)(intptr_t)l1 < (MIRRHASH_TYPE)(intptr_t)l2 ) return -1;
+	return 0;
+}
+
+static int MirrTopo_item_sort(const void *v1, const void *v2)
+{
+	if(			((MirrTopoPair *)v1)->hash > ((MirrTopoPair *)v2)->hash ) return  1;
+	else if(	((MirrTopoPair *)v1)->hash < ((MirrTopoPair *)v2)->hash ) return -1;
+	return 0;
+}
+
+static long *mesh_topo_lookup = NULL;
+static int  mesh_topo_lookup_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 */
+long mesh_mirrtopo_table(Object *ob, char mode)
+{
+	if(mode=='u') {		/* use table */
+		Mesh *me= ob->data;
+		if(	(mesh_topo_lookup==NULL) ||
+			(mesh_topo_lookup_mode != ob->mode) ||
+			(me->edit_mesh && me->edit_mesh->totvert != mesh_topo_lookup_tot) ||
+			(me->edit_mesh==NULL && me->totvert != mesh_topo_lookup_tot)
+		) {
+			mesh_mirrtopo_table(ob, 's');
+		}
+	} else if(mode=='s') { /* start table */
+		Mesh *me= ob->data;
+		MEdge *medge;
+		EditMesh *em= me->edit_mesh;
+
+		mesh_topo_lookup_mode= ob->mode;
+
+		/* editmode*/
+		EditEdge *eed;
+
+		int a, last, totvert;
+		int totUnique= -1, totUniqueOld= -1;
+
+		MIRRHASH_TYPE *MirrTopoHash = NULL;
+		MIRRHASH_TYPE *MirrTopoHash_Prev = NULL;
+		MirrTopoPair *MirrTopoPairs;
+
+		/* reallocate if needed */
+		if (mesh_topo_lookup) {
+			MEM_freeN(mesh_topo_lookup);
+			mesh_topo_lookup = NULL;
+		}
+
+		if(em) {
+			EditVert *eve;
+			totvert= 0;
+			for(eve= em->verts.first; eve; eve= eve->next) {
+				eve->hash = totvert++;
+			}
+		} else {
+			totvert = me->totvert;
+		}
+
+		MirrTopoHash = MEM_callocN( totvert * sizeof(MIRRHASH_TYPE), "TopoMirr" );
+
+		/* Initialize the vert-edge-user counts used to detect unique topology */
+		if(em) {
+			for(eed=em->edges.first; eed; eed= eed->next) {
+				MirrTopoHash[eed->v1->hash]++;
+				MirrTopoHash[eed->v2->hash]++;
+			}
+		} else {
+			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) {
+				for(eed=em->edges.first; eed; eed= eed->next) {
+					MirrTopoHash[eed->v1->hash] += MirrTopoHash_Prev[eed->v2->hash];
+					MirrTopoHash[eed->v2->hash] += MirrTopoHash_Prev[eed->v1->hash];
+				}
+			} else {
+				for(a=0, medge=me->medge; a<me->totedge; a++, medge++) {
+					/* This can make realy 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(MIRRHASH_TYPE) * totvert);
+
+			/* sort so we can count unique values */
+			qsort(MirrTopoHash_Prev, totvert, sizeof(MIRRHASH_TYPE), 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(MIRRHASH_TYPE) * totvert);
+		}
+
+		/* Hash/Index pairs are needed for sorting to find index pairs */
+		MirrTopoPairs= MEM_callocN( sizeof(MirrTopoPair) * totvert, "MirrTopoPairs");
+
+		/* since we are looping through verts, initialize these values here too */
+		mesh_topo_lookup = MEM_mallocN( totvert * sizeof(long), "mesh_topo_lookup" );
+
+		if(em) {
+			EM_init_index_arrays(em,1,0,0);
+		}
+
+
+		for(a=0; a<totvert; a++) {
+			MirrTopoPairs[a].hash= MirrTopoHash[a];
+			MirrTopoPairs[a].vIndex = a;
+
+			/* initialize lookup */
+			mesh_topo_lookup[a] = -1;
+		}
+
+		qsort(MirrTopoPairs, totvert, sizeof(MirrTopoPair), 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+1; a++) {
+			/* printf("I %d %ld %d\n", (a-last), MirrTopoPairs[a  ].hash, MirrTopoPairs[a  ].vIndex ); */
+			if ((a==totvert) || (MirrTopoPairs[a-1].hash != MirrTopoPairs[a].hash)) {
+				if (a-last==2) {
+					if(em) {
+						mesh_topo_lookup[MirrTopoPairs[a-1].vIndex] =	(long)EM_get_vert_for_index(MirrTopoPairs[a-2].vIndex);
+						mesh_topo_lookup[MirrTopoPairs[a-2].vIndex] =	(long)EM_get_vert_for_index(MirrTopoPairs[a-1].vIndex);
+					} else {
+						mesh_topo_lookup[MirrTopoPairs[a-1].vIndex] =	MirrTopoPairs[a-2].vIndex;
+						mesh_topo_lookup[MirrTopoPairs[a-2].vIndex] =	MirrTopoPairs[a-1].vIndex;
+					}
+				}
+				last= a;
+			}
+		}
+		if(em) {
+			EM_free_index_arrays();
+		}
+
+		MEM_freeN( MirrTopoPairs );
+		MirrTopoPairs = NULL;
+
+		MEM_freeN( MirrTopoHash );
+		MEM_freeN( MirrTopoHash_Prev );
+
+		mesh_topo_lookup_tot = totvert;
+
+	} else if(mode=='e') { /* end table */
+		if (mesh_topo_lookup) {
+			MEM_freeN(mesh_topo_lookup);
+		}
+		mesh_topo_lookup = NULL;
+		mesh_topo_lookup_tot= -1;
+	}
+	return 0;
+}
+
+int mesh_get_x_mirror_vert_spacial(Object *ob, int index)
+{
 	Mesh *me= ob->data;
 	MVert *mvert;
 	float vec[3];
@@ -1003,8 +1196,25 @@
 	return mesh_octree_table(ob, NULL, vec, 'u');
 }
 

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list