Changeset 231 for trunk/tests

Timestamp:

05/06/14 13:38:28 (11 years ago)

Author:

epyon

Message:

• further simplification of mesh classes
• updated tests

Location:

trunk/tests

Files:

• md2_test/md2_test.cc (modified) (4 diffs)
• md3_test/md3_test.cc (added)
• md5_test/md5_test.cc (added)
• render_test/rl.cc (modified) (1 diff)

trunk/tests/md2_test/md2_test.cc

@@ -58 +58 @@
         }
 
+        nv::mesh_interface* get_mesh() { return m_mesh; }
+
         size_t get_max_frames()
         {
                 return m_mesh->get_max_frames();
-        }
-
-        void draw( nv::render_state& rstate, const glm::mat4& m, const glm::mat4& v, const glm::mat4& p )
-        {
-                NV_PROFILE( "mesh-draw" );
-                glm::mat4 mv = v * m;
-                m_mesh->get_program()->set_opt_uniform( "nv_m_modelview", mv );
-                m_mesh->get_program()->set_opt_uniform( "nv_m_normal", glm::transpose(glm::inverse(glm::mat3(mv))) );
-                m_mesh->get_program()->set_uniform( "matrix_mvp", p * mv );
-                m_mesh->draw( rstate );
         }
 
@@ -80 +72 @@
 
 private:
-        nv::mesh_data*           m_mesh_data;
-        nv::keyframed_mesh_gpu*  m_mesh;
+        nv::mesh_data*       m_mesh_data;
+        nv::keyframed_mesh*  m_mesh;
 };
 
@@ -106 +98 @@
         NV_PROFILE( "app_construct" );
         m_device = new nv::gl_device();
-        m_window = m_device->create_window( 800, 600 );
+        m_window = m_device->create_window( 800, 600, false );
 
         nv::sampler sampler( nv::sampler::LINEAR, nv::sampler::REPEAT );
@@ -178 +170 @@
                         NV_PROFILE( "draw" );
                         glm::mat4 model      = glm::mat4(1.0f);
-                        m_mesh->draw( m_render_state, model, view, projection );
+                        glm::mat4 mv = view * model;
+                        m_program->set_opt_uniform( "nv_m_modelview", mv );
+                        m_program->set_opt_uniform( "nv_m_normal", glm::transpose(glm::inverse(glm::mat3(mv))) );
+                        m_program->set_uniform( "matrix_mvp", projection * mv );
+                        m_mesh->get_mesh()->update( m_program );
+                        m_window->get_context()->draw( m_render_state, m_program, m_mesh->get_mesh() );
                 }
 

trunk/tests/render_test/rl.cc

@@ -80 +80 @@
 {
         m_device = new nv::gl_device();
-        m_window = m_device->create_window( 800, 600 );
+        m_window = m_device->create_window( 800, 600, false );
         
         nv::image_data* sprites = m_device->create_image_data( "spritesheet.png" );