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

Timestamp:

06/20/15 00:05:17 (10 years ago)

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

File:

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

trunk/src/gfx/skeletal_mesh.cc

@@ -16 +16 @@
 {
         const mesh_raw_channel* pnt_chan = a_mesh_data->get_channel<md5_vtx_pnt>();
-        m_pntdata.assign( (const md5_vtx_pnt*)pnt_chan->data, pnt_chan->count );
+        m_pntdata.assign( reinterpret_cast<const md5_vtx_pnt*>( pnt_chan->data ), pnt_chan->count );
         m_bone_offset.resize( bones->get_count() );
         m_transform.resize( bones->get_count() );
@@ -35 +35 @@
         if ( a_anim )
         {
-                skeletal_animation_entry_cpu * anim = (skeletal_animation_entry_cpu*)a_anim;
-                anim->update_skeleton( m_transform.data(), (float)a_anim_time );
+                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();
@@ -51 +51 @@
                                 const md5_vtx_pntiw& vert = m_vtx_data[i];
 
-                                for ( size_t j = 0; j < 4; ++j )
+                                for ( int j = 0; j < 4; ++j )
                                 {
-                                        unsigned index = (unsigned)vert.boneindex[j];
+                                        unsigned index = unsigned( vert.boneindex[j] );
                                         float weight   = vert.boneweight[j];
                                         const quat& orient      = m_transform[index].get_orientation();
@@ -71 +71 @@
 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();
+        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;
@@ -152 +152 @@
                 if ( bi != bone_names.end() )
                 {
-                        bone_id = (sint16)bi->second;
+                        bone_id = sint16( bi->second );
                 }
                 m_bone_ids[n] = bone_id;
@@ -207 +207 @@
         if ( m_bone_data && a_anim )
         {
-                skeletal_animation_entry_gpu * anim = (skeletal_animation_entry_gpu*)a_anim;
+                skeletal_animation_entry_gpu * anim = static_cast<skeletal_animation_entry_gpu*>( a_anim );
                 anim->prepare( m_bone_data );
                 anim->update_skeleton( m_transform, a_anim_time );