Changeset 406 for trunk/src/formats/md5_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/md5_loader.cc (modified) (11 diffs)

trunk/src/formats/md5_loader.cc

@@ -162 +162 @@
                                                 mesh_raw_channel* ch_t   = mesh_raw_channel::create<md5_vtx_t>( num_verts );
                                                 mesh_raw_channel* ch_pntiw = mesh_raw_channel::create<md5_vtx_pntiw>( num_verts );
-                                                tdata = (md5_vtx_t*)ch_t->data;
+                                                tdata = reinterpret_cast< md5_vtx_t* >( ch_t->data );
                                                 mesh->add_channel( ch_pnt );
                                                 mesh->add_channel( ch_t );
@@ -191 +191 @@
 
                                         mesh_raw_channel* ch_i = mesh_raw_channel::create_index<uint32>( num_tris * 3 );
-                                        uint32* vtx_i                = (uint32*)ch_i->data;
+                                        uint32* vtx_i                = reinterpret_cast< uint32* >( ch_i->data );
                                         uint32 idx = 0;
                                         mesh->add_channel( ch_i );
@@ -199 +199 @@
                                         for ( uint32 i = 0; i < num_tris; ++i )
                                         {
-                                                size_t ti0;
-                                                size_t ti1;
-                                                size_t ti2;
+                                                unsigned ti0;
+                                                unsigned ti1;
+                                                unsigned ti2;
 
                                                 std::getline( sstream, line );
                                                 sscanf( line.c_str(), "%*s %*u %u %u %u )", &(ti0), &(ti1), &(ti2));
 
-                                                vtx_i[idx++] = (uint32)ti0;
-                                                vtx_i[idx++] = (uint32)ti1;
-                                                vtx_i[idx++] = (uint32)ti2;
+                                                vtx_i[idx++] = ti0;
+                                                vtx_i[idx++] = ti1;
+                                                vtx_i[idx++] = ti2;
                                         }              
                                 }
@@ -244 +244 @@
                         assert( nodes == nullptr );
                         nodes = new mesh_node_data[ num_joints ];
-                        m_nodes = new mesh_nodes_data( "md5_animation", num_joints, nodes, (nv::uint16)frame_rate, (float)num_frames, true );
+                        m_nodes = new mesh_nodes_data( "md5_animation", num_joints, nodes, static_cast< nv::uint16 >( frame_rate ), static_cast< float >( num_frames ), true );
                         joint_infos.resize( num_joints );
 
@@ -318 +318 @@
                         {
                                 sstream >> buf;
-                                frame.push_back((float)atof(buf));
+                                frame.push_back( static_cast< float >( atof(buf) ) );
                         }
 
@@ -336 +336 @@
 {
         assert( m_type == MESH );
-        md5_vtx_pnt* vtcs = (md5_vtx_pnt*)mdata->get_channel< md5_vtx_pnt >()->data; 
-        md5_vtx_pntiw* vtx_data = (md5_vtx_pntiw*)mdata->get_channel< md5_vtx_pntiw >()->data; 
+        md5_vtx_pnt* vtcs       = reinterpret_cast< md5_vtx_pnt* >( mdata->get_channel< md5_vtx_pnt >()->data ); 
+        md5_vtx_pntiw* vtx_data = reinterpret_cast< md5_vtx_pntiw* >( mdata->get_channel< md5_vtx_pntiw >()->data );
 
         for ( uint32 i = 0; i < vtx_count; ++i )
@@ -368 +368 @@
                 }
 
-                for ( size_t j = 0; j < 4; ++j )
-                {
-                        if ( j < weight_count )
-                        {
-                                vdata.boneindex[j]  = (int)weights[start_weight + j].joint_id;
-                                vdata.boneweight[j] = weights[start_weight + j].bias;
+                for ( int j = 0; j < 4; ++j )
+                {
+                        if ( j < int(weight_count) )
+                        {
+                                vdata.boneindex[j]  = int( weights[int(start_weight) + j].joint_id );
+                                vdata.boneweight[j] = weights[int(start_weight) + j].bias;
                         }
                         else
@@ -396 +396 @@
         }
 
-        const uint32*    idata = (uint32*)mdata->get_index_channel()->data;
+        const uint32*    idata = reinterpret_cast< uint32* >( mdata->get_index_channel()->data );
         const md5_vtx_t* tdata = mdata->get_channel_data<md5_vtx_t>();
 
@@ -448 +448 @@
                 vdata.tangent  = vec3(0);
  
-                for ( size_t j = 0; j < 4; ++j )
+                for ( int j = 0; j < 4; ++j )
                 {
                         const mesh_node_data&  joint = nodes[vdata.boneindex[j]];
@@ -484 +484 @@
                 {
                         const mesh_node_data& pjoint = nodes[parent_id];
-                        const transform* ptv = (const transform*)pjoint.data->get_channel(0)->data;
+                        const transform* ptv = reinterpret_cast< const transform* >( pjoint.data->get_channel(0)->data );
                         transform ptr;
                         if ( pjoint.data->get_channel(0)->count > index ) ptr = ptv[ index ];
@@ -495 +495 @@
                 }
 
-                ((transform*)joint.data->get_channel(0)->data)[index] = transform( pos, orient );
+                reinterpret_cast< transform* >( joint.data->get_channel(0)->data )[index] = transform( pos, orient );
         }
 }