Changeset 282 for trunk/src/formats/md5_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/md5_loader.cc (modified) (4 diffs)

trunk/src/formats/md5_loader.cc

@@ -397 +397 @@
                                 remove_quotes( joint.name );
                                 joint_infos.push_back( joint );
-                                m_joints.push_back( md5_joint( joint.parent_id, m_num_frames ) );
+                                m_joints.emplace_back( joint.parent_id );
                                 next_line( sstream ); 
                         }
@@ -490 +490 @@
         for ( size_t i = 0; i < m_num_joints; ++i )
         {
-                const transform_vector& keys = m_joints[i].keys;
-                skeleton[i] = interpolate( keys.get(frame0), keys.get(frame1), interpolation );
+                const std::vector< transform >& keys = m_joints[i].keys;
+                skeleton[i] = interpolate( keys[frame0], keys[frame1], interpolation );
         }
 }
@@ -519 +519 @@
                 if ( parent_id >= 0 ) // Has a parent joint
                 {
-                        const transform_vector& ptv = m_joints[ size_t( parent_id ) ].keys;
+                        const std::vector< transform >& ptv = m_joints[ size_t( parent_id ) ].keys;
                         transform ptr;
-                        if ( ptv.size() > index ) ptr = ptv.get( index );
+                        if ( ptv.size() > index ) ptr = ptv[ index ];
                         glm::vec3 rot_pos = ptr.get_orientation() * pos;
 
@@ -530 +530 @@
                 }
 
-                m_joints[i].keys.insert( transform( pos, orient ) );
+                m_joints[i].keys.push_back( transform( pos, orient ) );
         }
 }