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

Manual Merge Cleanup

Browse Source
This commit is contained in:
Kung-vr
2019-03-03 01:02:53 +09:00
parent 3792488372
commit 0f2f956b2e
4 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_scripts/qt/resources.pri
+6
View File
@@ -18,6 +18,12 @@ DISTFILES += \
src/res/qml/ChaperoneWarningsPage.qml \ src/res/qml/ChaperoneWarningsPage.qml \
src/res/qml/FixFloorPage.qml \ src/res/qml/FixFloorPage.qml \
src/res/qml/PlayspacePage.qml \ src/res/qml/PlayspacePage.qml \
src/res/qml/motion_page/* \
src/res/qml/motion_page/gravity/* \
src/res/qml/motion_page/height_toggle/* \
src/res/qml/motion_page/snap_turn/* \
src/res/qml/motion_page/universe_drag/* \
src/res/qml/motion_page/universe_turn/* \
src/res/qml/RevivePage.qml \ src/res/qml/RevivePage.qml \
src/res/qml/RootPage.qml \ src/res/qml/RootPage.qml \
src/res/qml/SettingsPage.qml \ src/res/qml/SettingsPage.qml \
build_scripts/qt/sources.pri
+1
View File
@@ -31,6 +31,7 @@ HEADERS += src/overlaycontroller.h \
src/tabcontrollers/KeyboardInput.h \ src/tabcontrollers/KeyboardInput.h \
src/utils/Matrix.h \ src/utils/Matrix.h \
src/utils/ChaperoneUtils.h \ src/utils/ChaperoneUtils.h \
src/utils/quaternion.h \
src/tabcontrollers/audiomanager/AudioManagerDummy.h \ src/tabcontrollers/audiomanager/AudioManagerDummy.h \
src/tabcontrollers/keyboardinput/KeyboardInputDummy.h \ src/tabcontrollers/keyboardinput/KeyboardInputDummy.h \
src/overlaycontroller/openvr_init.h \ src/overlaycontroller/openvr_init.h \
src/tabcontrollers/MoveCenterTabController.cpp
+22 -16
View File
@@ -187,10 +187,12 @@ void MoveCenterTabController::setRotation( int value, bool notify )
= devicePosesForRot[0].mDeviceToAbsoluteTracking; = devicePosesForRot[0].mDeviceToAbsoluteTracking;
// Set up xyz coordinate values from pose matrix. // Set up xyz coordinate values from pose matrix.
double oldHmdXyz[3] double oldHmdXyz[3] = { static_cast<double>( oldHmdPos.m[0][3] ),
= { oldHmdPos.m[0][3], oldHmdPos.m[1][3], oldHmdPos.m[2][3] }; static_cast<double>( oldHmdPos.m[1][3] ),
double newHmdXyz[3] static_cast<double>( oldHmdPos.m[2][3] ) };
= { oldHmdPos.m[0][3], oldHmdPos.m[1][3], oldHmdPos.m[2][3] }; double newHmdXyz[3] = { static_cast<double>( oldHmdPos.m[0][3] ),
static_cast<double>( oldHmdPos.m[1][3] ),
static_cast<double>( oldHmdPos.m[2][3] ) };
// Convert oldHmdXyz into un-rotated coordinates. // Convert oldHmdXyz into un-rotated coordinates.
double oldAngle = -m_rotation * k_centidegreesToRadians; double oldAngle = -m_rotation * k_centidegreesToRadians;
@@ -281,9 +283,9 @@ void MoveCenterTabController::setAdjustChaperone( bool value, bool notify )
{ {
double angle = m_rotation * k_centidegreesToRadians; double angle = m_rotation * k_centidegreesToRadians;
double offsetdir = m_adjustChaperone ? -1.0 : 1.0; double offsetdir = m_adjustChaperone ? -1.0 : 1.0;
double offset[3] = { offsetdir * m_offsetX, double offset[3] = { offsetdir * static_cast<double>( m_offsetX ),
offsetdir * m_offsetY, offsetdir * static_cast<double>( m_offsetY ),
offsetdir * m_offsetZ }; offsetdir * static_cast<double>( m_offsetZ ) };
rotateCoordinates( offset, angle ); rotateCoordinates( offset, angle );
// We're done with calculations so down-cast to float for // We're done with calculations so down-cast to float for
@@ -505,7 +507,7 @@ void MoveCenterTabController::modOffsetX( float value, bool notify )
if ( !m_lockXToggle ) if ( !m_lockXToggle )
{ {
double angle = m_rotation * k_centidegreesToRadians; double angle = m_rotation * k_centidegreesToRadians;
double offset[3] = { value, 0, 0 }; double offset[3] = { static_cast<double>( value ), 0, 0 };
rotateCoordinates( offset, angle ); rotateCoordinates( offset, angle );
float offsetFloat[3] = { static_cast<float>( offset[0] ), float offsetFloat[3] = { static_cast<float>( offset[0] ),
static_cast<float>( offset[1] ), static_cast<float>( offset[1] ),
@@ -544,7 +546,7 @@ void MoveCenterTabController::modOffsetZ( float value, bool notify )
if ( !m_lockZToggle ) if ( !m_lockZToggle )
{ {
double angle = m_rotation * k_centidegreesToRadians; double angle = m_rotation * k_centidegreesToRadians;
double offset[3] = { 0, 0, value }; double offset[3] = { 0, 0, static_cast<double>( value ) };
rotateCoordinates( offset, angle ); rotateCoordinates( offset, angle );
float offsetFloat[3] = { static_cast<float>( offset[0] ), float offsetFloat[3] = { static_cast<float>( offset[0] ),
static_cast<float>( offset[1] ), static_cast<float>( offset[1] ),
@@ -1086,10 +1088,11 @@ void MoveCenterTabController::updateHandDrag(
return; return;
} }
double relativeControllerPosition[] double relativeControllerPosition[] = {
= { movePose->mDeviceToAbsoluteTracking.m[0][3], static_cast<double>( movePose->mDeviceToAbsoluteTracking.m[0][3] ),
movePose->mDeviceToAbsoluteTracking.m[1][3], static_cast<double>( movePose->mDeviceToAbsoluteTracking.m[1][3] ),
movePose->mDeviceToAbsoluteTracking.m[2][3] }; static_cast<double>( movePose->mDeviceToAbsoluteTracking.m[2][3] )
};
rotateCoordinates( relativeControllerPosition, -angle ); rotateCoordinates( relativeControllerPosition, -angle );
float absoluteControllerPosition[] = { float absoluteControllerPosition[] = {
@@ -1101,9 +1104,12 @@ void MoveCenterTabController::updateHandDrag(
if ( m_lastMoveHand == m_activeDragHand ) if ( m_lastMoveHand == m_activeDragHand )
{ {
double diff[3] = { double diff[3] = {
absoluteControllerPosition[0] - m_lastControllerPosition[0], static_cast<double>( absoluteControllerPosition[0]
absoluteControllerPosition[1] - m_lastControllerPosition[1], - m_lastControllerPosition[0] ),
absoluteControllerPosition[2] - m_lastControllerPosition[2], static_cast<double>( absoluteControllerPosition[1]
- m_lastControllerPosition[1] ),
static_cast<double>( absoluteControllerPosition[2]
- m_lastControllerPosition[2] ),
}; };
// offset is un-rotated coordinates // offset is un-rotated coordinates
src/utils/quaternion.h
+18 -11
View File
@@ -9,21 +9,28 @@ inline vr::HmdQuaternion_t quaternionFromHmdMatrix34( vr::HmdMatrix34_t matrix )
{ {
vr::HmdQuaternion_t q; vr::HmdQuaternion_t q;
q.w = sqrt( q.w = sqrt( fmax( 0,
fmax( 0, 1 + matrix.m[0][0] + matrix.m[1][1] + matrix.m[2][2] ) ) static_cast<double>( 1 + matrix.m[0][0] + matrix.m[1][1]
+ matrix.m[2][2] ) ) )
/ 2; / 2;
q.x = sqrt( q.x = sqrt( fmax( 0,
fmax( 0, 1 + matrix.m[0][0] - matrix.m[1][1] - matrix.m[2][2] ) ) static_cast<double>( 1 + matrix.m[0][0] - matrix.m[1][1]
- matrix.m[2][2] ) ) )
/ 2; / 2;
q.y = sqrt( q.y = sqrt( fmax( 0,
fmax( 0, 1 - matrix.m[0][0] + matrix.m[1][1] - matrix.m[2][2] ) ) static_cast<double>( 1 - matrix.m[0][0] + matrix.m[1][1]
- matrix.m[2][2] ) ) )
/ 2; / 2;
q.z = sqrt( q.z = sqrt( fmax( 0,
fmax( 0, 1 - matrix.m[0][0] - matrix.m[1][1] + matrix.m[2][2] ) ) static_cast<double>( 1 - matrix.m[0][0] - matrix.m[1][1]
+ matrix.m[2][2] ) ) )
/ 2; / 2;
q.x = copysign( q.x, matrix.m[2][1] - matrix.m[1][2] ); q.x = copysign( q.x,
q.y = copysign( q.y, matrix.m[0][2] - matrix.m[2][0] ); static_cast<double>( matrix.m[2][1] - matrix.m[1][2] ) );
q.z = copysign( q.z, matrix.m[1][0] - matrix.m[0][1] ); q.y = copysign( q.y,
static_cast<double>( matrix.m[0][2] - matrix.m[2][0] ) );
q.z = copysign( q.z,
static_cast<double>( matrix.m[1][0] - matrix.m[0][1] ) );
return q; return q;
} }