Changeset 421 for trunk/src

Timestamp:

07/16/15 11:59:00 (10 years ago)

Author:

epyon

Message:

• move ops for data_channel_set
• string_table works on string_views, stores hashes

Location:

trunk/src

Files:

• formats/md5_loader.cc (modified) (1 diff)
• formats/nmd_loader.cc (modified) (1 diff)
• io/string_table.cc (modified) (3 diffs)

trunk/src/formats/md5_loader.cc

@@ -520 +520 @@
         for ( uint32 i = 0; i < size; ++i )
         {
-                data_channel_set_creator( m_meshes[i] ).move_to( meshes[i] );
+                meshes[i] = move( *m_meshes[i] );
                 delete m_meshes[i];
                 m_meshes[i] = nullptr;

trunk/src/formats/nmd_loader.cc

@@ -58 +58 @@
         for ( uint32 i = 0; i < size; ++i )
         {
-                data_channel_set_creator( m_meshes[i] ).move_to( meshes[i] );
+                meshes[i] = move( *m_meshes[i] );
                 delete m_meshes[i];
         }

trunk/src/io/string_table.cc

@@ -12 +12 @@
 }
 
-nv::string_table_creator::index nv::string_table_creator::insert( const std::string& s )
+nv::string_table_creator::index nv::string_table_creator::insert( const string_view& s )
 {
-        auto i = m_map.find( s );
+        uint64 hash_value = hash_string< uint64 >( s.data() );
+        auto i = m_map.find( hash_value );
         if ( i != m_map.end() )
         {
                 return i->second;
         }
-        const char* cs = s.c_str();
+        const char* cs = s.data();
         uint32 cs_size = s.size() + 1;
         NV_ASSERT( m_offsets.size() < index(-1), "Too many strings!" );
@@ -27 +28 @@
         m_data.resize( dsize + cs_size );
         raw_copy( cs, cs + cs_size, m_data.data() + dsize );
-        m_map[ s ] = result;
+        m_map[ hash_value ] = result;
         return result;
 }
@@ -55 +56 @@
 }
 
-nv::string_table_creator::index nv::string_table_creator::get( const std::string& s ) const
+nv::string_table_creator::index nv::string_table_creator::get( const string_view& s ) const
 {
-        auto i = m_map.find( s );
+        uint64 hash_value = hash_string< uint64 >( s.data() );
+        auto i = m_map.find( hash_value );
         if ( i != m_map.end() )
         {