Changeset 239 for trunk/src/gfx/skeletal_mesh.cc

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/src/gfx/skeletal_mesh.cc (modified) (3 diffs)

trunk/src/gfx/skeletal_mesh.cc

@@ -11 +11 @@
 
 
-nv::skeletal_mesh::skeletal_mesh( context* a_context, md5_loader* a_loader )
+nv::skeletal_mesh::skeletal_mesh( context* a_context, md5_mesh_data* a_mesh_data )
         : animated_mesh()
-        , m_data( a_loader )
+        , m_mesh_data( a_mesh_data )
         , m_animation( nullptr )
 {
-        nv::uint32 vcount = a_loader->get_vertex_count(0);
-        m_va = a_context->get_device()->create_vertex_array();
+        m_va = a_context->get_device()->create_vertex_array( a_mesh_data, nv::STREAM_DRAW );
+}
 
-        m_vb_position = a_context->get_device()->create_vertex_buffer( nv::STREAM_DRAW, vcount * sizeof( nv::vec3 ), (const void*)a_loader->get_positions(0).data() );
-        m_va->add_vertex_buffer( nv::slot::POSITION, m_vb_position, nv::FLOAT, 3, 0, 0, false );
-        m_vb_normal = a_context->get_device()->create_vertex_buffer( nv::STREAM_DRAW, vcount * sizeof( nv::vec3 ), (const void*)a_loader->get_normals(0).data()  );
-        m_va->add_vertex_buffer( nv::slot::NORMAL,   m_vb_normal, nv::FLOAT, 3, 0, 0, false );
-        m_vb_tangent = a_context->get_device()->create_vertex_buffer( nv::STREAM_DRAW, vcount * sizeof( nv::vec3 ), (const void*)a_loader->get_tangents(0).data() );
-        m_va->add_vertex_buffer( nv::slot::TANGENT,  m_vb_tangent, nv::FLOAT, 3, 0, 0, false );
-
-        nv::vertex_buffer* vb = a_context->get_device()->create_vertex_buffer( nv::STATIC_DRAW, vcount * sizeof( nv::vec2 ), (const void*)a_loader->get_texcoords(0).data() );
-        m_va->add_vertex_buffer( nv::slot::TEXCOORD, vb, nv::FLOAT, 2 );
-        nv::index_buffer* ib = a_context->get_device()->create_index_buffer( nv::STATIC_DRAW, a_loader->get_index_count(0) * sizeof( nv::uint32 ), (const void*)a_loader->get_indices(0).data() );
-        m_va->set_index_buffer( ib, nv::UINT, true );
-}
 
 void nv::skeletal_mesh::setup_animation( md5_animation* a_anim )
@@ -45 +33 @@
         {
                 m_animation->update( ms * 0.001f );
-                m_data->apply( *m_animation );
+                m_mesh_data->apply( *m_animation );
+                vertex_buffer* vb = m_va->find_buffer( nv::POSITION );
+                const mesh_raw_channel* pch = m_mesh_data->get_channel_data()[0];
+                vb->bind();
+                vb->update( (const void*)pch->data, 0, pch->size );
+                vb->unbind();
         }
-
-        nv::uint32 usize = m_data->get_vertex_count(0) * sizeof( nv::vec3 );
-        m_vb_position->bind();
-        m_vb_position->update( (const void*)m_data->get_positions(0).data(), 0, usize );
-        m_vb_normal  ->bind();
-        m_vb_normal  ->update( (const void*)m_data->get_normals(0).data(),   0, usize );
-        m_vb_tangent ->bind();
-        m_vb_tangent ->update( (const void*)m_data->get_tangents(0).data(),  0, usize );
-
-        // Technically this is not needed, because the va is just a fake class, 
-        // but if it's real it will be needed?
-//      m_va->update_vertex_buffer( nv::slot::POSITION, m_vb_position, false );
-//      m_va->update_vertex_buffer( nv::slot::NORMAL,   m_vb_normal,   false );
-//      m_va->update_vertex_buffer( nv::slot::TANGENT,  m_vb_tangent,  false );
-        // TODO: answer is - probably not
 }
 
@@ -67 +45 @@
 {
         delete m_va;
+        delete m_mesh_data;
 }