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

Timestamp:

09/08/15 18:40:48 (10 years ago)

Author:

epyon

Message:

• wx_canvas - color logging
• string - _sh64/_sh32 literal support
• skeletal_mesh - removed obsolete CPU support

File:

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

trunk/src/gfx/skeletal_mesh.cc

@@ -11 +11 @@
 #include "nv/stl/unordered_map.hh"
 
-nv::skeletal_mesh_cpu::skeletal_mesh_cpu( context* a_context, const data_channel_set* a_mesh_data, const mesh_nodes_data* bones )
-        : skeletal_mesh( a_context )
-{
-        const raw_data_channel* pnt_chan   = a_mesh_data->get_channel<md5_vtx_pnt>();
-        const raw_data_channel* pntiw_chan = a_mesh_data->get_channel<md5_vtx_pntiw>();
-
-        m_pntdata.assign( pnt_chan->data_cast< md5_vtx_pnt >(), pnt_chan->size() );
-        m_bone_offset.resize( bones->size() );
-        m_transform.resize( bones->size() );
-
-        for ( uint32 i = 0; i < bones->size(); ++i )
-        {
-                m_bone_offset[i] = transform( (*bones)[i]->get_transform() );
-        }
-
-        m_vtx_data  = a_mesh_data->get_channel_data<md5_vtx_pntiw>();
-        m_indices   = a_mesh_data->get_channel_size( slot::INDEX );
-        m_va        = a_context->create_vertex_array();
-
-        //array_view< raw_data_channel* > channels = a_mesh_data->get_raw_channels();
-        for ( auto& channel : *a_mesh_data )
-        {
-                //const raw_data_channel* channel = channels[ch];
-                if ( channel.size() > 0 && &channel != pntiw_chan )
-                {
-                        const data_descriptor& desc = channel.descriptor();
-                        if ( desc[0].vslot == slot::INDEX )
-                        {
-                                buffer b = a_context->get_device()->create_buffer( INDEX_BUFFER, STREAM_DRAW, channel.raw_size(), channel.raw_data() );
-                                a_context->set_index_buffer( m_va, b, desc[0].etype, true );
-                        }
-                        else
-                        {
-                                buffer b = a_context->get_device()->create_buffer( VERTEX_BUFFER, STREAM_DRAW, channel.raw_size(), channel.raw_data() );
-                                a_context->add_vertex_buffers( m_va, b, desc );
-                        }
-                }
-        }
-
-        m_pbuffer   = a_context->find_buffer( m_va, slot::POSITION );
-}
-
-void nv::skeletal_mesh_cpu::update_animation( animation_entry* a_anim, uint32 a_anim_time )
-{
-        if ( a_anim )
-        {
-                skeletal_animation_entry_cpu * anim = static_cast<skeletal_animation_entry_cpu*>( a_anim );
-                anim->update_skeleton( m_transform.data(), static_cast<float>( a_anim_time ) );
-                {
-                        size_t skeleton_size = m_bone_offset.size();
-                        size_t vertex_count  = m_pntdata.size();
-                        m_pos_offset.resize( skeleton_size );
-                        for ( unsigned int i = 0; i < skeleton_size; ++i )
-                        {
-                                m_pos_offset[i] = m_transform[i] * m_bone_offset[i];
-                        }
-
-                        fill( m_pntdata.raw_data(), m_pntdata.raw_data() + m_pntdata.raw_size(), 0 );
-                        for ( unsigned int i = 0; i < vertex_count; ++i )
-                        {
-                                const md5_vtx_pntiw& vert = m_vtx_data[i];
-
-                                for ( int j = 0; j < 4; ++j )
-                                {
-                                        unsigned index = unsigned( vert.boneindex[j] );
-                                        float weight   = vert.boneweight[j];
-                                        const quat& orient      = m_transform[index].get_orientation();
-                                        const transform& offset = m_pos_offset[index];
-                                        m_pntdata[i].position += offset.transformed( vert.position )        * weight;
-                                        m_pntdata[i].normal   += ( orient * vert.normal  ) * weight;
-                                        m_pntdata[i].tangent  += ( orient * vert.tangent ) * weight;
-                                }
-                        }
-                }
-
-                m_context->update( m_pbuffer, m_pntdata.data(), 0, m_pntdata.raw_size() );
-        }
-}
-
-
-void nv::skeletal_animation_entry_cpu::initialize()
-{
-        for ( auto bone : *m_node_data )
-        {
-                if ( bone->size() > 0 )
-                {
-                        m_interpolation_key = bone->get_interpolation_key();
-                        break;
-                }
-        }
-}
-
-void nv::skeletal_animation_entry_cpu::update_skeleton( transform* skeleton, float time ) const
-{
-        float frame_duration = 1000.f / static_cast<float>( m_node_data->get_frame_rate() );
-        float anim_duration = frame_duration * m_node_data->get_duration();
-        float new_time = fmodf( time, anim_duration ) * 0.001f;
-
-        float frame_num = new_time * m_node_data->get_frame_rate();
-        for ( size_t i = 0; i < m_node_data->size(); ++i )
-        {
-                raw_channel_interpolator interpolator( (*m_node_data)[i], m_interpolation_key );
-                skeleton[i] = interpolator.get< transform >( frame_num );
-        }
-}
-
-void nv::skeletal_animation_entry_gpu::initialize()
+void nv::skeletal_animation_entry::initialize()
 {
         m_prepared  = false;
@@ -140 +34 @@
 }
 
-void nv::skeletal_animation_entry_gpu::update_skeleton( mat4* data, uint32 time ) const
+void nv::skeletal_animation_entry::update_skeleton( mat4* data, uint32 time ) const
 {
         float tick_time = ( time * 0.001f ) * m_frame_rate;
@@ -169 +63 @@
 }
 
-void nv::skeletal_animation_entry_gpu::prepare( const mesh_nodes_data* bones )
+void nv::skeletal_animation_entry::prepare( const mesh_nodes_data* bones )
 {
         if ( m_prepared ) return;
@@ -200 +94 @@
 }
 
-void nv::skeletal_animation_entry_gpu::animate_rec( mat4* data, float time, uint32 node_id, const mat4& parent_mat ) const
+void nv::skeletal_animation_entry::animate_rec( mat4* data, float time, uint32 node_id, const mat4& parent_mat ) const
 {
         // TODO: fix transforms, which are now embedded,
@@ -227 +121 @@
 }
 
-nv::skeletal_animation_entry_gpu::~skeletal_animation_entry_gpu()
+nv::skeletal_animation_entry::~skeletal_animation_entry()
 {
         delete[] m_offsets;
@@ -234 +128 @@
 }
 
-nv::skeletal_mesh_gpu::skeletal_mesh_gpu( context* a_context, const data_channel_set* a_mesh, const mesh_nodes_data* a_bone_data )
-        : skeletal_mesh( a_context ), m_bone_data( a_bone_data ), m_index_count( 0 ), m_transform( nullptr )
+nv::skeletal_mesh::skeletal_mesh( context* a_context, const data_channel_set* a_mesh, const mesh_nodes_data* a_bone_data )
+        : m_context( a_context ), m_bone_data( a_bone_data ), m_index_count( 0 ), m_transform( nullptr )
 {
         if ( a_mesh )
@@ -248 +142 @@
 }
 
-void nv::skeletal_mesh_gpu::update_animation( animation_entry* a_anim, uint32 a_anim_time )
+void nv::skeletal_mesh::update_animation( animation_entry* a_anim, uint32 a_anim_time )
 {
         if ( m_bone_data && a_anim )
         {
-                skeletal_animation_entry_gpu * anim = static_cast<skeletal_animation_entry_gpu*>( a_anim );
+                skeletal_animation_entry * anim = static_cast<skeletal_animation_entry*>( a_anim );
                 anim->prepare( m_bone_data );
                 anim->update_skeleton( m_transform, a_anim_time );
@@ -258 +152 @@
 }
 
-void nv::skeletal_mesh_gpu::update( program a_program )
+void nv::skeletal_mesh::update( program a_program )
 {
         if ( m_bone_data )
@@ -264 +158 @@
 }
 
-nv::transform nv::skeletal_mesh_gpu::get_node_transform( uint32 node_id ) const
+nv::transform nv::skeletal_mesh::get_node_transform( uint32 node_id ) const
 {
         if ( node_id == 0 ) return transform();
@@ -271 +165 @@
 }
 
-nv::mat4 nv::skeletal_mesh_gpu::get_node_matrix( uint32 node_id ) const
+nv::mat4 nv::skeletal_mesh::get_node_matrix( uint32 node_id ) const
 {
         return m_transform[ node_id ];