[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11409] trunk/blender/source/blender:

Brecht Van Lommel brechtvanlommel at pandora.be
Sat Jul 28 23:04:30 CEST 2007


Revision: 11409
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11409
Author:   blendix
Date:     2007-07-28 23:04:30 +0200 (Sat, 28 Jul 2007)

Log Message:
-----------

Armature CrazySpace Improvement
===============================

An improved CrazySpace correction is now used for Armature modifiers that use
vertex groups, and that are the first enabled modifiers in the stack. This is
a a specific case, but also a common one.

http://www.blender.org/development/current-projects/changes-since-244/skinning/

Implementation Notes:

- The quaternion crazyspace correction is still used for modifiers other than
  the armature modifier.
- Modifiers can now provide a deform matrix per vertex to be used for
  crazyspace correction, only the armature modifier implements this now.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
    trunk/blender/source/blender/blenkernel/BKE_lattice.h
    trunk/blender/source/blender/blenkernel/BKE_modifier.h
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/blenkernel/intern/armature.c
    trunk/blender/source/blender/blenkernel/intern/modifier.c
    trunk/blender/source/blender/blenlib/BLI_arithb.h
    trunk/blender/source/blender/blenlib/intern/arithb.c
    trunk/blender/source/blender/makesdna/DNA_modifier_types.h
    trunk/blender/source/blender/src/transform_conversions.c

Modified: trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h	2007-07-28 17:30:54 UTC (rev 11408)
+++ trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h	2007-07-28 21:04:30 UTC (rev 11409)
@@ -425,6 +425,11 @@
 DerivedMesh *editmesh_get_derived_cage_and_final(DerivedMesh **final_r,
                                                  CustomDataMask dataMask);
 
+/* returns an array of deform matrices for crazyspace correction, and the
+   number of modifiers left */
+int editmesh_get_first_deform_matrices(float (**deformmats)[3][3],
+                                       float (**deformcos)[3]);
+
 void weight_to_rgb(float input, float *fr, float *fg, float *fb);
 
 /* determines required DerivedMesh data according to view and edit modes */

Modified: trunk/blender/source/blender/blenkernel/BKE_lattice.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_lattice.h	2007-07-28 17:30:54 UTC (rev 11408)
+++ trunk/blender/source/blender/blenkernel/BKE_lattice.h	2007-07-28 21:04:30 UTC (rev 11409)
@@ -64,8 +64,8 @@
                           int numVerts, char *vgroup);
 void armature_deform_verts(struct Object *armOb, struct Object *target,
                            struct DerivedMesh *dm, float (*vertexCos)[3],
-                           int numVerts, int deformflag,
-                           const char *defgrp_name);
+                           float (*defMats)[3][3], int numVerts,
+                           int deformflag, const char *defgrp_name);
 float (*lattice_getVertexCos(struct Object *ob, int *numVerts_r))[3];
 void lattice_applyVertexCos(struct Object *ob, float (*vertexCos)[3]);
 void lattice_calc_modifiers(struct Object *ob);

Modified: trunk/blender/source/blender/blenkernel/BKE_modifier.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_modifier.h	2007-07-28 17:30:54 UTC (rev 11408)
+++ trunk/blender/source/blender/blenkernel/BKE_modifier.h	2007-07-28 21:04:30 UTC (rev 11409)
@@ -125,6 +125,11 @@
 	            struct EditMesh *editData, struct DerivedMesh *derivedData,
 	            float (*vertexCos)[3], int numVerts);
 
+	/* Set deform matrix per vertex for crazyspace correction */
+	void (*deformMatricesEM)(
+	            struct ModifierData *md, struct Object *ob,
+	            struct EditMesh *editData, struct DerivedMesh *derivedData,
+	            float (*vertexCos)[3], float (*defMats)[3][3], int numVerts);
 
 	/********************* Non-deform modifier functions *********************/
 
@@ -257,6 +262,7 @@
 int           modifier_dependsOnTime(struct ModifierData *md);
 int           modifier_supportsMapping(struct ModifierData *md);
 int           modifier_couldBeCage(struct ModifierData *md);
+int           modifier_isDeformer(struct ModifierData *md);
 void          modifier_setError(struct ModifierData *md, char *format, ...);
 
 void          modifiers_foreachObjectLink(struct Object *ob,

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2007-07-28 17:30:54 UTC (rev 11408)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2007-07-28 21:04:30 UTC (rev 11409)
@@ -1887,6 +1887,24 @@
 	return cos;
 }
 
+static int editmesh_modifier_is_enabled(ModifierData *md, DerivedMesh *dm)
+{
+	ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+	int required_mode = eModifierMode_Realtime | eModifierMode_Editmode;
+
+	if((md->mode & required_mode) != required_mode) return 0;
+	if((mti->flags & eModifierTypeFlag_RequiresOriginalData) && dm) {
+		modifier_setError(md, "Internal error, modifier requires"
+		                  "original data (bad stack position).");
+		return 0;
+	}
+	if(mti->isDisabled && mti->isDisabled(md)) return 0;
+	if(!(mti->flags & eModifierTypeFlag_SupportsEditmode)) return 0;
+	if(md->mode & eModifierMode_DisableTemporary) return 0;
+	
+	return 1;
+}
+
 static void editmesh_calc_modifiers(DerivedMesh **cage_r,
                                     DerivedMesh **final_r,
                                     CustomDataMask dataMask)
@@ -1897,7 +1915,6 @@
 	float (*deformedVerts)[3] = NULL;
 	DerivedMesh *dm;
 	int i, numVerts = 0, cageIndex = modifiers_getCageIndex(ob, NULL);
-	int required_mode = eModifierMode_Realtime | eModifierMode_Editmode;
 	LinkNode *datamasks, *curr;
 
 	modifiers_clearErrors(ob);
@@ -1918,14 +1935,8 @@
 	for(i = 0; md; i++, md = md->next, curr = curr->next) {
 		ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
-		if((md->mode & required_mode) != required_mode) continue;
-		if((mti->flags & eModifierTypeFlag_RequiresOriginalData) && dm) {
-			modifier_setError(md, "Internal error, modifier requires"
-			                  "original data (bad stack position).");
+		if(!editmesh_modifier_is_enabled(md, dm))
 			continue;
-		}
-		if(mti->isDisabled && mti->isDisabled(md)) continue;
-		if(!(mti->flags & eModifierTypeFlag_SupportsEditmode)) continue;
 
 		/* How to apply modifier depends on (a) what we already have as
 		 * a result of previous modifiers (could be a DerivedMesh or just
@@ -2461,7 +2472,62 @@
 	return vertexcosnos;
 }
 
+/* ********* crazyspace *************** */
 
+int editmesh_get_first_deform_matrices(float (**deformmats)[3][3], float (**deformcos)[3])
+{
+	Object *ob = G.obedit;
+	EditMesh *em = G.editMesh;
+	ModifierData *md;
+	DerivedMesh *dm;
+	int i, a, numleft = 0, numVerts = 0;
+	int cageIndex = modifiers_getCageIndex(ob, NULL);
+	float (*defmats)[3][3] = NULL, (*deformedVerts)[3] = NULL;
+
+	modifiers_clearErrors(ob);
+
+	dm = NULL;
+	md = ob->modifiers.first;
+
+	/* compute the deformation matrices and coordinates for the first
+	   modifiers with on cage editing that are enabled and support computing
+	   deform matrices */
+	for(i = 0; md && i <= cageIndex; i++, md = md->next) {
+		ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+
+		if(!editmesh_modifier_is_enabled(md, dm))
+			continue;
+
+		if(mti->type==eModifierTypeType_OnlyDeform && mti->deformMatricesEM) {
+			if(!defmats) {
+				dm= getEditMeshDerivedMesh(em, ob, NULL);
+				deformedVerts= editmesh_getVertexCos(em, &numVerts);
+				defmats= MEM_callocN(sizeof(*defmats)*numVerts, "defmats");
+
+				for(a=0; a<numVerts; a++)
+					Mat3One(defmats[a]);
+			}
+
+			mti->deformMatricesEM(md, ob, em, dm, deformedVerts, defmats,
+				numVerts);
+		}
+		else
+			break;
+	}
+
+	for(; md && i <= cageIndex; md = md->next, i++)
+		if(editmesh_modifier_is_enabled(md, dm) && modifier_isDeformer(md))
+			numleft++;
+
+	if(dm)
+		dm->release(dm);
+	
+	*deformmats= defmats;
+	*deformcos= deformedVerts;
+
+	return numleft;
+}
+
 /* ************************* fluidsim bobj file handling **************************** */
 
 #ifndef DISABLE_ELBEEM

Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c	2007-07-28 17:30:54 UTC (rev 11408)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c	2007-07-28 21:04:30 UTC (rev 11409)
@@ -504,39 +504,54 @@
 	Bone *bone= pchan->bone;
 	Mat4 *b_bone= b_bone_spline_setup(pchan);
 	Mat4 *b_bone_mats;
+	float tmat[4][4];
 	int a;
 	
-	pchan->b_bone_mats=b_bone_mats= MEM_mallocN((1+bone->segments)*sizeof(Mat4), "BBone defmats");
-	
-	/* first matrix is the inverse arm_mat, to bring points in local bone space */
+	/* allocate b_bone matrices and dual quats */
+	b_bone_mats= MEM_mallocN((1+bone->segments)*sizeof(Mat4), "BBone defmats");
+	pchan->b_bone_mats= b_bone_mats;
+
+	/* first matrix is the inverse arm_mat, to bring points in local bone space
+	   for finding out which segment it belongs to */
 	Mat4Invert(b_bone_mats[0].mat, bone->arm_mat);
-	
-	/* then we multiply the bbone_mats with arm_mat */
+
+	/* then we make the b_bone_mats:
+	    - first transform to local bone space
+		- translate over the curve to the bbone mat space
+		- transform with b_bone matrix
+		- transform back into global space */
+	Mat4One(tmat);
+
 	for(a=0; a<bone->segments; a++) {
-		Mat4MulMat4(b_bone_mats[a+1].mat, b_bone[a].mat, bone->arm_mat);
+		tmat[3][1] = -a*(bone->length/(float)bone->segments);
+
+		Mat4MulSerie(b_bone_mats[a+1].mat, pchan->chan_mat, bone->arm_mat,
+			b_bone[a].mat, tmat, b_bone_mats[0].mat, NULL, NULL, NULL);
 	}
 }
 
-static void b_bone_deform(bPoseChannel *pchan, Bone *bone, float *defpos)
+static void b_bone_deform(bPoseChannel *pchan, Bone *bone, float *co, float defmat[][3])
 {
 	Mat4 *b_bone= pchan->b_bone_mats;
-	float segment;
+	float (*mat)[4]= b_bone[0].mat;
+	float segment, y;
 	int a;
 	
-	/* need to transform defpos back to bonespace */
-	Mat4MulVecfl(b_bone[0].mat, defpos);
+	/* need to transform co back to bonespace, only need y */
+	y= mat[0][1]*co[0] + mat[1][1]*co[1] + mat[2][1]*co[2] + mat[3][1];
 	
 	/* now calculate which of the b_bones are deforming this */
 	segment= bone->length/((float)bone->segments);
-	a= (int) (defpos[1]/segment);
+	a= (int)(y/segment);
 	
-	/* note; by clamping it extends deform at endpoints, goes best with straight joints in restpos. */
+	/* note; by clamping it extends deform at endpoints, goes best with
+	   straight joints in restpos. */
 	CLAMP(a, 0, bone->segments-1);
 
-	/* since the bbone mats translate from (0.0.0) on the curve, we subtract */
-	defpos[1] -= ((float)a)*segment;
-	
-	Mat4MulVecfl(b_bone[a+1].mat, defpos);
+	Mat4MulVecfl(b_bone[a+1].mat, co);
+
+	if(defmat)
+		Mat3CpyMat4(defmat, b_bone[a+1].mat);
 }
 
 /* using vec with dist to bone b1 - b2 */
@@ -590,12 +605,24 @@
 	}
 }
 
-static float dist_bone_deform(bPoseChannel *pchan, float *vec, float *co)
+static void pchan_deform_mat_add(bPoseChannel *pchan, float weight, float bbonemat[][3], float mat[][3])
 {
+	float wmat[3][3];
+
+	if(pchan->bone->segments>1)
+		Mat3CpyMat3(wmat, bbonemat);
+	else
+		Mat3CpyMat4(wmat, pchan->chan_mat);
+
+	Mat3MulFloat((float*)wmat, weight);
+	Mat3AddMat3(mat, mat, wmat);
+}
+
+static float dist_bone_deform(bPoseChannel *pchan, float *vec, float mat[][3], float *co)
+{
 	Bone *bone= pchan->bone;
-	float	fac;
-	float	cop[3];
-	float	contrib=0.0;
+	float fac, contrib=0.0;
+	float cop[3], bbonemat[3][3];
 

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list