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

Timestamp:

08/07/14 10:10:24 (11 years ago)

Author:

epyon

Message:

• all bind and update function for graphics objects are done via context (will simplify directx device, and allow for handles instead of objects)

File:

• trunk/src/gfx/skeletal_mesh.cc (modified) (4 diffs)

trunk/src/gfx/skeletal_mesh.cc

@@ -11 +11 @@
 
 
-nv::skeletal_mesh_cpu::skeletal_mesh_cpu( device* a_device, const mesh_data* a_mesh_data, const mesh_nodes_data* bones )
+nv::skeletal_mesh_cpu::skeletal_mesh_cpu( context* a_context, const mesh_data* a_mesh_data, const mesh_nodes_data* bones )
         : skeletal_mesh()
+        , m_context( a_context )
         , m_data( a_mesh_data )
 {
@@ -26 +27 @@
         m_vtx_data  = a_mesh_data->get_channel_data<md5_vtx_pntiw>();
         m_indices   = a_mesh_data->get_count();
-        m_va        = a_device->create_vertex_array( a_mesh_data, nv::STREAM_DRAW );
+        m_va        = a_context->get_device()->create_vertex_array( a_mesh_data, nv::STREAM_DRAW );
 }
 
@@ -63 +64 @@
 
                 vertex_buffer* vb = m_va->find_buffer( nv::slot::POSITION );
-                vb->bind();
-                vb->update( m_pntdata.data(), 0, m_pntdata.raw_size() );
-                vb->unbind();
+                m_context->update( vb, m_pntdata.data(), 0, m_pntdata.raw_size() );
         }
 }
@@ -200 +199 @@
 }
 
-nv::skeletal_mesh_gpu::skeletal_mesh_gpu( device* a_device, const mesh_data* a_mesh, const mesh_nodes_data* a_bone_data )
+nv::skeletal_mesh_gpu::skeletal_mesh_gpu( context* a_context, const mesh_data* a_mesh, const mesh_nodes_data* a_bone_data )
         : skeletal_mesh(), m_bone_data( a_bone_data ), m_transform( nullptr )
 {
-        m_va          = a_device->create_vertex_array( a_mesh, nv::STATIC_DRAW );
+        m_va          = a_context->get_device()->create_vertex_array( a_mesh, nv::STATIC_DRAW );
         m_index_count = a_mesh->get_count();
         if ( m_bone_data )