Changeset 224 for trunk/src/formats/md2_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/md2_loader.cc (modified) (4 diffs)

trunk/src/formats/md2_loader.cc

@@ -241 +241 @@
 }
 
+mesh_data* nv::md2_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() );
+
+        m_size = m.get_indices().size();
+        return m.release();
+}
+
+mesh_data* nv::md2_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() );
+
+        m_size = m.get_indices().size();
+        return m.release();
+}
+
+
+/*
 mesh* nv::md2_loader::release_mesh()
 {
@@ -255 +283 @@
         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 );
@@ -266 +294 @@
         return m;
 }
+*/
 
 size_t md2_loader::get_max_frames() const
@@ -344 +373 @@
 }
 
-void md2_loader::load_indicies( std::vector<uint16>& idx )
+void md2_loader::load_indicies( std::vector<uint32>& idx )
 {
         idx.assign( m_new_indexes.begin(), m_new_indexes.end() );