Fix -Wconversion

This commit is contained in:
Vasily
2019-02-21 18:48:53 +01:00
committed by username223
parent cff2fc7eba
commit dacfe05425
2 changed files with 4 additions and 4 deletions
@@ -654,10 +654,10 @@ void ChaperoneTabController::eventLoopTick(
if ( parent->isDashboardVisible() ) if ( parent->isDashboardVisible() )
{ {
vr::EVRSettingsError vrSettingsError; vr::EVRSettingsError vrSettingsError;
float vis = vr::VRSettings()->GetInt32( float vis = static_cast<float>( vr::VRSettings()->GetInt32(
vr::k_pch_CollisionBounds_Section, vr::k_pch_CollisionBounds_Section,
vr::k_pch_CollisionBounds_ColorGammaA_Int32, vr::k_pch_CollisionBounds_ColorGammaA_Int32,
&vrSettingsError ); &vrSettingsError ) );
if ( vrSettingsError != vr::VRSettingsError_None ) if ( vrSettingsError != vr::VRSettingsError_None )
{ {
LOG( WARNING ) LOG( WARNING )
@@ -48,10 +48,10 @@ void StatisticsTabController::eventLoopTick(
} }
else else
{ {
float delta = std::sqrt( float delta = static_cast<float>( std::sqrt(
std::pow( m[0][3] - lastHmdPos[0], std::pow( m[0][3] - lastHmdPos[0],
2 ) /*+ std::pow(m[1][3] - lastHmdPos[1], 2)*/ 2 ) /*+ std::pow(m[1][3] - lastHmdPos[1], 2)*/
+ std::pow( m[2][3] - lastHmdPos[2], 2 ) ); + std::pow( m[2][3] - lastHmdPos[2], 2 ) ) );
if ( delta >= 0.01f ) if ( delta >= 0.01f )
{ {
m_hmdDistanceMoved += static_cast<double>( delta ); m_hmdDistanceMoved += static_cast<double>( delta );