SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix clang -Wdouble-promotion cast

Browse Source
This commit is contained in:
Vasily
2019-02-21 18:48:53 +01:00
committed by username223
parent 60b9f71b9a
commit bc8ab72363
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/ChaperoneUtils.cpp
+9 -3
View File
@@ -29,10 +29,14 @@ float ChaperoneUtils::_getDistanceToChaperone(
{ // projected point outside of segment { // projected point outside of segment
float d_x = r0.v[0] - x.v[0]; float d_x = r0.v[0] - x.v[0];
float d_z = r0.v[2] - x.v[2]; float d_z = r0.v[2] - x.v[2];
float d1 = sqrt( static_cast<float>( d_x * d_x + d_z * d_z ) ); // Crazy casts because clang sees the sqrt call as wanting a double.
float d1 = static_cast<float>(
sqrt( static_cast<double>( d_x * d_x + d_z * d_z ) ) );
d_x = r1.v[0] - x.v[0]; d_x = r1.v[0] - x.v[0];
d_z = r1.v[2] - x.v[2]; d_z = r1.v[2] - x.v[2];
float d2 = sqrt( static_cast<float>( d_x * d_x + d_z * d_z ) ); // Crazy casts because clang sees the sqrt call as wanting a double.
float d2 = static_cast<float>(
sqrt( static_cast<double>( d_x * d_x + d_z * d_z ) ) );
if ( d1 < d2 ) if ( d1 < d2 )
{ {
d = d1; d = d1;
@@ -52,7 +56,9 @@ float ChaperoneUtils::_getDistanceToChaperone(
x1_z = r0.v[2] + r * u_z; x1_z = r0.v[2] + r * u_z;
float d_x = x1_x - x.v[0]; float d_x = x1_x - x.v[0];
float d_z = x1_z - x.v[2]; float d_z = x1_z - x.v[2];
d = sqrt( static_cast<float>( d_x * d_x + d_z * d_z ) ); // Crazy casts because clang sees the sqrt call as wanting a double.
d = static_cast<float>(
sqrt( static_cast<double>( d_x * d_x + d_z * d_z ) ) );
} }
if ( std::isnan( distance ) || d < distance ) if ( std::isnan( distance ) || d < distance )
{ {