From dacfe054254e89f76b8b4fa36447bac47b62f5dc Mon Sep 17 00:00:00 2001 From: Vasily Date: Tue, 19 Feb 2019 19:04:01 +0100 Subject: [PATCH] Fix -Wconversion --- src/tabcontrollers/ChaperoneTabController.cpp | 4 ++-- src/tabcontrollers/StatisticsTabController.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tabcontrollers/ChaperoneTabController.cpp b/src/tabcontrollers/ChaperoneTabController.cpp index eb4c372..dfbac39 100644 --- a/src/tabcontrollers/ChaperoneTabController.cpp +++ b/src/tabcontrollers/ChaperoneTabController.cpp @@ -654,10 +654,10 @@ void ChaperoneTabController::eventLoopTick( if ( parent->isDashboardVisible() ) { vr::EVRSettingsError vrSettingsError; - float vis = vr::VRSettings()->GetInt32( + float vis = static_cast( vr::VRSettings()->GetInt32( vr::k_pch_CollisionBounds_Section, vr::k_pch_CollisionBounds_ColorGammaA_Int32, - &vrSettingsError ); + &vrSettingsError ) ); if ( vrSettingsError != vr::VRSettingsError_None ) { LOG( WARNING ) diff --git a/src/tabcontrollers/StatisticsTabController.cpp b/src/tabcontrollers/StatisticsTabController.cpp index 66ed5fe..44fa847 100644 --- a/src/tabcontrollers/StatisticsTabController.cpp +++ b/src/tabcontrollers/StatisticsTabController.cpp @@ -48,10 +48,10 @@ void StatisticsTabController::eventLoopTick( } else { - float delta = std::sqrt( + float delta = static_cast( std::sqrt( std::pow( m[0][3] - lastHmdPos[0], 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 ) { m_hmdDistanceMoved += static_cast( delta );