Changeset 238 for trunk/tests/objload_test/objload_test.cc

Timestamp:

05/16/14 05:48:01 (11 years ago)

Author:

epyon

Message:

• mesh data interface and usage
• new wavefront importer (old pending removal)
• updates to test projects

File:

• trunk/tests/objload_test/objload_test.cc (modified) (5 diffs)

trunk/tests/objload_test/objload_test.cc

@@ -32 +32 @@
         nv::vertex_array* m_va;
         nv::program*      m_program;
-        nv::mesh_data_old* m_mesh;
-        nv::uint32        m_count;
+        nv::mesh_data*    m_mesh;
 };
 
@@ -64 +63 @@
         nv::c_file_system fs;
         nv::stream* mesh_file = fs.open( "mesh.obj" );
-        nv::mesh_loader* loader = new nv::obj_loader();
+
+//              nv::mesh_loader* loader = new nv::obj_loader();
+//              loader->load( *mesh_file );
+//              nv::mesh_data_old* mesh = loader->release_mesh_data();
+//              m_count = loader->get_size();
+//              delete mesh_file;
+//              delete loader;
+
+        nv::wavefront_loader* loader = new nv::wavefront_loader();
         loader->load( *mesh_file );
         m_mesh = loader->release_mesh_data();
-        m_count = loader->get_size();
         delete mesh_file;
         delete loader;
@@ -73 +79 @@
         m_program = m_device->create_program( nv::slurp( "obj.vert" ), nv::slurp( "obj.frag" ) );
 
-        nv::vertex_buffer* vb = nullptr;
-        m_va = m_device->create_vertex_array();
-        vb = m_device->create_vertex_buffer( nv::STATIC_DRAW, m_mesh->get_vertex_count() * sizeof( nv::vec3 ), m_mesh->get_positions().data() );
-        m_va->add_vertex_buffer( nv::slot::POSITION, vb, nv::FLOAT, 3 );
-        vb = m_device->create_vertex_buffer( nv::STATIC_DRAW, m_mesh->get_vertex_count() * sizeof( nv::vec3 ), m_mesh->get_normals().data() );
-        m_va->add_vertex_buffer( nv::slot::NORMAL, vb, nv::FLOAT, 3 );
-        vb = m_device->create_vertex_buffer( nv::STATIC_DRAW, m_mesh->get_vertex_count() * sizeof( nv::vec2 ), m_mesh->get_texcoords().data() );
-        m_va->add_vertex_buffer( nv::slot::TEXCOORD, vb, nv::FLOAT, 2 );
+//      nv::vertex_buffer* vb = nullptr;
+        m_va = m_device->create_vertex_array( m_mesh, nv::STATIC_DRAW );
+
         return true;
 }
@@ -113 +114 @@
                 m_program->set_uniform( "diffuse", 0 );
                 m_program->set_uniform( "specular", 1 );
-                m_window->get_context()->draw( nv::TRIANGLES, m_render_state, m_program, m_va, m_count * 3 );
+                m_window->get_context()->draw( nv::TRIANGLES, m_render_state, m_program, m_va, m_mesh->get_count() );
                 m_window->swap_buffers();
 
@@ -147 +148 @@
 application::~application()
 {
+        delete m_mesh;
         delete m_program;
-        delete m_mesh;
         delete m_diffuse;
         delete m_specular;