Changeset 285 for trunk/src/formats/nmd_loader.cc

Timestamp:

07/21/14 02:19:34 (11 years ago)

Author:

epyon

Message:

• full pure data model for animation
• all loaders now use pure data model instead of the template/virtual one

File:

• trunk/src/formats/nmd_loader.cc (modified) (5 diffs)

trunk/src/formats/nmd_loader.cc

@@ -138 +138 @@
                 m_animation->nodes[i].parent_id     = node_header.parent_id;
                 m_animation->nodes[i].transform     = node_header.transform;
-                m_animation->nodes[i].channel_count = ch_count;
-                m_animation->nodes[i].channels      = nullptr;
+                m_animation->nodes[i].data          = nullptr;
                 if ( ch_count > 0 )
                 {
-                        m_animation->nodes[i].channels      = new key_raw_channel* [ch_count];
+                        key_data* kdata = new key_data;
+                        m_animation->nodes[i].data = kdata;
                         for ( uint32 c = 0; c < ch_count; ++c )
                         {
@@ -151 +151 @@
                                 key_raw_channel* channel = key_raw_channel::create( cheader.format, cheader.count );
                                 source.read( channel->data, channel->desc.size, channel->count );
-                                m_animation->nodes[i].channels[c] = channel;
+                                kdata->add_channel( channel );
                         }
                 }
@@ -168 +168 @@
         {
                 nmd_node& node = m_animation->nodes[n];
-                key_animation_data* keys = nullptr;
-                if ( node.channel_count > 1 )
-                {
-                        keys = new nv::key_vectors_prs( node.channels[0], node.channels[1], node.channels[2] );
-                }
-                else if ( node.channel_count == 1 )
-                {
-                        keys      =  new nv::transform_vector( node.channels[0] );
-                        node.channels[0] = nullptr;
-                        node.channel_count = 0;
-                }
-                m_data.push_back( keys );
+                m_data.push_back( node.data );
+                node.data = nullptr;
         }
 
@@ -239 +229 @@
                         nv::mat4 node_mat( node->transform );
 
-                        if ( m_data[n] && !m_data[n]->empty() )
+                        if ( m_data[n] )
                         {
                                 node_mat = m_data[n]->get_matrix( anim_time );
@@ -257 +247 @@
         mat4 node_mat( node->transform );
 
-        if ( m_data[ node_id ] && !m_data[ node_id ]->empty() )
+        if ( m_data[ node_id ] )
         {
                 node_mat = m_data[ node_id ]->get_matrix( time );