Changeset 428 for trunk/src/formats

Timestamp:

07/20/15 13:59:34 (10 years ago)

Author:

epyon

Message:

• renaming mesh_nodes_data members to more compliant
• moved string_table to stl

Location:

trunk/src/formats

Files:

• assimp_loader.cc (modified) (1 diff)
• md5_loader.cc (modified) (3 diffs)
• nmd_loader.cc (modified) (1 diff)

trunk/src/formats/assimp_loader.cc

@@ -305 +305 @@
                                 if ( iname == names.end() )
                                 {
-                                        NV_ASSERT( result->get_count() < MAX_BONES, "Too many bones to merge!" );
-                                        uint16 index = uint16( result->get_count() );
+                                        NV_ASSERT( result->size() < MAX_BONES, "Too many bones to merge!" );
+                                        uint16 index = uint16( result->size() );
                                         result->push_back( bone );
                                         names[ bone->get_name() ] = index;

trunk/src/formats/md5_loader.cc

@@ -112 +112 @@
                         m_nodes = new mesh_nodes_data( make_name( "md5_bones") );
                         discard( sstream, "{" );
-                        for ( size_t i = 0; i < m_nodes->get_count(); ++i )
+                        for ( size_t i = 0; i < m_nodes->size(); ++i )
                         {
                                 std::string name;
@@ -245 +245 @@
 
                         discard( sstream, "{" );
-                        for ( size_t i = 0; i < m_nodes->get_count(); ++i )
+                        for ( size_t i = 0; i < m_nodes->size(); ++i )
                         {
                                 std::string    name;
@@ -288 +288 @@
                         next_line( sstream ); 
 
-                        for ( size_t i = 0; i < m_nodes->get_count(); ++i )
+                        for ( size_t i = 0; i < m_nodes->size(); ++i )
                         {
                                 transform base_frame;

trunk/src/formats/nmd_loader.cc

@@ -206 +206 @@
         nmd_element_header header;
         header.type = nmd_type::ANIMATION;
-        header.children = static_cast<uint16>( nodes.get_count() );
+        header.children = static_cast<uint16>( nodes.size() );
         header.size = total;
         header.name = nodes.get_name();