Changeset 321 for trunk/tests/md3_test/nv_md3_test.cc

Timestamp:

08/25/14 02:43:30 (11 years ago)

Author:

epyon

Message:

• updated all tests to new nova
• cleaned up tests paths
• general cleanup of tests and test data

File:

• trunk/tests/md3_test/nv_md3_test.cc (moved) (moved from trunk/tests/md3_test/md3_test.cc) (5 diffs)

trunk/tests/md3_test/nv_md3_test.cc

@@ -65 +65 @@
         }
 
-        void update( nv::uint32 ms, nv::program program )
+        void update( nv::uint32 ms )
         {
                 m_mesh->update_animation( m_entry, ms );
+        }
+
+        void update( nv::program program )
+        {
                 m_mesh->update( program );
         }
@@ -144 +148 @@
         NV_PROFILE( "app_initialize" );
         m_program = m_device->create_program( 
-                nv::slurp( GPU_ANIMATION ? "obj_gpu.vert" : "obj_cpu.vert" ), 
-                nv::slurp( "obj.frag" ) 
+                nv::slurp( GPU_ANIMATION ? "md3_gpu.vert" : "md3_cpu.vert" ), 
+                nv::slurp( "md3.frag" ) 
         );
         m_torso   = new mesh_part( "data/upper.md3", m_window );
@@ -174 +178 @@
                 last_ticks = ticks;
                 ticks      = m_device->get_ticks();
-                nv::uint32 elapsed = ticks - last_ticks;
-                m_torso->update( ticks, m_program );
-                m_legs->update( ticks, m_program );
+                m_torso->update( ticks );
+                m_legs->update( ticks );
                 {
                         NV_PROFILE( "clear" );
@@ -204 +207 @@
 
                         m_scene_state.set_model( model );
+                        m_legs->update( m_program );
                         m_window->get_context()->draw( nv::TRIANGLES, m_render_state, m_scene_state, m_program, m_legs->get_mesh()->get_vertex_array(), m_legs->get_mesh()->get_index_count() );
 
@@ -209 +213 @@
                         model = m_legs->get_transform( 0 );
                         m_scene_state.set_model( model );
+                        m_torso->update( m_program );
                         m_window->get_context()->draw( nv::TRIANGLES, m_render_state, m_scene_state, m_program, m_torso->get_mesh()->get_vertex_array(), m_torso->get_mesh()->get_index_count() );
 
                         glm::mat4 head = model * m_torso->get_transform( 0 ); //, last_torso_frame, torso_frame, torso_interpolate );
                         m_scene_state.set_model( head );
+                        m_head->update( m_program );
                         m_window->get_context()->draw( nv::TRIANGLES, m_render_state, m_scene_state, m_program, m_head->get_mesh()->get_vertex_array(), m_head->get_mesh()->get_index_count() );
 
                         glm::mat4 weapon = model * m_torso->get_transform( 2 ); //, last_torso_frame, torso_frame, torso_interpolate );
+                        m_weapon->update( m_program );
                         m_scene_state.set_model( weapon );
                         m_context->bind( m_diffuse_weapon, nv::TEX_DIFFUSE );