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

Timestamp:

07/31/14 08:08:31 (11 years ago)

Author:

epyon

Message:

• lua::table_guard is_* utility functions
• minor tweaks

File:

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

trunk/src/gfx/skeletal_mesh.cc

@@ -11 +11 @@
 
 
-nv::skeletal_mesh::skeletal_mesh( device* a_device, const mesh_data* a_mesh_data, const mesh_nodes_data* bones )
-        : animated_mesh()
+nv::skeletal_mesh_cpu::skeletal_mesh_cpu( device* a_device, const mesh_data* a_mesh_data, const mesh_nodes_data* bones )
+        : skeletal_mesh()
         , m_data( a_mesh_data )
 {
@@ -29 +29 @@
 }
 
-void nv::skeletal_mesh::update_animation( animation_entry* a_anim, uint32 a_anim_time )
+void nv::skeletal_mesh_cpu::update_animation( animation_entry* a_anim, uint32 a_anim_time )
 {
         if ( a_anim )
         {
-                skeletal_animation_entry * anim = (skeletal_animation_entry*)a_anim;
+                skeletal_animation_entry_cpu * anim = (skeletal_animation_entry_cpu*)a_anim;
                 anim->update_skeleton( m_transform.data(), (float)a_anim_time );
                 {
@@ -70 +70 @@
 
 
-void nv::skeletal_animation_entry::update_skeleton( transform* skeleton, float time ) const
+void nv::skeletal_animation_entry_cpu::update_skeleton( transform* skeleton, float time ) const
 {
         float frame_duration = 1000.f / (float)m_node_data->get_frame_rate();
@@ -85 +85 @@
 
 
-nv::skeletal_mesh::~skeletal_mesh()
+nv::skeletal_mesh_cpu::~skeletal_mesh_cpu()
 {
         delete m_va;
-}
-
-void nv::skeletal_mesh::run_animation( animation_entry* a_anim )
-{
-        if ( a_anim != nullptr )
-        {
-                update_animation( a_anim, 0 );
-        }
 }
 
@@ -209 +201 @@
 
 nv::skeletal_mesh_gpu::skeletal_mesh_gpu( device* a_device, const mesh_data* a_mesh, const mesh_nodes_data* a_bone_data )
-        : animated_mesh(), m_bone_data( a_bone_data ), m_transform( nullptr )
+        : skeletal_mesh(), m_bone_data( a_bone_data ), m_transform( nullptr )
 {
         m_va          = a_device->create_vertex_array( a_mesh, nv::STATIC_DRAW );
@@ -219 +211 @@
 }
 
-void nv::skeletal_mesh_gpu::run_animation( animation_entry* a_anim )
-{
-        if ( m_bone_data && a_anim != nullptr )
-        {
-                skeletal_animation_entry_gpu * anim = (skeletal_animation_entry_gpu*)(a_anim);
+void nv::skeletal_mesh_gpu::update_animation( animation_entry* a_anim, uint32 a_anim_time )
+{
+        if ( m_bone_data && a_anim )
+        {
+                skeletal_animation_entry_gpu * anim = (skeletal_animation_entry_gpu*)a_anim;
                 anim->prepare( m_bone_data );
-                update_animation( a_anim, 0 );
-        }
-}
-
-void nv::skeletal_mesh_gpu::update_animation( animation_entry* a_anim, uint32 a_anim_time )
-{
-        if ( m_bone_data && a_anim )
-        {
-                skeletal_animation_entry_gpu * anim = (skeletal_animation_entry_gpu*)a_anim;
                 anim->update_skeleton( m_transform, a_anim_time );
         }
 }
 
-void nv::skeletal_mesh_gpu::update( program* a_program ) const
+void nv::skeletal_mesh_gpu::update( program* a_program )
 {
         if ( m_bone_data )