Changeset 604

Timestamp:

07/17/08 22:22:36 (4 months ago)

Author:

phill

Message:

o Merged in some patches made in another branch.
o Exposing x42_GetAnimInfluenceMatrices to client code.

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) (1 diff)
• branches/morph-targets/libx42/local.h (modified) (1 diff)
• branches/morph-targets/libx42/platform/null/null_platform.c (modified) (2 diffs)
• branches/morph-targets/libx42/vertattribs.c (modified) (1 diff)

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

@@ -187 +187 @@
-}
-
-
-
-
-
-
+
+
+
-        const x42group_t *grp;
-        affine_t infs[X42_MAX_INFLUENCES_PER_BATCH_V5];
-
-        grp = x42->groups + groupNum;
@@ -208 +205 @@
-                        affine_cpy( infs + i, &inf->meshToBone );
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        maxInfs = grp->maxVertInfluences > 0 ? grp->maxVertInfluences : 1;
-
@@ -243 +252 @@
-        return true;
-}
+
+X42_EXPORT size_t X42_CALL x42_GetAnimInfluenceMatricesSize( const x42data_t *x42, uint groupNum )
+{
+#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" );
+        demand_rz( groupNum < x42->header.numGroups, X42_ERR_OUTOFRANGE, "group number out of range" );
+#endif
+
+        return sizeof( affine_t ) * x42->groups[groupNum].numInfluences;
+}
+
+X42_EXPORT affine_t* X42_CALL x42_GetAnimInfluenceMatrices( void *out_buffer, const x42data_t *x42,
+        const affine_t *boneMats, uint groupNum, 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" );
+        demand_rn( groupNum < x42->header.numGroups, X42_ERR_OUTOFRANGE, "group number out of range" );
+#endif
+
+        REF_PARAM( opts );
+
+        ret = (affine_t*)out_buffer;
+
+        anim_skin_get_influences( ret, x42, groupNum, boneMats );
+
+        return ret;
+}

branches/morph-targets/libx42/anim.c

@@ -72 +72 @@
-        x42tempMem_t *tmpMem, x42opts_t *opts )
-{
+#ifndef LIBX42_NO_PARAM_VALIDATION
-        uint i;
+#endif
-
-        x42memStream_t vPos;

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

@@ -474 +474 @@
-*/
-
+X42_EXPORT size_t X42_CALL x42_GetAnimInfluenceMatricesSize( const x42data_t *x42, uint groupNum );
+X42_EXPORT affine_t* X42_CALL x42_GetAnimInfluenceMatrices( void *out_buffer, const x42data_t *x42,
+        const affine_t *boneMats, uint groupNum, x42opts_t *opts );
+
-#define X42_MEMSTREAM_UNRESTRICTED      0
-#define X42_MEMSTREAM_WRITE_ONLY        0x00000001

branches/morph-targets/libx42/local.h

@@ -125 +125 @@
-
-/* internal calls */
+void anim_skin_get_influences( affine_t *infs, const x42data_t *x42, uint groupNum, const affine_t *boneMats );
+
-bool anim_morph_vertices( vec4_t * RESTRICT oPos, x42vertNormal_t * RESTRICT oNorm, x42vertTangent_t * RESTRICT oTan,
-        const x42data_t *x42, uint groupNum, const x42morphState_t *morphs, uint numMorphs, bool renormalize );

branches/morph-targets/libx42/platform/null/null_platform.c

@@ -103 +103 @@
-}
-
-CopyStreamToS
+copy_stream_to_s
-        size_t elemSize, uint numElems, x42opts_t *opts )
-{
@@ -114 +114 @@
-        return false;
-}
+
+bool opt_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,
+                const x42data_t *x42, uint groupNum, const affine_t *boneMats, x42opts_t *opts )
+{
+        REF_PARAM( oPos );
+        REF_PARAM( oNorm );
+        REF_PARAM( oTan );
+        REF_PARAM( oBin );
+        REF_PARAM( iPos );
+        REF_PARAM( iNorm );
+        REF_PARAM( iTan );
+        REF_PARAM( x42 );
+        REF_PARAM( groupNum );
+        REF_PARAM( boneMats );
+        REF_PARAM( opts );
+
+        return false;
+}
+
+bool opt_morph_vertices( vec4_t * RESTRICT oPos, x42vertNormal_t * RESTRICT oNorm, x42vertTangent_t * RESTRICT oTan, const x42data_t *x42, uint groupNum, const x42morphState_t *morphs, uint numMorphs, bool renormalize, x42opts_t *opts )
+{
+        REF_PARAM( oPos );
+        REF_PARAM( oNorm );
+        REF_PARAM( oTan );
+        REF_PARAM( x42 );
+        REF_PARAM( groupNum );
+        REF_PARAM( morphs );
+        REF_PARAM( numMorphs );
+        REF_PARAM( renormalize );
+        REF_PARAM( opts );
+
+        return false;
+}
+

branches/morph-targets/libx42/vertattribs.c

@@ -84 +84 @@
-                return true;
-
-
+&& x42->vertTc 
-                copy_tc( x42->vertTc + g->firstVert, g->numVerts, oTc );
-
-
+&& x42->vertCl 
-        {
-                switch( color_type )