Changeset 406 for trunk/src/formats/md2_loader.cc

Timestamp:

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

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

File:

• trunk/src/formats/md2_loader.cc (modified) (8 diffs)

trunk/src/formats/md2_loader.cc

@@ -192 +192 @@
         //      return vec3( v[0], v[1], v[2] );
         return vec3( v[0], v[2], v[1] );
-}
-
-static inline vec3 md2_normal( uint8 normal )
-{
-        return md2_vec3( md2_normal_table[normal] );
 }
 
@@ -220 +215 @@
 md2_loader::~md2_loader()
 {
-        if (m_md2 != nullptr)
-        {
-                free_md2( (md2_t*)(m_md2) );
-                delete (md2_t*)m_md2;
+        md2_t* md2 = reinterpret_cast< md2_t* >( m_md2 );
+        if ( md2 != nullptr)
+        {
+                free_md2( md2 );
+                delete md2;
         }
 }
@@ -229 +225 @@
 bool md2_loader::load( stream& source )
 {
-        m_md2 = (void*)(new md2_t);
-        if ( !read_md2( (md2_t*)m_md2, source ) )
+        md2_t* md2 = new md2_t; 
+        m_md2 = md2;
+        if ( !read_md2( md2, source ) )
         {
                 return false;
@@ -240 +237 @@
 nv::size_t md2_loader::get_max_frames() const
 {
-        return static_cast< size_t >( ((md2_t*)m_md2)->header.num_frames );
+        return static_cast<size_t>( reinterpret_cast<md2_t*>( m_md2 )->header.num_frames );
 }
 
 void nv::md2_loader::reindex()
 {
-        md2_t* md2 = (md2_t*)m_md2;
+        md2_t* md2 = reinterpret_cast< md2_t* >( m_md2 );
         uint32 num_indexes = static_cast< uint32 >( md2->header.num_tris * 3 );
 
@@ -321 +318 @@
 void nv::md2_loader::release_mesh_frame( mesh_data* data, sint32 frame )
 {
-        md2_t* md2 = (md2_t*)m_md2;
+        md2_t* md2 = reinterpret_cast< md2_t* >( m_md2 );
         size_t num_frames = static_cast< size_t >( md2->header.num_frames );
         size_t num_verts  =     m_new_vindexes.size();
@@ -328 +325 @@
 
         mesh_raw_channel* mc_pn = mesh_raw_channel::create< vtx_md2_pn >( num_verts * frame_count );
-        vtx_md2_pn* vtx_pn = (vtx_md2_pn*)mc_pn->data;
+        vtx_md2_pn* vtx_pn = reinterpret_cast< vtx_md2_pn* >( mc_pn->data );
 
         uint32 index = 0;
@@ -351 +348 @@
 
         mesh_raw_channel* mc_t = mesh_raw_channel::create< vtx_md2_t >( num_verts );
-        vtx_md2_t* vtx_t = (vtx_md2_t*)mc_t->data;
-
-        vec2 scale( 1.0f / (float) md2->header.skinwidth, 1.0f / (float) md2->header.skinheight );
+        vtx_md2_t* vtx_t = reinterpret_cast< vtx_md2_t* >( mc_t->data );
+
+        vec2 scale( 1.0f / static_cast<float>( md2->header.skinwidth ), 1.0f / static_cast<float>( md2->header.skinheight ) );
         for (size_t i = 0; i < num_verts; ++i )
         {
@@ -363 +360 @@
         if ( m_new_indexes.size() > 0 )
         {
-                uint16* icp = (uint16*)ic->data;
+                uint16* icp = reinterpret_cast< uint16* >( ic->data );
                 raw_copy_n( m_new_indexes.data(), m_new_indexes.size(), icp );
         }