Changeset 520

Timestamp:

02/25/08 01:01:21 (11 months ago)

Author:

phill

Message:

o Now exports morph shapes.

Files:

• branches/morph-targets/libx42make/modelbuilder-write.cpp (modified) (9 diffs)

branches/morph-targets/libx42make/modelbuilder-write.cpp

@@ -125 +125 @@
-        std::vector< vec2 >                                     vertTc;
-        std::vector< rgba >                                     vertCl;
+        std::vector< x42morphTarget_t >         morphs;
+        std::vector< index >                            morph_indices;
+        std::vector< vec4 >                                     morph_pos;
+        std::vector< x42morphNormal_t >         morph_norm;
+        std::vector< x42morphTangent_t >        morph_tangent;
-
-        std::vector< index >                            indices;
@@ -136 +141 @@
-        void pack_tags( const model_builder &data );
-        void pack_groups( const model_builder &data );
+        void pack_morph_shapes( const model_builder &data );
-        void pack_anims( const model_builder &data );
-        void fixup_names();
@@ -150 +156 @@
-        pack_tags( data );
-        pack_groups( data );
+        pack_morph_shapes( data );
-        pack_anims( data );
-
@@ -192 +199 @@
-        copy_vector_data( (vec2*)dst->vertTc, vertTc );
-        copy_vector_data( (rgba*)dst->vertCl, vertCl );
+
+        copy_vector_data( dst->morphIndices, morph_indices );
+        copy_vector_data( (vec4*)dst->morphPos, morph_pos );
+        copy_vector_data( dst->morphNorm, morph_norm );
+        copy_vector_data( dst->morphTan, morph_tangent );
-
-        copy_vector_data( dst->indices, indices );
@@ -440 +452 @@
-
-        lods.resize( data.lods.size() );
-uin
+size_
-        {
-                const_lod_ptr inLod = data.lods[l];
@@ -448 +460 @@
-                outLod.firstGroup = (u16)groups.size();
-
-uin
+size_
-                {
-                        const_group_ptr in = inLod->groups[i];
-                        x42group_t out;
-                        
+                        if( !in->geometry.is_valid() )
+                                throw validation_error();
+
-                        memset( &out, 0, sizeof( out ) );
-
@@ -544 +559 @@
-}
-
+inline bool is_zero( const vec3 &v, float tol = 0.001F )
+{
+        return fabsf( v.x ) < tol &&
+                fabsf( v.y ) < tol &&
+                fabsf( v.z ) < tol;
+}
+
+void model_data_builder::pack_morph_shapes( const model_builder &data )
+{
+        size_t group_num = 0;
+        for( size_t l = 0; l < lods.size(); l++ )
+        {
+                const_lod_ptr lod = data.lods[l];
+                
+                for( size_t i = 0; i < lod->groups.size(); i++ )
+                {
+                        const geometry &geom = lod ->groups[i]->geometry;
+
+                        if( !geom.is_valid() )
+                                throw validation_error();
+
+                        for( size_t m = 0; m < geom.morph_targets.size(); i++ )
+                        {
+                                const_morph_target_ptr morph = geom.morph_targets[i];
+
+                                x42morphTarget_t out;
+                                memset( &out, 0, sizeof( out ) );
+
+                                out.targetName = _sb.intern_string( morph->name() );
+                                out.targetGroup = (u16)group_num;
+
+                                out.firstDelta = (uint)morph_indices.size();
+
+                                for( size_t i = 0; i < geom.vertex_count(); i++ )
+                                {
+                                        const vertex_geometry &bg = geom.base_shape[i];
+                                        const vertex_geometry &mg = morph->vertices[i];
+
+                                        vec3 dp = mg.position - bg.position;
+                                        vec3 dn = mg.normal - bg.normal;
+                                        vec3 dt = mg.tangent - bg.tangent;
+                                        vec3 db = mg.bitangent - bg.bitangent;
+
+                                        if( is_zero( dp ) && is_zero( dn ) &&
+                                                is_zero( dt ) && is_zero( db ) )
+                                                continue;
+
+                                        morph_indices.push_back( (index)i );
+                                        morph_pos.push_back( vec4c( dp, 0 ) );
+
+                                        x42morphNormal_t outn;
+                                        copy_vec3( outn.norm, dn );
+                                        outn.pad = 0;
+                                        morph_norm.push_back( outn );
+
+                                        x42morphTangent_t outt;
+                                        copy_vec3( outt.tan, dt );
+                                        copy_vec3( outt.bit, db );
+                                        outt.nfac0 = outt.nfac1 = 0;
+                                        morph_tangent.push_back( outt );
+                                }
+
+                                out.numDeltas = (uint)morph_indices.size() - out.firstDelta;
+                                morphs.push_back( out );
+                        }
+
+                        group_num++;
+                }
+        }
+}
+
-void model_data_builder::pack_anims( const model_builder &data )
-{
@@ -581 +667 @@
-        fixup_name_refs( bones, map );
-        fixup_name_refs( tags, map );
+        
+        for( uint i = 0; i < morphs.size(); i++ )
+                morphs[i].targetName = map[morphs[i].targetName];
-
-        for( uint i = 0; i < groups.size(); i++ )
@@ -646 +735 @@
-        h.numGroups = (u16)groups.size();
-
+        h.numMorphTargets = (u16)morphs.size();
+        h.numMorphDeltas = (u32)morph_indices.size();
+
-        h.numVerts = (u32)vertPos.size();
-        h.numIndices = (u32)indices.size();