Changeset 593

Timestamp:

07/03/08 17:12:32 (5 months ago)

Author:

phill

Message:

o Root offset fixes.

Files:

• branches/morph-targets/libx42/anim-skin.c (modified) (3 diffs)
• branches/morph-targets/libx42/anim.c (modified) (1 diff)
• branches/morph-targets/libx42/include/x42.h (modified) (3 diffs)
• branches/morph-targets/libx42/local.h (modified) (1 diff)
• branches/morph-targets/libx42/platform/x86-64/anim-skin.c (modified) (3 diffs)
• branches/morph-targets/libx42/pose.c (modified) (3 diffs)
• branches/morph-targets/libx42/write.c (modified) (1 diff)
• branches/morph-targets/x42maya/modelexporter-gather.cpp (modified) (1 diff)

branches/morph-targets/libx42/anim-skin.c

@@ -191 +191 @@
-        const x42data_t *x42, uint groupNum, const affine_t *boneMats )
-{
-
+, maxInfs
-        const x42group_t *grp;
-        affine_t infs[X42_MAX_INFLUENCES_PER_BATCH_V5];
@@ -206 +206 @@
-                        affine_cpy( infs + i, &inf->meshToBone );
-        }
+
+        maxInfs = grp->maxVertInfluences > 0 ? grp->maxVertInfluences : 1;
-
-        if( oTan || oBin || !x42->vertNorm )
@@ -223 +225 @@
-                        oTan = &nullStream;
-
-grp->maxVertInfluence
+maxInf
-                        iPos, x42->vertPos + grp->firstVert, iTan, grp->numVerts, oPos, oNorm, oTan, oBin );
-        }
-        else if( oNorm )
-        {
-grp->maxVertInfluence
+maxInf
-                        iPos, x42->vertPos + grp->firstVert,  iNorm, grp->numVerts, oPos, oNorm );
-        }
-        else
-        {
-grp->maxVertInfluence
+maxInf
-                        iPos, x42->vertPos + grp->firstVert, grp->numVerts, oPos );
-        }

branches/morph-targets/libx42/anim.c

@@ -127 +127 @@
-        grp = x42->groups + groupNum;
-
-grp->maxVertInfluences == 0
+(grp->maxVertInfluences == 0 && (x42->header.runFlags & X42_RF_ROOT_MATRIX_BAKED))
-        applied_opts = opts ? x42_ApplyOpts( opts ) : false;
-

branches/morph-targets/libx42/include/x42.h

@@ -132 +132 @@
-        x42tag_t                        *tags;                  //may be null
-
+        affine_t                        rootMatrix;             //usually identity, X42_RF_ROOT_MATRIX will be set otherwise
+
-        /*
-                Geometry data.
@@ -341 +343 @@
-X42_EXPORT x42data_t* X42_CALL x42_LoadDataFromStream( void *out_buffer, const x42header_t *h, uint persist_flags, x42inStream_t *file_stream );
-
+/*
+        Apply a runtime root offset to the model. This stores a matrix in the x42data_t struct
+        to append onto the root of all animation heirarchies and (optionally) bakes the matrix
+        into the vertices of any static animation groups.
+
+        Leave bake_into_static_verts set to true unless you're going to manually skin the vertices
+        with their (identity) influence.
+*/
+X42_EXPORT bool X42_CALL x42_ApplyRootOffset( x42data_t *x42, const affine_t *rootMatrix, bool bake_into_static_verts );
+
-/***********************************
-
@@ -435 +447 @@
-
-X42_EXPORT affine_t* X42_CALL x42_GetAnimBoneMatrices( void *out_buffer, const x42data_t *x42,
-const affine_t *rootMatrix, 
+
-X42_EXPORT affine_t* X42_CALL x42_GetAnimTagMatrices( void *out_buffer, const x42data_t *x42,
-        const affine_t *boneMats, x42opts_t *opts );

branches/morph-targets/libx42/local.h

@@ -43 +43 @@
-
-#define X42_RF_LOAD_SWAPPED                     0x0001
+#define X42_RF_ROOT_MATRIX                      0x1000
+#define X42_RF_ROOT_MATRIX_BAKED        0x2000
-
-#ifdef __cplusplus

branches/morph-targets/libx42/platform/x86-64/anim-skin.c

@@ -759 +759 @@
-        const x42data_t *x42, uint groupNum, const affine_t *boneMats, x42opts_t *opts )
-{
-
+, maxInfs
-        x42group_t *g;
-
@@ -784 +784 @@
-        g = x42->groups + groupNum;
-
-
-
-
+
-
-        for( i = 0; i < g->numInfluences; i++ )
@@ -826 +824 @@
-                        oNorm = &nullStream;
-
-g->maxVertInfluence
+maxInf
-                        iTan, g->numVerts, oPos, oNorm, oTan, oBin );
-        }
-        else if( oNorm )
-        {
-g->maxVertInfluence
+maxInf
-                {
-                case 1:

branches/morph-targets/libx42/pose.c

@@ -504 +504 @@
-*/
-
+X42_EXPORT bool X42_CALL x42_ApplyRootOffset( x42data_t *x42, const affine_t *rootMatrix, bool bake_into_static_verts )
+{
+#ifndef LIBX42_NO_PARAM_VALIDATION
+        demand_rf( x42 != NULL, X42_ERR_BADPTR, "x42 is NULL" );
+        demand_rf( x42_ValidateHeader( &x42->header ), X42_ERR_BADDATA, "invalid x42 header data" );
+        demand_rf( rootMatrix != NULL, X42_ERR_BADPTR, "rootMatrix is NULL" );
+
+        if( x42->header.runFlags & X42_RF_ROOT_MATRIX )
+        {
+                demand_rf( bake_into_static_verts ? true : false ==
+                        (x42->header.runFlags & X42_RF_ROOT_MATRIX_BAKED) ? true : false , X42_ERR_INVALIDOP, "cannot mix baked/unbaked root offsets" );
+        }
+#endif
+
+        //from the left
+        if( (x42->header.runFlags & X42_RF_ROOT_MATRIX) == 0 )
+        {
+                affine_cpy( &x42->rootMatrix, rootMatrix );
+                x42->header.runFlags |= X42_RF_ROOT_MATRIX;
+        }
+        else
+        {
+                affine_mul( &x42->rootMatrix, rootMatrix, &x42->rootMatrix );
+        }
+
+        if( bake_into_static_verts )
+        {
+                uint g, v, lv;
+
+                x42->header.runFlags |= X42_RF_ROOT_MATRIX_BAKED;
+
+                for( g = 0; g < x42->header.numVerts; g++ )
+                {
+                        const x42group_t *grp = x42->groups + g;
+                        
+                        if( grp->maxVertInfluences )
+                                //not static
+                                continue;
+
+                        lv = grp->firstVert + grp->numVerts;
+                        for( v = grp->firstVert; v < lv; v++ )
+                                affine_mul_pos( x42->vertPos[v].pos, rootMatrix, x42->vertPos[v].pos );
+
+                        if( x42->vertNorm )
+                        {
+                                for( v = grp->firstVert; v < lv; v++ )
+                                        affine_mul_vec( x42->vertNorm[v].norm, rootMatrix, x42->vertNorm[v].norm );
+                        }
+
+                        if( x42->vertTan )
+                        {
+                                for( v = grp->firstVert; v < lv; v++ )
+                                {
+                                        affine_mul_vec( x42->vertTan[v].tan, rootMatrix, x42->vertTan[v].tan );
+                                        affine_mul_vec( x42->vertTan[v].bit, rootMatrix, x42->vertTan[v].bit );
+                                }
+                        }
+                }
+
+                for( g = 0; g < x42->header.numMorphTargets; g++ )
+                {
+                        const x42morphTarget_t *tar = x42->morphTargets + g;
+                        
+                        if( x42->groups[tar->targetGroup].maxVertInfluences )
+                                //not static
+                                continue;
+
+                        lv = tar->numDeltas;
+
+                        for( v = tar->firstDelta; v < lv; v++ )
+                                affine_mul_vec( x42->morphPos[v], rootMatrix, x42->morphPos[v] );
+
+                        if( x42->morphNorm )
+                        {
+                                for( v = tar->firstDelta; v < lv; v++ )
+                                        affine_mul_vec( x42->morphNorm[v].norm, rootMatrix, x42->morphNorm[v].norm );
+                        }
+
+                        if( x42->morphTan )
+                        {
+                                for( v = tar->firstDelta; v < lv; v++ )
+                                {
+                                        affine_mul_vec( x42->morphTan[v].tan, rootMatrix, x42->morphTan[v].tan );
+                                        affine_mul_vec( x42->morphTan[v].bit, rootMatrix, x42->morphTan[v].bit );
+                                }
+                        }
+                }
+        }
+
+        return true;
+}
+
-X42_EXPORT size_t X42_CALL x42_GetAnimBoneMatricesSize( const x42data_t *x42 )
-{
@@ -515 +607 @@
-
-X42_EXPORT affine_t* X42_CALL x42_GetAnimBoneMatrices( void *out_buffer, const x42data_t *x42,
-const affine_t *rootMatrix, 
+
-{
-        uint i;
@@ -583 +675 @@
-                if( b->parentIdx != X42_MODEL_BONE )
-                        affine_mul( ret + i, ret + b->parentIdx, ret + i );
-rootMatrix
-
+x42->header.runFlags & X42_RF_ROOT_MATRIX
+&x42->
-        }
-

branches/morph-targets/libx42/write.c

@@ -218 +218 @@
-        get_stream_bounds( bounds, 3, (float*)x42->scaleValues, h->numScaleValues, sizeof( vec3_t ) );
-
-( bounds[0][0], bounds[1
-( bounds[0][1], bounds[1
+3( bounds[0][0], bounds[1][0], bounds[2
+3( bounds[0][1], bounds[1][1], bounds[2
-
-        get_stream_bounds( pack->vertPosPack, 3, (float*)&x42->vertPos[0].pos, h->numVerts, sizeof( x42vertAnim_t ) );

branches/morph-targets/x42maya/modelexporter-gather.cpp

@@ -359 +359 @@
-}
-
-esh_part
+odel_exporter::mesh_part >
-{
-        MStatus stat;