Changeset 224 for trunk/src/formats/md3_loader.cc

Timestamp:

01/02/14 20:52:34 (11 years ago)

Author:

epyon

Message:

• universal mesh format
• removed keyframed_mesh_data

File:

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

trunk/src/formats/md3_loader.cc

@@ -286 +286 @@
 }
 
+/*
 mesh* nv::md3_loader::release_mesh()
 {
@@ -314 +315 @@
         vertex_attribute< vec3 >* normal   = m->add_attribute<vec3>("nv_normal");
         vertex_attribute< vec2 >* texcoord = m->add_attribute<vec2>("nv_texcoord");
-        vertex_attribute< uint16 >* indices  = m->add_indices<uint16>();
+        vertex_attribute< uint32 >* indices  = m->add_indices<uint32>();
 
         load_positions( position->get(), frame );
@@ -325 +326 @@
         return m;
 }
+*/
 
 void nv::md3_loader::load_tags( std::vector<mat4>& t, const std::string& tag )
@@ -349 +351 @@
 }
 
+mesh_data* nv::md3_loader::release_mesh_data()
+{
+        mesh_data_creator m;
+
+        load_positions( m.get_positions() );
+        load_normals( m.get_normals() );
+        load_texcoords( m.get_texcoords() );
+        load_indicies( m.get_indices() );
+        
+        std::vector< std::string > names;
+        load_tag_names( names );
+
+        for ( auto& name : names )
+        {
+                load_tags( m.get_tag_map()[ name ], name );
+        }
+
+        return m.release();
+}
+
+mesh_data* nv::md3_loader::get_frame( sint32 frame )
+{
+        mesh_data_creator m;
+
+        load_positions( m.get_positions(), frame );
+        load_normals( m.get_normals(), frame );
+        load_texcoords( m.get_texcoords() );
+        load_indicies( m.get_indices() );
+
+        std::vector< std::string > names;
+        load_tag_names( names );
+
+        for ( auto& name : names )
+        {
+                load_tags( m.get_tag_map()[ name ], name );
+        }
+        return m.release();
+}
+
 size_t md3_loader::get_max_frames() const
 {
@@ -465 +506 @@
 }
 
-void md3_loader::load_indicies( std::vector<uint16>& idx )
+void md3_loader::load_indicies( std::vector<uint32>& idx )
 {
         md3_t* md3 = (md3_t*)m_md3;
@@ -480 +521 @@
                 {
                         const md3_triangle_t& t = surface.triangles[j];
-                        idx.push_back( static_cast< uint16 >( index_base + t.indexes[0] ) );
-                        idx.push_back( static_cast< uint16 >( index_base + t.indexes[1] ) );
-                        idx.push_back( static_cast< uint16 >( index_base + t.indexes[2] ) );
+                        idx.push_back( static_cast< uint32 >( index_base + t.indexes[0] ) );
+                        idx.push_back( static_cast< uint32 >( index_base + t.indexes[1] ) );
+                        idx.push_back( static_cast< uint32 >( index_base + t.indexes[2] ) );
                 }
 
@@ -490 +531 @@
 }
 
-keyframed_mesh_data::keyframed_mesh_data( keyframed_loader* loader )
-{
-        loader->load_positions( m_positions );
-        loader->load_normals( m_normals );
-        loader->load_texcoords( m_texcoords );
-        loader->load_indicies( m_indices );
-
-        std::vector< std::string > names;
-
-        md3_loader* md3loader = dynamic_cast< md3_loader* >( loader );
-        if ( md3loader != nullptr )
-        {
-                md3loader->load_tag_names( names );
-                for ( auto& name : names )
-                {
-                        md3loader->load_tags( m_tags[ name ], name );
-                }
-        }
-
-        m_frames = loader->get_max_frames();
-}
-