Changeset 502

Timestamp:

02/12/08 17:03:35 (11 months ago)

Author:

phill

Message:

o X42_VER_V6 write code.

Files:

• branches/morph-targets/libx42.net/Enums.h (modified) (1 diff)
• branches/morph-targets/libx42/include/x42.h (modified) (1 diff)
• branches/morph-targets/libx42/write.c (modified) (9 diffs)

branches/morph-targets/libx42.net/Enums.h

@@ -55 +55 @@
-{
-        Version5                                = X42_VER_V5,
+        Version6                                = X42_VER_V6,
-
-        CurrentVersion                  = X42_CURRENT_VERSION,

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

@@ -369 +369 @@
-} x42outStream_t;
-
-5
+6
-
-/*

branches/morph-targets/libx42/write.c

@@ -22 +22 @@
-
-#include "local.h"
-
-static void fix_persist_flags( uint *pf, const x42data_t *x42 );
-
-X42_EXPORT size_t X42_CALL x42_GetFileSize( const x42data_t *x42, uint persistFlags )
-{
-        uint i;
-
-        size_t ret = 0;
-        const x42header_t *h;
-
-#ifndef LIBX42_NO_PARAM_VALIDATION
-        demand_rz( x42 != NULL, X42_ERR_BADPTR, "Expected valid x42data_t pointer, got NULL instead." );
-        demand_rz( x42_ValidateHeader( &x42->header ), X42_ERR_BADDATA, "Invalid x42 file header." );
-#endif
-
-        h = &x42->header;
-
-        switch( h->ident.version )
-        {
-        case X42_VER_V5:
-                ret += sizeof( x42Header_v5_t );
-                break;
-
-        default:
-                return 0;
-        }
-
-        fix_persist_flags( &persistFlags, x42 );
-
-        ret = align( ret, 8 );
-        ret += sizeof( x42Bone_v5_t ) * h->numBones;
-        ret = align( ret, 8 );
-        ret += sizeof( x42AnimGroup_v5_t ) * h->numAnimGroups;
-
-        ret += sizeof( u16[3] ) * h->numPosValues;
-        if( h->modelFlags & X42_MF_UNIFORM_SCALE )
-                ret += sizeof( u16 ) * h->numScaleValues;
-        else
-                ret += sizeof( u16[3] ) * h->numScaleValues;
-        ret += sizeof( s16[4] ) * h->numRotValues;
-
-        ret = align( ret, 8 );
-        ret += sizeof( x42KeyStreamEntry_v5_t ) * h->keyStreamLength;
-        ret = align( ret, 8 );
-        ret += sizeof( x42Animation_v5_t ) * h->numAnims;
-
-        ret = align( ret, 8 );
-        ret += sizeof( x42Tag_v5_t ) * h->numTags;
-        ret = align( ret, 8 );
-        ret += sizeof( x42Influence_v5_t ) * h->numInfluences;
-
-        ret = align( ret, 8 );
-        ret += sizeof( x42LodRange_v5_t ) * h->numLods;
-        ret = align( ret, 8 );
-        ret += sizeof( x42Group_v5_t ) * h->numGroups;
-
-        ret = align( ret, 2 );
-        ret += sizeof( u16[3] ) * h->numVerts;
-        for( i = 0; i < h->numGroups; i++ )
-        {
-                if( x42->groups[i].maxVertInfluences )
-                        ret += sizeof( u8 ) * ((x42->groups[i].maxVertInfluences - 1) * 2 + 1);
-        }
-
-        if( persistFlags & X42_PERSIST_NORMALS )
-                ret += sizeof( s8[3] ) * h->numVerts;
-
-        if( persistFlags & X42_PERSIST_TANGENT_BASIS )
-                ret += sizeof( s8[7] ) * h->numVerts;
-
-        if( persistFlags & X42_PERSIST_TEXTURE_COORDINATES )
-        {
-                ret = align( ret, 2 );
-                ret += sizeof( u16[2] ) * h->numVerts;
-        }                                                
-
-        if( persistFlags & X42_PERSIST_COLORS )
-        {
-                ret = align( ret, 4 );
-                ret += sizeof( rgba_t ) * h->numVerts;
-        }
-        
-        ret = align( ret, 4 );
-        ret += sizeof( x42index_t ) * h->numIndices;
-
-        return ret;
-}
-
-static void fix_persist_flags( uint *pf, const x42data_t *x42 )
@@ -122 +35 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        const x42header_t *in = &x42->header;
@@ -157 +148 @@
-        out->numLods = in->numLods;
-        out->numGroups = in->numGroups;
+        out->numMorphTargets = in->numMorphTargets;
-
-        out->numVerts = in->numVerts;
-        out->numIndices = in->numIndices;
+        out->numMorphDeltas = in->numMorphDeltas;
-
-        out->boundingSphere = in->boundingSphere;
@@ -213 +206 @@
-}
-
-5
-5
+6
+6
-{
-        vec2_t bounds[3];
@@ -232 +225 @@
-        if( x42->vertTc )
-                get_stream_bounds( pack->vertTcPack, 2, (float*)x42->vertTc, h->numVerts, sizeof( vec2_t ) );
+
+        get_stream_bounds( pack->morphPosPack, 3, (float*)x42->morphPos, h->numMorphDeltas, sizeof( vec4_t ) );
-}
-
@@ -414 +409 @@
-
-        x42Header_ident_t ident;
-5
-5
+6
+6
-
-#ifndef LIBX42_NO_PARAM_VALIDATION
@@ -426 +421 @@
-
-        ident = h->ident;
-5
+6
-
-        fix_persist_flags( &persist_flags, x42 );
@@ -508 +503 @@
-        checked_write_a( x42->lods, sizeof( x42LodRange_v5_t ) * h->numLods, 8 );
-        checked_write_a( x42->groups, sizeof( x42Group_v5_t ) * h->numGroups, 8 );
+        checked_write_a( x42->morphTargets, sizeof( x42morphTarget_t ) * h->numMorphTargets, 8 );
-
-        checked_align( 2 );
@@ -572 +568 @@
-        checked_write_a( x42->indices, sizeof( x42index_t ) * h->numIndices, 4 );
-
+        checked_write_a( x42->morphIndices, sizeof( x42index_t ) * h->numIndices, 4 );
+
+        checked_align( 2 );
+        stat = write_packed_floats( file_stream, &outPos, pack.morphPosPack, 3,
+                (float*)x42->morphPos, h->numMorphDeltas, sizeof( vec4_t ) );
+        write_check();
+
+        if( persist_flags & X42_PERSIST_NORMALS )
+        {
+                stat = write_packed_floats_s8n( file_stream, &outPos, 3,
+                        (float*)&x42->morphNorm[0].norm, h->numMorphDeltas, sizeof( x42morphNormal_t ) );
+                write_check();
+        }
+
+        if( persist_flags & X42_PERSIST_TANGENT_BASIS )
+        {
+                stat = write_packed_floats_s8n( file_stream, &outPos, 7,
+                        (float*)&x42->morphTan[0].tan, h->numMorphDeltas, sizeof( x42morphTangent_t ) );
+                write_check();
+        }
+
-        checked_write( x42->strings, sizeof( u8 ) * h->nameBlobLen );
-