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

switch to cmath and std::isnan

Browse Source
This commit is contained in:
Robin Appelman
2018-12-26 02:09:50 +01:00
parent 32fd633588
commit f383fe081e
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/ChaperoneTabController.cpp
+6 -6
View File
@@ -1,7 +1,7 @@
#include "ChaperoneTabController.h" #include "ChaperoneTabController.h"
#include <QQuickWindow> #include <QQuickWindow>
#include "../overlaycontroller.h" #include "../overlaycontroller.h"
#include <math.h> #include <cmath>
// application namespace // application namespace
namespace advsettings { namespace advsettings {
@@ -361,7 +361,7 @@ void ChaperoneTabController::eventLoopTick(vr::TrackedDevicePose_t* devicePoses,
poseHmd.mDeviceToAbsoluteTracking.m[1][3], poseHmd.mDeviceToAbsoluteTracking.m[1][3],
poseHmd.mDeviceToAbsoluteTracking.m[2][3] poseHmd.mDeviceToAbsoluteTracking.m[2][3]
}); });
if (!isnan(distanceHmd)) { if (!std::isnan(distanceHmd)) {
minDistance = distanceHmd; minDistance = distanceHmd;
} }
} }
@@ -374,7 +374,7 @@ void ChaperoneTabController::eventLoopTick(vr::TrackedDevicePose_t* devicePoses,
poseLeft.mDeviceToAbsoluteTracking.m[1][3], poseLeft.mDeviceToAbsoluteTracking.m[1][3],
poseLeft.mDeviceToAbsoluteTracking.m[2][3] poseLeft.mDeviceToAbsoluteTracking.m[2][3]
}); });
if (!isnan(distanceLeft) && (isnan(minDistance) || distanceLeft < minDistance)) { if (!std::isnan(distanceLeft) && (std::isnan(minDistance) || distanceLeft < minDistance)) {
minDistance = distanceLeft; minDistance = distanceLeft;
} }
} }
@@ -388,12 +388,12 @@ void ChaperoneTabController::eventLoopTick(vr::TrackedDevicePose_t* devicePoses,
poseRight.mDeviceToAbsoluteTracking.m[1][3], poseRight.mDeviceToAbsoluteTracking.m[1][3],
poseRight.mDeviceToAbsoluteTracking.m[2][3] poseRight.mDeviceToAbsoluteTracking.m[2][3]
}); });
if (!isnan(distanceRight) && (isnan(minDistance) || distanceRight < minDistance)) { if (!std::isnan(distanceRight) && (std::isnan(minDistance) || distanceRight < minDistance)) {
minDistance = distanceRight; minDistance = distanceRight;
} }
} }
} }
if (!isnan(minDistance)) { if (!std::isnan(minDistance)) {
handleChaperoneWarnings(minDistance); handleChaperoneWarnings(minDistance);
} }
} }
@@ -1002,7 +1002,7 @@ float ChaperoneTabController::getBoundsMaxY() {
} else { } else {
ci = 2; ci = 2;
} }
if (isnan(result) || result < collisionBounds[b].vCorners[ci].v[1]) { if (std::isnan(result) || result < collisionBounds[b].vCorners[ci].v[1]) {
result = collisionBounds[b].vCorners[ci].v[1]; result = collisionBounds[b].vCorners[ci].v[1];
} }
} }
src/utils/ChaperoneUtils.cpp
+2 -3
View File
@@ -1,7 +1,6 @@
#include "ChaperoneUtils.h" #include "ChaperoneUtils.h"
#include <iostream> #include <iostream>
#include <math.h> #include <cmath>
namespace utils { namespace utils {
@@ -43,7 +42,7 @@ float ChaperoneUtils::_getDistanceToChaperone(const vr::HmdVector3_t & x, vr::Hm
float d_z = x1_z - x.v[2]; float d_z = x1_z - x.v[2];
d = sqrt(d_x*d_x + d_z*d_z); d = sqrt(d_x*d_x + d_z*d_z);
} }
if (isnan(distance) || d < distance) { if (std::isnan(distance) || d < distance) {
distance = d; distance = d;
if (projectedPoint) { if (projectedPoint) {
projectedPoint->v[0] = x1_x; projectedPoint->v[0] = x1_x;