Changeset 239 for trunk/nv/gfx/keyframed_mesh.hh

Timestamp:

05/17/14 02:35:19 (11 years ago)

Author:

epyon

Message:

• massive update of mesh handling
• universal mesh handling routines
• removed a lot of legacy code
• significantly streamlined MD5 loading
• all tests updated to new features

File:

• trunk/nv/gfx/keyframed_mesh.hh (modified) (5 diffs)

trunk/nv/gfx/keyframed_mesh.hh

@@ -37 +37 @@
         {
         public:
-                keyframed_mesh( context* a_context, mesh_data_old* a_data );
-                virtual size_t get_index_count() const { return m_data->get_index_count(); }
+                keyframed_mesh( context* a_context, mesh_data* a_data, tag_map* a_tag_map );
+                virtual size_t get_index_count() const { return m_index_count; }
                 virtual void run_animation( animation_entry* a_anim );
                 size_t get_max_frames() const;
@@ -48 +48 @@
                 virtual ~keyframed_mesh();
         protected:
-                mesh_data_old* m_data;
+                struct vertex_pn
+                {
+                        vec3 position;
+                        vec3 normal;
+                };
+
+                mesh_data* m_mesh_data;
+                tag_map*   m_tag_map;
 
                 uint32 m_start_frame;
@@ -59 +66 @@
                 bool   m_looping;
                 bool   m_active;
+
+                uint32 m_index_count;
+                uint32 m_frame_count;
+                uint32 m_vertex_count;
         };
 
@@ -65 +76 @@
         {
         public:
-                keyframed_mesh_gpu( context* a_context, mesh_data_old* a_data, program* a_program );
+                keyframed_mesh_gpu( context* a_context, mesh_data* a_data, tag_map* a_tag_map, program* a_program );
                 void update( uint32 ms );
         private:
@@ -78 +89 @@
         {
         public:
-                keyframed_mesh_cpu( context* a_context, mesh_data_old* a_data );
+                keyframed_mesh_cpu( context* a_context, mesh_data* a_data, tag_map* a_tag_map );
                 void update( uint32 ms );
         private:
-                std::vector<vec3> m_position;
-                std::vector<vec3> m_normal;
-                vertex_buffer* m_vb_position;
-                vertex_buffer* m_vb_normal;
+                std::vector<vertex_pn> m_vertex;
+                vertex_buffer*         m_vb;
         };