[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43674] branches/bmesh/blender/source/ blender: fix for 3 issues when applying a deform modifier in editmode.

Campbell Barton ideasman42 at gmail.com
Tue Jan 24 20:37:25 CET 2012


Revision: 43674
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43674
Author:   campbellbarton
Date:     2012-01-24 19:37:18 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
fix for 3 issues when applying a deform modifier in editmode.
- drawing face normals was broken (using wrong index).
- drawing flat faces in solid mode would display ugly tesselation normals (as if the model was made of triangles).
- drawing smooth faces in solid mode would show vertex normals based on tesselation (heavily slant in 1 direction).

now the normals are calculated and stored per polygon (will save some memory too for non tri meshes).

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
    branches/bmesh/blender/source/blender/bmesh/bmesh.h
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.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/blenkernel/intern/editderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c	2012-01-24 18:29:01 UTC (rev 43673)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c	2012-01-24 19:37:18 UTC (rev 43674)
@@ -333,7 +333,7 @@
 
 	float (*vertexCos)[3];
 	float (*vertexNos)[3];
-	float (*faceNos)[3];
+	float (*polyNos)[3];
 
 	/*lookup caches; these are rebuilt on dm->RecalcTesselation()
 	  (or when the derivedmesh is created, of course)*/
@@ -346,7 +346,8 @@
 	int tv, te, tf;
 } EditDerivedBMesh;
 
-static void bmdm_recalc_lookups(EditDerivedBMesh *bmdm)
+/* BMESH_TODO, since this is not called get functions fail! */
+static void UNUSED_FUNCTION(bmdm_recalc_lookups)(EditDerivedBMesh *bmdm)
 {
 	BMIter iter;
 	int a, i;
@@ -613,19 +614,24 @@
 		void *userData)
 {
 	EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
+	float (*polyNos)[3] = NULL;
 	BMFace *efa;
 	BMIter iter;
 	float cent[3];
 	int i;
 
+	/* ensure for face center calculation */
 	if (bmdm->vertexCos) {
 		BM_ElemIndex_Ensure(bmdm->tc->bm, BM_VERT);
+		polyNos = bmdm->polyNos;
+
+		BLI_assert(polyNos != NULL);
 	}
 
 	efa = BMIter_New(&iter, bmdm->tc->bm, BM_FACES_OF_MESH, NULL);
 	for (i=0; efa; efa=BMIter_Step(&iter), i++) {
 		emDM__calcFaceCent(bmdm->tc->bm, efa, cent, bmdm->vertexCos);
-		func(userData, i, cent, bmdm->vertexCos?bmdm->faceNos[i]:efa->no);
+		func(userData, i, cent, polyNos ? polyNos[i] : efa->no);
 	}
 }
 
@@ -657,7 +663,8 @@
 		/* add direct access */
 		float (*vertexCos)[3]= bmdm->vertexCos;
 		float (*vertexNos)[3]= bmdm->vertexNos;
-		float (*faceNos)[3]=   bmdm->faceNos;
+		float (*polyNos)[3]=   bmdm->polyNos;
+		// int *triPolyMap= bmdm->triPolyMap;
 
 		BM_ElemIndex_Ensure(bmdm->tc->bm, BM_VERT | BM_FACE);
 
@@ -702,7 +709,7 @@
 					}
 
 					if (!drawSmooth) {
-						glNormal3fv(faceNos[i]);
+						glNormal3fv(polyNos[BM_GetIndex(efa)]);
 						glVertex3fv(vertexCos[BM_GetIndex(l[0]->v)]);
 						glVertex3fv(vertexCos[BM_GetIndex(l[1]->v)]);
 						glVertex3fv(vertexCos[BM_GetIndex(l[2]->v)]);
@@ -894,7 +901,7 @@
 				}
 
 				if (!drawSmooth) {
-					glNormal3fv(bmdm->faceNos[i]);
+					glNormal3fv(bmdm->polyNos[BM_GetIndex(efa)]);
 
 					bmdm_get_tri_tex(bm, ls, luv, lcol, has_uv, has_vcol);
 
@@ -1114,7 +1121,7 @@
 		if (dodraw) {
 			glBegin(GL_TRIANGLES);
 			if (!drawSmooth) {
-				if (vertexCos) glNormal3fv(bmdm->faceNos[i]);
+				if (vertexCos) glNormal3fv(bmdm->polyNos[BM_GetIndex(efa)]);
 				else glNormal3fv(efa->no);
 
 				PASSATTRIB(ltri[0], ltri[0]->v, 0);
@@ -1237,7 +1244,7 @@
 		/* face */
 		glBegin(GL_TRIANGLES);
 		if (!drawSmooth) {
-			if (vertexCos) glNormal3fv(bmdm->faceNos[i]);
+			if (vertexCos) glNormal3fv(bmdm->polyNos[BM_GetIndex(efa)]);
 			else glNormal3fv(efa->no);
 
 			PASSATTRIB(ltri[0], ltri[0]->v, 0);
@@ -1609,7 +1616,7 @@
 		if (bmdm->vertexCos) {
 			MEM_freeN(bmdm->vertexCos);
 			MEM_freeN(bmdm->vertexNos);
-			MEM_freeN(bmdm->faceNos);
+			MEM_freeN(bmdm->polyNos);
 		}
 
 		if (bmdm->vtable) MEM_freeN(bmdm->vtable);
@@ -1733,32 +1740,32 @@
 	}
 
 	if (vertexCos) {
+		BMFace *efa;
 		BMVert *eve;
-		BMIter iter;
-		int totface = bmdm->tc->tottri;
+		BMIter fiter;
+		BMIter viter;
 		int i;
 
 		BM_ElemIndex_Ensure(bm, BM_VERT);
 
 		bmdm->vertexNos = MEM_callocN(sizeof(*bmdm->vertexNos) * bm->totvert, "bmdm_vno");
-		bmdm->faceNos = MEM_mallocN(sizeof(*bmdm->faceNos)*totface, "bmdm_vno");
+		bmdm->polyNos = MEM_mallocN(sizeof(*bmdm->polyNos)*bm->totface, "bmdm_pno");
 
-		for (i=0; i<bmdm->tc->tottri; i++) {
-			BMLoop **l = bmdm->tc->looptris[i];
-			float *v1 = vertexCos[BM_GetIndex(l[0]->v)];
-			float *v2 = vertexCos[BM_GetIndex(l[1]->v)];
-			float *v3 = vertexCos[BM_GetIndex(l[2]->v)];
-			float *no = bmdm->faceNos[i];
-
-			normal_tri_v3( no,v1, v2, v3);
-			add_v3_v3v3(bmdm->vertexNos[BM_GetIndex(l[0]->v)], bmdm->vertexNos[BM_GetIndex(l[0]->v)], no);
-			add_v3_v3v3(bmdm->vertexNos[BM_GetIndex(l[1]->v)], bmdm->vertexNos[BM_GetIndex(l[1]->v)], no);
-			add_v3_v3v3(bmdm->vertexNos[BM_GetIndex(l[2]->v)], bmdm->vertexNos[BM_GetIndex(l[2]->v)], no);
+		i = 0;
+		BM_ITER(efa, &fiter, bm, BM_FACES_OF_MESH, NULL) {
+			BM_SetIndex(efa, i); /* set_inline */
+			BM_Face_UpdateNormal_VertexCos(bm, efa, bmdm->polyNos[i], vertexCos);
+			i++;
 		}
+		bm->elem_index_dirty &= ~BM_FACE;
 
-		eve=BMIter_New(&iter, bm, BM_VERTS_OF_MESH, NULL);
-		for (i=0; eve; eve=BMIter_Step(&iter), i++) {
+		eve=BMIter_New(&viter, bm, BM_VERTS_OF_MESH, NULL);
+		for (i=0; eve; eve=BMIter_Step(&viter), i++) {
 			float *no = bmdm->vertexNos[i];
+			BM_ITER(efa, &fiter, bm, BM_FACES_OF_VERT, eve) {
+				add_v3_v3(no, bmdm->polyNos[BM_GetIndex(efa)]);
+			}
+
 			/* following Mesh convention; we use vertex coordinate itself
 			 * for normal in this case */
 			if (normalize_v3(no)==0.0) {

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh.h	2012-01-24 18:29:01 UTC (rev 43673)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh.h	2012-01-24 19:37:18 UTC (rev 43674)
@@ -233,6 +233,7 @@
 
 /*updates a face normal*/
 void BM_Face_UpdateNormal(BMesh *bm, BMFace *f);
+void BM_Face_UpdateNormal_VertexCos(BMesh *bm, BMFace *f, float no[3], float (*vertexCos)[3]);
 
 /*updates face and vertex normals incident on an edge*/
 void BM_Edge_UpdateNormals(BMesh *bm, BMEdge *e);

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2012-01-24 18:29:01 UTC (rev 43673)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2012-01-24 19:37:18 UTC (rev 43674)
@@ -251,7 +251,7 @@
 			continue;
 #endif
 
-		bmesh_update_face_normal(bm, f, projectverts);		
+		bmesh_update_face_normal(bm, f, f->no, projectverts);
 	}
 	
 	/*Zero out vertex normals*/

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c	2012-01-24 18:29:01 UTC (rev 43673)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c	2012-01-24 19:37:18 UTC (rev 43674)
@@ -420,12 +420,25 @@
 
 		BLI_array_fixedstack_declare(proj, BM_NGON_STACK_SIZE, f->len, __func__);
 
-		bmesh_update_face_normal(bm, f, proj);
+		bmesh_update_face_normal(bm, f, f->no, proj);
 
 		BLI_array_fixedstack_free(proj);
 	}
 }
+/* same as BM_Face_UpdateNormal but takes vertex coords */
+void BM_Face_UpdateNormal_VertexCos(BMesh *bm, BMFace *f, float no[3], float (*vertexCos)[3])
+{
+	if (f->len >= 3) {
+		float (*proj)[3];
 
+		BLI_array_fixedstack_declare(proj, BM_NGON_STACK_SIZE, f->len, __func__);
+
+		bmesh_update_face_normal_vertex_cos(bm, f, no, proj, vertexCos);
+
+		BLI_array_fixedstack_free(proj);
+	}
+}
+
 void BM_Edge_UpdateNormals(BMesh *bm, BMEdge *e)
 {
 	BMIter iter;
@@ -487,7 +500,8 @@
 	BM_Vert_UpdateNormal(bm, v);
 }
 
-void bmesh_update_face_normal(BMesh *bm, BMFace *f, float (*projectverts)[3])
+void bmesh_update_face_normal(BMesh *bm, BMFace *f, float no[3],
+                              float (*projectverts)[3])
 {
 	BMLoop *l;
 
@@ -499,7 +513,7 @@
 			BMVert *v2 = (l = l->next)->v;
 			BMVert *v3 = (l = l->next)->v;
 			BMVert *v4 = (l->next)->v;
-			normal_quad_v3(f->no,v1->co, v2->co, v3->co, v4->co);
+			normal_quad_v3(no, v1->co, v2->co, v3->co, v4->co);
 			break;
 		}
 		case 3:
@@ -507,12 +521,12 @@
 			BMVert *v1 = (l = bm_firstfaceloop(f))->v;
 			BMVert *v2 = (l = l->next)->v;
 			BMVert *v3 = (l->next)->v;
-			normal_tri_v3(f->no,v1->co, v2->co, v3->co);
+			normal_tri_v3(no, v1->co, v2->co, v3->co);
 			break;
 		}
 		case 0:
 		{
-			zero_v3(f->no);
+			zero_v3(no);
 			break;
 		}
 		default:
@@ -523,13 +537,65 @@
 				copy_v3_v3(projectverts[i], l->v->co);
 				i += 1;
 			}
-			compute_poly_normal(f->no, projectverts, f->len);
+			compute_poly_normal(no, projectverts, f->len);
 			break;
 		}
 	}
 }
+/* exact same as 'bmesh_update_face_normal' but accepts vertex coords */
+void bmesh_update_face_normal_vertex_cos(BMesh *bm, BMFace *f, float no[3],
+                                   float (*projectverts)[3], float (*vertexCos)[3])
+{
+	BMLoop *l;
 
+	/* must have valid index data */
+	BLI_assert((bm->elem_index_dirty & BM_VERT) == 0);
 
+	/* common cases first */
+	switch (f->len) {
+		case 4:
+		{
+			BMVert *v1 = (l = bm_firstfaceloop(f))->v;
+			BMVert *v2 = (l = l->next)->v;
+			BMVert *v3 = (l = l->next)->v;
+			BMVert *v4 = (l->next)->v;
+			normal_quad_v3(no,
+			               vertexCos[BM_GetIndex(v1)],
+			               vertexCos[BM_GetIndex(v2)],
+			               vertexCos[BM_GetIndex(v3)],
+			               vertexCos[BM_GetIndex(v4)]);
+			break;
+		}
+		case 3:
+		{
+			BMVert *v1 = (l = bm_firstfaceloop(f))->v;
+			BMVert *v2 = (l = l->next)->v;
+			BMVert *v3 = (l->next)->v;
+			normal_tri_v3(no,
+			              vertexCos[BM_GetIndex(v1)],
+			              vertexCos[BM_GetIndex(v2)],
+			              vertexCos[BM_GetIndex(v3)]);
+			break;
+		}
+		case 0:
+		{
+			zero_v3(no);
+			break;
+		}
+		default:
+		{
+			BMIter iter;
+			int i = 0;
+			BM_ITER(l, &iter, bm, BM_LOOPS_OF_FACE, f) {
+				copy_v3_v3(projectverts[i], vertexCos[BM_GetIndex(l->v)]);
+				i += 1;
+			}
+			compute_poly_normal(no, projectverts, f->len);
+			break;
+		}
+	}
+}
+
 /*
  * BMESH FLIP NORMAL
  * 
@@ -784,7 +850,7 @@
 
 	bm->elem_index_dirty |= BM_VERT; /* see above */
 
-	///bmesh_update_face_normal(bm, f, projectverts);
+	///bmesh_update_face_normal(bm, f, f->no, projectverts);
 
 	compute_poly_normal(f->no, projectverts, f->len);
 	poly_rotate_plane(f->no, projectverts, i);

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h	2012-01-24 18:29:01 UTC (rev 43673)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h	2012-01-24 19:37:18 UTC (rev 43674)
@@ -83,8 +83,11 @@
 /*newedgeflag sets a flag layer flag, obviously not the header flag.*/
 void BM_Triangulate_Face(BMesh *bm, BMFace *f, float (*projectverts)[3], 

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list