Changeset 605

Timestamp:

07/17/08 22:38:24 (4 months ago)

Author:

phill

Message:

o Extra entry point. Can now build all influences or just some.

Files:

• branches/morph-targets/libx42/anim-skin.c (modified) (6 diffs)
• branches/morph-targets/libx42/include/x42.h (modified) (2 diffs)
• branches/morph-targets/libx42/local.h (modified) (1 diff)

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

@@ -187 +187 @@
-}
-
-
+group_
-{
-        uint i;
@@ -207 +207 @@
-}
-
+void anim_skin_get_influences( affine_t *infs, const x42data_t *x42, const affine_t *boneMats )
+{
+        uint i;
+        for( i = 0; i < x42->header.numInfluences; i++ )
+        {
+                const x42influence_t *inf = x42->influences + i;
+
+                if( inf->bone != X42_MODEL_BONE )
+                        affine_mul( infs + i, boneMats + inf->bone, &inf->meshToBone );
+                else if( x42->header.runFlags & X42_RF_ROOT_MATRIX )
+                        affine_mul( infs + i, &x42->rootMatrix, &inf->meshToBone );
+                else
+                        affine_cpy( infs + i, &inf->meshToBone );
+        }
+}
+
-bool anim_skin_vertices( x42memStream_t *oPos, x42memStream_t *oNorm, x42memStream_t *oTan, x42memStream_t *oBin,
-        x42memStream_t *iPos, x42vertNormal_t * RESTRICT iNorm, x42vertTangent_t * RESTRICT iTan,
@@ -215 +231 @@
-        affine_t infs[X42_MAX_INFLUENCES_PER_BATCH_V5];
-
-
+group_
-
-        grp = x42->groups + groupNum;
@@ -253 +269 @@
-}
-
-
+Group
-{
-#ifndef LIBX42_NO_PARAM_VALIDATION
@@ -264 +280 @@
-}
-
-
+Group
-        const affine_t *boneMats, uint groupNum, x42opts_t *opts )
-{
@@ -281 +297 @@
-        ret = (affine_t*)out_buffer;
-
-
+group_
-
-        return ret;
-}
+
+X42_EXPORT size_t X42_CALL x42_GetAnimInfluenceMatricesSize( const x42data_t *x42 )
+{
+#ifndef LIBX42_NO_PARAM_VALIDATION
+        demand_rz( x42 != NULL, X42_ERR_BADPTR, "x42 is NULL" );
+        demand_rz( x42_ValidateHeader( &x42->header ), X42_ERR_BADDATA, "invalid x42 header data" );
+#endif
+
+        return sizeof( affine_t ) * x42->header.numInfluences;
+}
+
+X42_EXPORT affine_t* X42_CALL x42_GetAnimInfluenceMatrices( void *out_buffer, const x42data_t *x42,
+        const affine_t *boneMats, x42opts_t *opts )
+{
+        affine_t *ret;
+
+#ifndef LIBX42_NO_PARAM_VALIDATION
+        demand_rn( x42 != NULL, X42_ERR_BADPTR, "x42 is NULL" );
+        demand_rn( x42_ValidateHeader( &x42->header ), X42_ERR_BADDATA, "invalid x42 header data" );
+        demand_rn( out_buffer != NULL, X42_ERR_BADPTR, "out_buffer is NULL" );
+        demand_rn( boneMats != NULL, X42_ERR_BADPTR, "boneMats is NULL" );
+#endif
+
+        REF_PARAM( opts );
+
+        ret = (affine_t*)out_buffer;
+
+        anim_skin_get_influences( ret, x42, boneMats );
+
+        return ret;
+}

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

@@ -445 +445 @@
-X42_EXPORT size_t X42_CALL x42_GetAnimBoneMatricesSize( const x42data_t *x42 );
-X42_EXPORT size_t X42_CALL x42_GetAnimTagMatricesSize( const x42data_t *x42 );
+X42_EXPORT size_t X42_CALL x42_GetAnimInfluenceMatricesSize( const x42data_t *x42 );
-
-X42_EXPORT affine_t* X42_CALL x42_GetAnimBoneMatrices( void *out_buffer, const x42data_t *x42,
-        const x42animLerp_t *lerp, x42opts_t *opts );
-X42_EXPORT affine_t* X42_CALL x42_GetAnimTagMatrices( void *out_buffer, const x42data_t *x42,
+        const affine_t *boneMats, x42opts_t *opts );
+X42_EXPORT affine_t* X42_CALL x42_GetAnimInfluenceMatrices( void *out_buffer, const x42data_t *x42,
-        const affine_t *boneMats, x42opts_t *opts );
-
@@ -474 +477 @@
-*/
-
-
-
+Group
+Group
-        const affine_t *boneMats, uint groupNum, x42opts_t *opts );
-

branches/morph-targets/libx42/local.h

@@ -125 +125 @@
-
-/* internal calls */
-
+
+
-
-bool anim_morph_vertices( vec4_t * RESTRICT oPos, x42vertNormal_t * RESTRICT oNorm, x42vertTangent_t * RESTRICT oTan,