Index: trunk/src/gfx/image.cc =================================================================== --- trunk/src/gfx/image.cc (revision 405) +++ trunk/src/gfx/image.cc (revision 406) @@ -46,5 +46,5 @@ void image::fill( uint8 value ) { - raw_fill( m_data, m_data + m_size.x * m_size.y * (int)m_depth, value ); + raw_fill( m_data, m_data + m_size.x * m_size.y * static_cast( m_depth ), value ); } Index: trunk/src/gfx/keyframed_mesh.cc =================================================================== --- trunk/src/gfx/keyframed_mesh.cc (revision 405) +++ trunk/src/gfx/keyframed_mesh.cc (revision 406) @@ -71,5 +71,5 @@ if ( m_active ) { - float tick_time = ( (float)a_anim_time * 0.001f ) * anim->get_frame_rate(); + float tick_time = ( static_cast( a_anim_time ) * 0.001f ) * anim->get_frame_rate(); float duration = anim->is_looping() ? anim->get_duration() + 1.0f : anim->get_duration(); if ( tick_time >= duration ) @@ -82,5 +82,5 @@ { m_active = false; - m_last_frame = (uint32)anim->get_end(); + m_last_frame = static_cast( anim->get_end() ); m_next_frame = m_last_frame; m_interpolation = 0.0f; @@ -88,7 +88,7 @@ } } - m_last_frame = (uint32)( glm::floor( tick_time ) + anim->get_start() ); + m_last_frame = static_cast( glm::floor( tick_time ) + anim->get_start() ); m_next_frame = m_last_frame + 1; - if ( m_next_frame > (uint32)anim->get_end() ) m_next_frame = (uint32)anim->get_start(); + if ( m_next_frame > static_cast( anim->get_end() ) ) m_next_frame = static_cast( anim->get_start() ); m_interpolation = tick_time - glm::floor( tick_time ); } @@ -152,9 +152,9 @@ { uint32 base_offset = m_next_frame * m_vertex_count * m_vsize; - m_context->update_attribute_offset( m_va, (slot)m_loc_next_position, base_offset ); - m_context->update_attribute_offset( m_va, (slot)m_loc_next_normal, base_offset + sizeof( vec3 ) ); + m_context->update_attribute_offset( m_va, static_cast( m_loc_next_position ), base_offset ); + m_context->update_attribute_offset( m_va, static_cast( m_loc_next_normal ), base_offset + sizeof( vec3 ) ); if ( m_has_tangent && m_loc_next_tangent != -1 ) { - m_context->update_attribute_offset( m_va, (slot)m_loc_next_tangent, base_offset + 2*sizeof( vec3 ) ); + m_context->update_attribute_offset( m_va, static_cast( m_loc_next_tangent ), base_offset + 2*sizeof( vec3 ) ); } m_gpu_next_frame = m_next_frame; @@ -172,8 +172,8 @@ m_loc_next_tangent = dev->get_attribute_location( a_program, "nv_next_tangent" ); - m_context->add_vertex_buffer( m_va, (slot)m_loc_next_position, m_pbuffer, FLOAT, 3, 0, m_vsize, false ); - m_context->add_vertex_buffer( m_va, (slot)m_loc_next_normal, m_pbuffer, FLOAT, 3, sizeof( vec3 ), m_vsize, false ); + m_context->add_vertex_buffer( m_va, static_cast( m_loc_next_position ), m_pbuffer, FLOAT, 3, 0, m_vsize, false ); + m_context->add_vertex_buffer( m_va, static_cast( m_loc_next_normal ), m_pbuffer, FLOAT, 3, sizeof( vec3 ), m_vsize, false ); if ( m_has_tangent ) - m_context->add_vertex_buffer( m_va, (slot)m_loc_next_tangent, m_pbuffer, FLOAT, 4, 2*sizeof( vec3 ), m_vsize, false ); + m_context->add_vertex_buffer( m_va, static_cast( m_loc_next_tangent ), m_pbuffer, FLOAT, 4, 2*sizeof( vec3 ), m_vsize, false ); } keyframed_mesh::update( a_program ); @@ -184,11 +184,11 @@ { m_va = m_context->create_vertex_array(); - m_pbuffer = m_context->get_device()->create_buffer( VERTEX_BUFFER, STATIC_DRAW, m_vertex_count * m_vsize, (void*)m_vchannel->data ); + m_pbuffer = m_context->get_device()->create_buffer( VERTEX_BUFFER, STATIC_DRAW, m_vertex_count * m_vsize, m_vchannel->data ); m_context->add_vertex_buffers( m_va, m_pbuffer, m_vchannel ); - buffer vb = m_context->get_device()->create_buffer( VERTEX_BUFFER, STATIC_DRAW, m_vertex_count * sizeof( vec2 ), (void*)m_mesh_data->get_channel()->data ); + buffer vb = m_context->get_device()->create_buffer( VERTEX_BUFFER, STATIC_DRAW, m_vertex_count * sizeof( vec2 ), m_mesh_data->get_channel()->data ); m_context->add_vertex_buffers( m_va, vb, m_mesh_data->get_channel() ); - buffer ib = m_context->get_device()->create_buffer( INDEX_BUFFER, STATIC_DRAW, m_mesh_data->get_index_channel()->size(), (void*)m_mesh_data->get_index_channel()->data ); + buffer ib = m_context->get_device()->create_buffer( INDEX_BUFFER, STATIC_DRAW, m_mesh_data->get_index_channel()->size(), m_mesh_data->get_index_channel()->data ); m_context->set_index_buffer( m_va, ib, m_mesh_data->get_index_channel()->desc.slots[0].etype, true ); @@ -206,5 +206,5 @@ const vertex_pnt* prev = data + m_vertex_count * m_last_frame; const vertex_pnt* next = data + m_vertex_count * m_next_frame; - vertex_pnt* vtx = (vertex_pnt*)m_data; + vertex_pnt* vtx = reinterpret_cast( m_data ); for ( size_t i = 0; i < m_vertex_count; ++i ) { @@ -219,5 +219,5 @@ const vertex_pn* prev = data + m_vertex_count * m_last_frame; const vertex_pn* next = data + m_vertex_count * m_next_frame; - vertex_pn* vtx = (vertex_pn*)m_data; + vertex_pn* vtx = reinterpret_cast( m_data ); for ( size_t i = 0; i < m_vertex_count; ++i ) Index: trunk/src/gfx/mesh_creator.cc =================================================================== --- trunk/src/gfx/mesh_creator.cc (revision 405) +++ trunk/src/gfx/mesh_creator.cc (revision 406) @@ -24,6 +24,6 @@ if ( pkeys && pkeys->get_channel_count() > 0 && keys && keys->get_channel_count() > 0 ) { - nv_key_transform* channel = ((nv_key_transform*)(keys->get_channel(0)->data)); - nv_key_transform* pchannel = ((nv_key_transform*)(pkeys->get_channel(0)->data)); + nv_key_transform* channel = reinterpret_cast(keys->get_channel(0)->data); + nv_key_transform* pchannel = reinterpret_cast(pkeys->get_channel(0)->data); for ( unsigned n = 0; n < count; ++n ) { @@ -37,5 +37,5 @@ { m_data->m_frame_rate = 32; - m_data->m_duration = (float)max_frames; + m_data->m_duration = static_cast( max_frames ); } @@ -69,5 +69,5 @@ key_data* new_keys = new key_data; new_keys->add_channel( raw_channel ); - nv_key_transform* channel = ((nv_key_transform*)(raw_channel->data)); + nv_key_transform* channel = reinterpret_cast(raw_channel->data); key_descriptor final_key = old_keys->get_final_key(); @@ -110,5 +110,5 @@ for ( size_t n = 0; n < channel->count; ++n ) { - transform_key_raw( channel->desc, (uint8*)(channel->data + n * key_size), scale, r33, ri33 ); + transform_key_raw( channel->desc, channel->data + n * key_size, scale, r33, ri33 ); } } @@ -135,7 +135,7 @@ switch ( desc.slots[i].vslot ) { - case slot::POSITION : if ( desc.slots[i].etype == FLOAT_VECTOR_3 ) p_offset = (int)desc.slots[i].offset; break; - case slot::NORMAL : if ( desc.slots[i].etype == FLOAT_VECTOR_3 ) n_offset = (int)desc.slots[i].offset; break; - case slot::TANGENT : if ( desc.slots[i].etype == FLOAT_VECTOR_4 ) t_offset = (int)desc.slots[i].offset; break; + case slot::POSITION : if ( desc.slots[i].etype == FLOAT_VECTOR_3 ) p_offset = int(desc.slots[i].offset); break; + case slot::NORMAL : if ( desc.slots[i].etype == FLOAT_VECTOR_3 ) n_offset = int(desc.slots[i].offset); break; + case slot::TANGENT : if ( desc.slots[i].etype == FLOAT_VECTOR_4 ) t_offset = int(desc.slots[i].offset); break; default : break; } @@ -144,5 +144,5 @@ for ( uint32 i = 0; i < channel->count; i++) { - vec3& p = *((vec3*)(raw_data + vtx_size*i + p_offset )); + vec3& p = *reinterpret_cast( raw_data + vtx_size*i + p_offset ); p = vertex_transform * p + vertex_offset; } @@ -151,5 +151,5 @@ for ( uint32 i = 0; i < channel->count; i++) { - vec3& n = *((vec3*)(raw_data + vtx_size*i + n_offset )); + vec3& n = *reinterpret_cast( raw_data + vtx_size*i + n_offset ); n = glm::normalize( normal_transform * n ); } @@ -157,5 +157,5 @@ for ( uint32 i = 0; i < channel->count; i++) { - vec4& t = *((vec4*)(raw_data + vtx_size*i + t_offset )); + vec4& t = *reinterpret_cast(raw_data + vtx_size*i + t_offset ); t = vec4( glm::normalize( normal_transform * vec3(t) ), t[3] ); } @@ -173,5 +173,5 @@ size_t n_offset = 0; if ( ch_n == -1 ) return; - mesh_raw_channel* channel = m_data->m_channels[ (unsigned) ch_n ]; + mesh_raw_channel* channel = m_data->m_channels[ unsigned( ch_n ) ]; for ( uint32 i = 0; i < channel->desc.count; ++i ) if ( channel->desc.slots[i].vslot == slot::NORMAL ) @@ -182,5 +182,5 @@ for ( uint32 i = 0; i < channel->count; ++i ) { - vec3& normal = *(vec3*)(channel->data + channel->desc.size * i + n_offset); + vec3& normal = *reinterpret_cast( channel->data + channel->desc.size * i + n_offset ); normal = -normal; } @@ -211,5 +211,5 @@ if ( desc.slots[i].etype == FLOAT_VECTOR_3 ) { - p_offset = (int)desc.slots[i].offset; + p_offset = int( desc.slots[i].offset ); p_channel = channel; } @@ -217,5 +217,5 @@ case slot::NORMAL : if ( desc.slots[i].etype == FLOAT_VECTOR_3 ) { - n_offset = (int)desc.slots[i].offset; + n_offset = int( desc.slots[i].offset ); n_channel = m_data->m_channels[ c ]; n_channel_index = c; @@ -224,5 +224,5 @@ case slot::TEXCOORD : if ( desc.slots[i].etype == FLOAT_VECTOR_2 ) { - t_offset = (int)desc.slots[i].offset; + t_offset = int( desc.slots[i].offset ); t_channel = channel; } @@ -246,5 +246,5 @@ mesh_raw_channel* g_channel = mesh_raw_channel::create( p_channel->count ); - vec4* tangents = (vec4*)g_channel->data; + vec4* tangents = reinterpret_cast( g_channel->data ); vec3* tangents2 = new vec3[ p_channel->count ]; uint32 tri_count = i_channel ? i_channel->count / 3 : t_channel->count / 3; @@ -259,5 +259,5 @@ if ( i_type == UINT ) { - const uint32* idata = (const uint32*)i_channel->data; + const uint32* idata = reinterpret_cast( i_channel->data ); ti0 = idata[ i * 3 ]; ti1 = idata[ i * 3 + 1 ]; @@ -266,5 +266,5 @@ else if ( i_type == USHORT ) { - const uint16* idata = (const uint16*)i_channel->data; + const uint16* idata = reinterpret_cast( i_channel->data ); ti0 = idata[ i * 3 ]; ti1 = idata[ i * 3 + 1 ]; @@ -278,7 +278,7 @@ } - const vec2& w1 = *((vec2*)(t_channel->data + t_channel->desc.size*ti0 + t_offset )); - const vec2& w2 = *((vec2*)(t_channel->data + t_channel->desc.size*ti1 + t_offset )); - const vec2& w3 = *((vec2*)(t_channel->data + t_channel->desc.size*ti2 + t_offset )); + const vec2& w1 = *reinterpret_cast(t_channel->data + t_channel->desc.size*ti0 + t_offset ); + const vec2& w2 = *reinterpret_cast(t_channel->data + t_channel->desc.size*ti1 + t_offset ); + const vec2& w3 = *reinterpret_cast(t_channel->data + t_channel->desc.size*ti2 + t_offset ); vec2 st1 = w3 - w1; vec2 st2 = w2 - w1; @@ -291,7 +291,7 @@ uint32 nti1 = t_channel->count * set + ti1; uint32 nti2 = t_channel->count * set + ti2; - vec3 v1 = *((vec3*)(p_channel->data + p_channel->desc.size*nti0 + p_offset )); - vec3 v2 = *((vec3*)(p_channel->data + p_channel->desc.size*nti1 + p_offset )); - vec3 v3 = *((vec3*)(p_channel->data + p_channel->desc.size*nti2 + p_offset )); + vec3 v1 = *reinterpret_cast(p_channel->data + p_channel->desc.size*nti0 + p_offset ); + vec3 v2 = *reinterpret_cast(p_channel->data + p_channel->desc.size*nti1 + p_offset ); + vec3 v3 = *reinterpret_cast(p_channel->data + p_channel->desc.size*nti2 + p_offset ); vec3 xyz1 = v3 - v1; vec3 xyz2 = v2 - v1; @@ -317,5 +317,5 @@ for ( unsigned int i = 0; i < vtx_count; ++i ) { - const vec3 n = *((vec3*)(n_channel->data + n_channel->desc.size*i + n_offset )); + const vec3 n = *reinterpret_cast( n_channel->data + n_channel->desc.size*i + n_offset ); const vec3 t = vec3(tangents[i]); if ( ! ( t.x == 0.0f && t.y == 0.0f && t.z == 0.0f ) ) @@ -420,8 +420,8 @@ int och_ti = other->get_channel_index( slot::TEXCOORD ); if ( ch_pi == -1 || ch_ti == -1 ) return; - size_t size = m_data->m_channels[ (unsigned)ch_ti ]->count; - size_t osize = other->m_channels[ (unsigned)och_ti ]->count; - size_t count = m_data->m_channels[ (unsigned)ch_pi ]->count; - size_t ocount = other->m_channels[ (unsigned)och_pi ]->count; + size_t size = m_data->m_channels[ unsigned(ch_ti) ]->count; + size_t osize = other->m_channels[ unsigned(och_ti) ]->count; + size_t count = m_data->m_channels[ unsigned(ch_pi) ]->count; + size_t ocount = other->m_channels[ unsigned(och_pi) ]->count; if ( count % size != 0 || ocount % osize != 0 ) return; if ( count / size != ocount / osize ) return; @@ -440,7 +440,7 @@ { NV_ASSERT( size + osize < uint16(-1), "Index out of range!" ); - uint16* indexes = (uint16*)m_data->m_channels[c]->data; - for ( uint16 i = (uint16)old->count; i < m_data->m_channels[c]->count; ++i ) - indexes[i] += (uint16)size; + uint16* indexes = reinterpret_cast( m_data->m_channels[c]->data ); + for ( uint16 i = uint16( old->count ); i < m_data->m_channels[c]->count; ++i ) + indexes[i] += uint16( size ); } @@ -448,5 +448,5 @@ case UINT : { - uint32* indexes = (uint32*)m_data->m_channels[c]->data; + uint32* indexes = reinterpret_cast( m_data->m_channels[c]->data ); for ( uint32 i = old->count; i < m_data->m_channels[c]->count; ++i ) indexes[i] += size; Index: trunk/src/gfx/skeletal_mesh.cc =================================================================== --- trunk/src/gfx/skeletal_mesh.cc (revision 405) +++ trunk/src/gfx/skeletal_mesh.cc (revision 406) @@ -16,5 +16,5 @@ { const mesh_raw_channel* pnt_chan = a_mesh_data->get_channel(); - m_pntdata.assign( (const md5_vtx_pnt*)pnt_chan->data, pnt_chan->count ); + m_pntdata.assign( reinterpret_cast( pnt_chan->data ), pnt_chan->count ); m_bone_offset.resize( bones->get_count() ); m_transform.resize( bones->get_count() ); @@ -35,6 +35,6 @@ 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( a_anim ); + anim->update_skeleton( m_transform.data(), static_cast( a_anim_time ) ); { size_t skeleton_size = m_bone_offset.size(); @@ -51,7 +51,7 @@ 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,5 +71,5 @@ 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( 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,5 +152,5 @@ if ( bi != bone_names.end() ) { - bone_id = (sint16)bi->second; + bone_id = sint16( bi->second ); } m_bone_ids[n] = bone_id; @@ -207,5 +207,5 @@ if ( m_bone_data && a_anim ) { - skeletal_animation_entry_gpu * anim = (skeletal_animation_entry_gpu*)a_anim; + skeletal_animation_entry_gpu * anim = static_cast( a_anim ); anim->prepare( m_bone_data ); anim->update_skeleton( m_transform, a_anim_time );