Changeset 189

Timestamp:

08/04/13 11:44:34 (12 years ago)

Author:

epyon

Message:

• formats - full md2 implementation, including re-indexing and frame animation
• tests/md2_test - with Mancubi For Added Fun (tm)

Location:

trunk

Files:

• nv/formats/md2_loader.hh (added)
• nv/formats/md3_loader.hh (modified) (2 diffs)
• src/formats/md2_loader.cc (added)
• src/formats/md2_normals.inc (added)
• src/formats/md3_loader.cc (modified) (2 diffs)
• src/gui/gui_renderer.cc (modified) (1 diff)
• tests/gui_test (modified) (1 prop)
• tests/md2_test (added)
• tests/md2_test/data (added)
• tests/md2_test/data/manc.md2 (added)
• tests/md2_test/data/manc.png (added)
• tests/md2_test/md2_test.cc (added)
• tests/md2_test/md2_test.lua (added)
• tests/md2_test/obj.frag (added)
• tests/md2_test/obj.vert (added)
• tests/md2_test/premake4.lua (added)

trunk/nv/formats/md3_loader.hh

@@ -27 +27 @@
                 mat4 transform;
         };
+
+        class keyframed_loader : public mesh_loader
+        {
+        public:
+                virtual sint32 get_max_frames() const = 0;
+                virtual void load_positions( std::vector<vec3>& p, sint32 frame =-1 ) = 0;
+                virtual void load_normals( std::vector<vec3>& n, sint32 frame =-1 ) = 0;
+                virtual void load_texcoords( std::vector<vec2>& t ) = 0;
+                virtual void load_indicies( std::vector<uint16>& idx ) = 0;
+        };
+
 
         class md3_loader : public mesh_loader
@@ -58 +69 @@
                 typedef std::unordered_map< std::string, transforms > tag_map;
 
-                keyframed_mesh_data( md3_loader* loader );
+                keyframed_mesh_data( keyframed_loader* loader );
                 size_t get_frame_count() const { return m_frames; };
                 size_t get_index_count() const { return m_indices.size(); };

trunk/src/formats/md3_loader.cc

@@ -492 +492 @@
 }
 
-keyframed_mesh_data::keyframed_mesh_data( md3_loader* loader )
+keyframed_mesh_data::keyframed_mesh_data( keyframed_loader* loader )
 {
         loader->load_positions( m_positions );
@@ -500 +500 @@
 
         std::vector< std::string > names;
-        loader->load_tag_names( names );
-        for ( auto& name : names )
-        {
-                loader->load_tags( m_tags[ name ], name );
+
+        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 );
+                }
         }
 

trunk/src/gui/gui_renderer.cc

@@ -105 +105 @@
         white.pos = ivec2();
         m_atlas.set_region( white, wfill );
-        delete wfill;
+        delete[] wfill;
 
         screen_render_data* sr = new screen_render_data( w->get_device(), 1024 );