Changeset 431 for trunk/src/formats

Timestamp:

07/21/15 13:31:23 (10 years ago)

Author:

epyon

Message:

• hash storage type
• string hash storage type
• several minor fixes
• more cleanups needed

Location:

trunk/src/formats

Files:

• assimp_loader.cc (modified) (1 diff)
• md3_loader.cc (modified) (1 diff)
• nmd_loader.cc (modified) (1 diff)

trunk/src/formats/assimp_loader.cc

@@ -288 +288 @@
         const aiScene* scene = reinterpret_cast<const aiScene*>( m_scene );
         mesh_nodes_data* result = new mesh_nodes_data( make_name( "bones" ) );
-        unordered_map< uint64, uint16 > names;
+        hashed_table< shash64, uint16 > names;
         for ( unsigned int m = 0; m < m_mesh_count; ++m )
         {

trunk/src/formats/md3_loader.cc

@@ -420 +420 @@
         uint32 node_count = uint32( md3->header.num_tags );
         if ( node_count == 0 ) return nullptr;
-        mesh_nodes_data* result = new mesh_nodes_data( m_strings ? m_strings->insert( "tags" ) : 0 );
+        mesh_nodes_data* result = new mesh_nodes_data( m_strings ? m_strings->insert( "tags" ) : shash64() );
         for ( uint32 i = 0; i < node_count; ++i )
         {

trunk/src/formats/nmd_loader.cc

@@ -233 +233 @@
         sheader.children   = 0;
         sheader.size       = strings.dump_size();
-        sheader.name       = 0;
+        sheader.name       = shash64();
         sheader.parent_id  = -1;
     sheader.attributes = 0;