Changeset 198 for trunk/src/formats/md5_loader.cc

Timestamp:

08/11/13 17:19:03 (12 years ago)

Author:

epyon

Message:

• warning cleanup for clang and gcc

File:

• trunk/src/formats/md5_loader.cc (modified) (7 diffs)

trunk/src/formats/md5_loader.cc

@@ -36 +36 @@
 }
 
-void unit_quat_w( glm::quat& quat )
+static void unit_quat_w( glm::quat& quat )
 {
         float t = 1.0f - ( quat.x * quat.x ) - ( quat.y * quat.y ) - ( quat.z * quat.z );
@@ -354 +354 @@
                 {
                         discard( sstream, "{" );
-                        for ( int i = 0; i < m_num_joints; ++i )
+                        for ( size_t i = 0; i < m_num_joints; ++i )
                         {
                                 md5_joint_info joint;
@@ -368 +368 @@
                         discard( sstream, "{" );
                         next_line( sstream ); 
-                        for ( int i = 0; i < m_num_frames; ++i ) 
+                        for ( size_t i = 0; i < m_num_frames; ++i ) 
                         {
                                 md5_bound bound;
@@ -390 +390 @@
                         next_line( sstream ); 
 
-                        for ( int i = 0; i < m_num_joints; ++i )
+                        for ( size_t i = 0; i < m_num_joints; ++i )
                         {
                                 md5_base_frame base_frame;
@@ -412 +412 @@
                         next_line( sstream ); 
 
-                        for ( int i = 0; i < m_num_animated_components; ++i )
+                        for ( size_t i = 0; i < m_num_animated_components; ++i )
                         {
                                 float frameData;
@@ -436 +436 @@
         m_anim_time = 0.0f;
 
-        assert( m_joint_infos.size() == (size_t)m_num_joints );
-        assert( m_bounds.size()      == (size_t)m_num_frames );
-        assert( m_base_frames.size() == (size_t)m_num_joints );
-        assert( m_frames.size()      == (size_t)m_num_frames );
-        assert( m_skeletons.size()   == (size_t)m_num_frames );
+        assert( m_joint_infos.size() == m_num_joints );
+        assert( m_bounds.size()      == m_num_frames );
+        assert( m_base_frames.size() == m_num_joints );
+        assert( m_frames.size()      == m_num_frames );
+        assert( m_skeletons.size()   == m_num_frames );
 
         return true;
@@ -506 +506 @@
 void md5_animation::interpolate_skeletons( md5_frame_skeleton& final_skeleton, const md5_frame_skeleton& skeleton0, const md5_frame_skeleton& skeleton1, float interpolate )
 {
-        for ( int i = 0; i < m_num_joints; ++i )
+        for ( size_t i = 0; i < m_num_joints; ++i )
         {
                 md5_skeleton_joint& final_joint = final_skeleton.joints[i];