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

Timestamp:

07/17/15 13:34:28 (10 years ago)

Author:

epyon

Message:

• mesh formats now support string loading via string_table
• nmd string_table dump
• fixes all around

File:

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

trunk/src/formats/nmd_loader.cc

@@ -47 +47 @@
 {
         data_channel_set* result = m_meshes[ index ];
-//      if ( m_strings ) data_channel_set_creator( result ).set_name( m_strings->get( m_mesh_names[ index ] ) );
         m_meshes[ index ] = nullptr;
         return result;
@@ -68 +67 @@
 {
         for ( auto mesh : m_meshes ) if ( mesh ) delete mesh;
-        if ( m_strings )   delete m_strings;
         if ( m_node_data ) delete m_node_data;
         m_meshes.clear();
-//      m_mesh_names.clear();
-//      m_node_names.clear();
 
         m_node_data  = nullptr;
         m_node_array = nullptr;
-        m_strings    = nullptr;
 }
 
@@ -92 +87 @@
 bool nv::nmd_loader::load_strings( stream& source )
 {
-        NV_ASSERT( m_strings == nullptr, "MULTIPLE STRING ENTRIES!" );
+        if ( !m_strings ) return true;
         // TODO: load strings optionally
-        m_strings = new string_table( source );
+        string_table* strings = new string_table( source );
+        m_strings->insert( strings );
+        delete strings;
         return true;
 }
@@ -110 +107 @@
                 skip_attributes( source, element_header.attributes );
                 NV_ASSERT( element_header.type == nmd_type::NODE, "NODE expected!" );
-//              m_node_names.push_back( element_header.name );
-                load_node( source, &m_node_array[i], element_header );
+                m_node_array[i].data = data_channel_set_creator::create_set( element_header.children );
+                load_channel_set( source, m_node_array[i].data, element_header );
         }
         m_node_data = new mesh_nodes_data( e.name, e.children, m_node_array, animation_header.frame_rate, animation_header.duration, animation_header.flat );
-        return true;
-}
-
-bool nv::nmd_loader::load_node( stream& source, mesh_node_data* data, const nmd_element_header& e )
-{
-        data->data = data_channel_set_creator::create_set( e.children );
-        if ( e.children > 0 )
-        {
-                load_channel_set( source, data->data, e );
-        }
-        data_channel_set_creator access( data->data );
-        access.set_name( e.name );
-        access.set_parent_id( e.parent_id );
-        access.set_transform( e.transform );
         return true;
 }
@@ -148 +131 @@
                 load_channel( source, channel_set );
         }
+        data_channel_set_creator access( channel_set );
+        access.set_name( e.name );
+        access.set_parent_id( e.parent_id );
+        access.set_transform( e.transform );
         return true;
 }
@@ -155 +142 @@
         if ( m_node_data )
         {
-//              if ( m_strings )
-//              {
-//                      for ( uint32 i = 0; i < m_node_data->get_count(); ++i )
-//                      {
-//                              m_node_array[i].name = m_strings->get( m_node_names[i] );
-//                              m_node_array[i].name_hash = hash_string< uint64 >( m_strings->get( m_node_names[i] ) );
-//                      }
-//              }
                 mesh_nodes_data* result = m_node_data;
                 m_node_data = nullptr;
@@ -203 +182 @@
         nmd_element_header eheader;
         eheader.type = nmd_type::NODE;
-        //              eheader.name     = strings->insert( node->name );
         eheader.children   = static_cast<uint16>( chan_count );
         eheader.size       = chan_size;