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

Fix clang -Wdouble-promotion issues

Browse Source
This commit is contained in:
Vasily
2019-02-21 18:48:53 +01:00
committed by username223
parent ec014a1e74
commit 88dad1087f
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/Matrix.h
+18 -11
View File
@@ -111,21 +111,28 @@ inline vr::HmdQuaternion_t getQuaternion( vr::HmdMatrix34_t matrix )
{
vr::HmdQuaternion_t q;
q.w = sqrt(
fmax( 0, 1 + matrix.m[0][0] + matrix.m[1][1] + matrix.m[2][2] ) )
q.w = sqrt( fmax( 0,
static_cast<float>( 1 + matrix.m[0][0] + matrix.m[1][1]
+ matrix.m[2][2] ) ) )
/ 2;
q.x = sqrt(
fmax( 0, 1 + matrix.m[0][0] - matrix.m[1][1] - matrix.m[2][2] ) )
q.x = sqrt( fmax( 0,
static_cast<float>( 1 + matrix.m[0][0] - matrix.m[1][1]
- matrix.m[2][2] ) ) )
/ 2;
q.y = sqrt(
fmax( 0, 1 - matrix.m[0][0] + matrix.m[1][1] - matrix.m[2][2] ) )
q.y = sqrt( fmax( 0,
static_cast<float>( 1 - matrix.m[0][0] + matrix.m[1][1]
- matrix.m[2][2] ) ) )
/ 2;
q.z = sqrt(
fmax( 0, 1 - matrix.m[0][0] - matrix.m[1][1] + matrix.m[2][2] ) )
q.z = sqrt( fmax( 0,
static_cast<float>( 1 - matrix.m[0][0] - matrix.m[1][1]
+ matrix.m[2][2] ) ) )
/ 2;
q.x = copysign( q.x, matrix.m[2][1] - matrix.m[1][2] );
q.y = copysign( q.y, matrix.m[0][2] - matrix.m[2][0] );
q.z = copysign( q.z, matrix.m[1][0] - matrix.m[0][1] );
q.x = copysign( q.x,
static_cast<float>( matrix.m[2][1] - matrix.m[1][2] ) );
q.y = copysign( q.y,
static_cast<float>( matrix.m[0][2] - matrix.m[2][0] ) );
q.z = copysign( q.z,
static_cast<float>( matrix.m[1][0] - matrix.m[0][1] ) );
return q;
}