Changeset 425 for trunk/src/formats/assimp_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/assimp_loader.cc (modified) (10 diffs)

trunk/src/formats/assimp_loader.cc

@@ -57 +57 @@
 
 
-nv::assimp_loader::assimp_loader( const std::string& a_ext, uint32 a_assimp_flags /*= 0 */ )
-        : m_scene( nullptr ), m_mesh_count(0)
+nv::assimp_loader::assimp_loader( string_table* strings, const string_view& a_ext, uint32 a_assimp_flags /*= 0 */ )
+        : mesh_loader( strings ), m_scene( nullptr ), m_mesh_count(0)
 {
         m_ext   = a_ext;
@@ -92 +92 @@
         char* data  = new char[ size ];
         source.read( data, size, 1 );
-        const aiScene* scene = aiImportFileFromMemory( data, size, m_assimp_flags, m_ext.c_str() );
+        const aiScene* scene = aiImportFileFromMemory( data, size, m_assimp_flags, m_ext.data() );
 
         if( !scene)
@@ -125 +125 @@
                 desc.initialize< assimp_plain_vtx >();
         data_channel_set_creator maccess( data );
-        maccess.set_name( mesh->mName.data );
+        const char* name = mesh->mName.data;
+        maccess.set_name( make_name( name ) );
         uint8*  cdata   = maccess.add_channel( desc, mesh->mNumVertices ).raw_data();
         uint16* indices = reinterpret_cast<uint16*>( maccess.add_channel< index_u16 >( mesh->mNumFaces * 3 ).raw_data() );
@@ -201 +202 @@
                 bones[m].data = data_channel_set_creator::create_set( 0 );
                 data_channel_set_creator access( bones[m].data );
-                access.set_name( hash_string< uint64 >( bone->mName.data ) );
+                const char* name = bone->mName.data;
+                access.set_name( make_name( name ) );
                 access.set_transform( offset );
         }
@@ -334 +336 @@
         mesh_node_data* bones = new mesh_node_data[ final_bones.size() ];
         raw_copy( final_bones.begin(), final_bones.end(), bones );
-        int name_;
-        return new mesh_nodes_data( /*"bones"*/0, final_bones.size(), bones );
+        return new mesh_nodes_data( make_name( "bones" ), final_bones.size(), bones );
 }
 
@@ -356 +357 @@
         load_node( index, data, root, 0, -1 );
 
-        int name;
-        return new mesh_nodes_data( /*anim->mName.data*/0, count, data, frame_rate, duration, flat );
+        return new mesh_nodes_data( make_name( static_cast<const char*>( anim->mName.data ) ), count, data, frame_rate, duration, flat );
 }
 
@@ -375 +375 @@
         const aiScene* scene = reinterpret_cast<const aiScene*>( m_scene );
         const aiNode*  node  = reinterpret_cast<const aiNode*>( vnode );
-        std::string name( node->mName.data );
+        string_view name( static_cast< const char* >( node->mName.data ) );
         const aiAnimation* anim  = scene->mAnimations[anim_id];
         const aiNodeAnim*  anode = nullptr;
@@ -382 +382 @@
         {
                 anode = anim->mChannels[i];
-                if ( std::string( anode->mNodeName.data ) == name ) break;
+                if ( string_view( static_cast< const char* >( anode->mNodeName.data ) ) == name ) break;
                 anode = nullptr;
         }
@@ -394 +394 @@
 
         data_channel_set_creator access( a_data.data );
-        access.set_name( hash_string< uint64 >( name.c_str() ) );
+        access.set_name( make_name( name ) );
         access.set_parent_id( parent_id );
         // This value is ignored by the create_transformed_keys, but needed by create_direct_keys!
@@ -468 +468 @@
         {
                 const aiMesh* mesh = scene->mMeshes[ m ];
-                data_channel_set_creator( &meshes[m] ).set_name( mesh->mName.data );
+                data_channel_set_creator( &meshes[m] ).set_name( make_name( static_cast<const char*>( mesh->mName.data ) ) );
                 if ( mesh->mNumBones > 0 ) has_bones = true;
                 load_mesh_data(&meshes[m],m);