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

Attempt different fix for clang -Wdouble-promotion

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