Changeset 282 for trunk/src/formats/md3_loader.cc

Timestamp:

07/10/14 00:29:34 (11 years ago)

Author:

epyon

Message:

• key_slots - another template hell similar to vertex definitions
• animation data is now stored using key_raw_channel's similarly to mesh_raw_channels
• automatic compile-time templated interpolation generation for any type of animation key
• QUAT and TRANSFORM as registered types for channels
• a ton of minor cleanups
• do not open vertex.hh if you want to stay sane

File:

• trunk/src/formats/md3_loader.cc (modified) (4 diffs)

trunk/src/formats/md3_loader.cc

@@ -275 +275 @@
 bool nv::md3_loader::load( stream& source )
 {
-        m_tags.clear();
-
         m_md3 = (void*)(new md3_t);
         if ( !read_md3( (md3_t*)m_md3, source ) )
@@ -285 +283 @@
 }
 
-void nv::md3_loader::load_tags( transform_vector& t, const std::string& tag )
+nv::key_raw_channel* nv::md3_loader::load_tags( const std::string& tag )
 {
         md3_t* md3 = (md3_t*)m_md3;
+        key_raw_channel* result = key_raw_channel::create<md3_key>( md3->header.num_frames );
+        // TODO: is this brain damaged in efficiency (loop nest order) or what?
         for ( sint32 f = 0; f < md3->header.num_frames; ++f )
         {
@@ -300 +300 @@
                                 vec3 axisy  ( md3_vec3( rtag.axis[2] ) );
                                 vec3 origin ( md3_vec3( rtag.origin )  );
-                                t.insert( transform( origin, quat( mat3( axisx, axisy, axisz ) ) ) );
+                                ((md3_key*)(result->data))[f].tform = transform( origin, quat( mat3( axisx, axisy, axisz ) ) );
                         }
                 }
 
         }
+        return result;
 }
 
@@ -408 +409 @@
                 const md3_tag_t& rtag = md3->tags[i + md3->header.num_tags];
                 std::string name( (char*)(rtag.name) );
-                load_tags( result->get_map()[ name ], name );
+                nv::key_raw_channel* keys = load_tags( name );
+                result->insert( name, keys );
         }
         return result;