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

Timestamp:

07/20/14 23:45:56 (11 years ago)

Author:

epyon

Message:

• nmd format made more robust
• full implementation of runtime animation format decoding

File:

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

trunk/src/formats/nmd_loader.cc

@@ -22 +22 @@
                 switch ( element_header.type )
                 {
-                case nmd_type::MESH           : load_mesh( source, element_header.children ); break;
-                case nmd_type::ANIMATION      : load_animation( source, element_header.children ); break;
-                case nmd_type::BONE_ARRAY     : load_bones( source, element_header.children ); break;
+                case nmd_type::MESH           : load_mesh( source, element_header ); break;
+                case nmd_type::ANIMATION      : load_animation( source, element_header ); break;
+                case nmd_type::BONE_ARRAY     : load_bones( source, element_header ); break;
                 case nmd_type::STRING_TABLE   : load_strings( source ); break;
                 default: NV_ASSERT( false, "UNKNOWN NMD ELEMENT!" ); break;
@@ -32 +32 @@
 }
 
-bool nv::nmd_loader::load_mesh( stream& source, uint32 children )
+bool nv::nmd_loader::load_mesh( stream& source, const nmd_element_header& e )
 {
         mesh_data* mesh = new mesh_data();
-        for ( uint32 s = 0; s < children; ++s )
+        for ( uint32 s = 0; s < e.children; ++s )
         {
                 nmd_element_header element_header;
@@ -82 +82 @@
 }
 
-bool nv::nmd_loader::load_bones( stream& source, uint32 children )
+bool nv::nmd_loader::load_bones( stream& source, const nmd_element_header& e )
 {
         NV_ASSERT( m_bone_data == nullptr, "MULTIPLE BONE ENTRIES!" );
         m_bone_data = new nmd_bone_data;
-        m_bone_data->bones = new nmd_bone[ children ];
-        m_bone_data->count = (uint16)children;
-        source.read( m_bone_data->bones, sizeof( nmd_bone ), children );
+        m_bone_data->bones = new nmd_bone[ e.children ];
+        m_bone_data->count = (uint16)e.children;
+        source.read( m_bone_data->bones, sizeof( nmd_bone ), e.children );
         return true;
 }
@@ -114 +114 @@
 
 
-bool nv::nmd_loader::load_animation( stream& source, uint32 children )
+bool nv::nmd_loader::load_animation( stream& source, const nmd_element_header& e )
 {
         NV_ASSERT( m_animation == nullptr, "MULTIPLE ANIMATION ENTRIES!" );
@@ -123 +123 @@
         m_animation->duration   = header.duration;
         m_animation->flat       = header.flat;
-        m_animation->node_count = (uint16)children;
-        m_animation->nodes      = new nmd_node[ children ];
-        for ( uint32 i = 0; i < children; ++i )
+        m_animation->node_count = (uint16)e.children;
+        m_animation->nodes      = new nmd_node[ e.children ];
+        for ( uint32 i = 0; i < e.children; ++i )
         {
                 nmd_element_header element_header;
                 source.read( &element_header, sizeof( element_header ), 1 );
                 NV_ASSERT( element_header.type == nmd_type::ANIMATION_NODE, "ANIMATION_NODE expected!" );
+                m_animation->nodes[i].name          = element_header.name;
 
                 uint16 ch_count = element_header.children;
@@ -135 +136 @@
                 nmd_animation_node_header node_header;
                 source.read( &node_header, sizeof( node_header ), 1 );
-                m_animation->nodes[i].name          = node_header.name;
                 m_animation->nodes[i].parent_id     = node_header.parent_id;
                 m_animation->nodes[i].transform     = node_header.transform;