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

Merge branch 'master' into alpha-kung

Browse Source
This commit is contained in:
Kung-vr
2019-01-17 01:55:12 +09:00
parent 8a779b518f 5ee667a56b
commit 6fcf0b1a54
6 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_scripts/win/common.py
+1 -1
View File
@@ -11,7 +11,7 @@ import distutils.dir_util
#Const globals
#Version string must be bumped every release.
#TODO: See developer documentation.
VERSION_STRING = "2-8-0"
VERSION_STRING = "2-8-0-dev"
EXIT_CODE_SUCCESS = 0
EXIT_CODE_FAILURE_BUILD_APP = 1
installer/installer.nsi
+1 -1
View File
@@ -11,7 +11,7 @@
!define THIRDDIR "..\third-party"
!define PACKAGEDIR "..\src\package_files"
!define PROJECTDIR "..\"
!define VERSION_STRING "2-8-0"
!define VERSION_STRING "2-8-0-dev"
;Name and file
Name "OpenVR Advanced Settings"
src/overlaycontroller.h
+1 -1
View File
@@ -49,7 +49,7 @@ public:
static constexpr auto applicationName = "OpenVRAdvancedSettings";
static constexpr const char* applicationKey = "matzman666.AdvancedSettings";
static constexpr const char* applicationDisplayName = "Advanced Settings";
static constexpr const char* applicationVersionString = "v2.8.0";
static constexpr const char* applicationVersionString = "v2.8.0-dev";
private:
vr::VROverlayHandle_t m_ulOverlayHandle = vr::k_ulOverlayHandleInvalid;
src/res/qml/PlayspacePage.qml
+38
View File
@@ -249,11 +249,19 @@ MyStackViewPage {
Layout.preferredWidth: 40
text: "-"
onClicked: {
<<<<<<< HEAD
var val = ( MoveCenterTabController.tempRotation / 100 ) - 45
if (val < -180) {
val = val + 360;
}
MoveCenterTabController.tempRotation = val * 100
=======
var val = MoveCenterTabController.tempRotation - 45
if (val < -180) {
val = val + 360;
}
MoveCenterTabController.tempRotation = val
>>>>>>> master
}
}
@@ -266,10 +274,17 @@ MyStackViewPage {
Layout.fillWidth: true
onPositionChanged: {
var val = this.from + ( this.position * (this.to - this.from))
<<<<<<< HEAD
MoveCenterTabController.tempRotation = Math.round(val * 100)
}
onValueChanged: {
MoveCenterTabController.tempRotation = Math.round(playspaceRotationSlider.value * 100)
=======
MoveCenterTabController.tempRotation = Math.round(val)
}
onValueChanged: {
MoveCenterTabController.tempRotation = Math.round(playspaceRotationSlider.value)
>>>>>>> master
//playspaceRotationText.text = Math.round(playspaceRotationSlider.value) + "°"
}
}
@@ -279,11 +294,19 @@ MyStackViewPage {
Layout.preferredWidth: 40
text: "+"
onClicked: {
<<<<<<< HEAD
var val = ( MoveCenterTabController.tempRotation / 100 ) + 45
if (val > 180) {
val = val -360;
}
MoveCenterTabController.tempRotation = val * 100
=======
var val = MoveCenterTabController.tempRotation + 45
if (val > 180) {
val = val -360;
}
MoveCenterTabController.tempRotation = val
>>>>>>> master
}
}
@@ -298,10 +321,17 @@ MyStackViewPage {
var val = parseFloat(input)
if (!isNaN(val)) {
val = val % 180
<<<<<<< HEAD
MoveCenterTabController.tempRotation = Math.round(val * 100)
text = ( MoveCenterTabController.tempRotation / 100 ) + "°"
} else {
text = ( MoveCenterTabController.tempRotation / 100 ) + "°"
=======
MoveCenterTabController.tempRotation = val
text = MoveCenterTabController.tempRotation + "°"
} else {
text = MoveCenterTabController.tempRotation + "°"
>>>>>>> master
}
}
}
@@ -310,7 +340,11 @@ MyStackViewPage {
Layout.preferredWidth: 145
text:"Apply"
onClicked: {
<<<<<<< HEAD
MoveCenterTabController.rotation = MoveCenterTabController.tempRotation
=======
MoveCenterTabController.rotation = MoveCenterTabController.tempRotation
>>>>>>> master
}
}
}
@@ -452,6 +486,10 @@ MyStackViewPage {
playspaceRotationSlider.value = ( MoveCenterTabController.tempRotation / 100 )
playspaceRotationText.text = ( MoveCenterTabController.tempRotation / 100 ) + "°"
}
onTempRotationChanged: {
playspaceRotationSlider.value = MoveCenterTabController.tempRotation
playspaceRotationText.text = MoveCenterTabController.tempRotation + "°"
}
onAdjustChaperoneChanged: {
playspaceAdjustChaperoneToggle.checked = MoveCenterTabController.adjustChaperone
}
src/tabcontrollers/MoveCenterTabController.cpp
+20
View File
@@ -151,6 +151,7 @@ void MoveCenterTabController::setRotation( int value, bool notify )
{
if ( m_rotation != value )
{
<<<<<<< HEAD
double angle = ( value - m_rotation ) * M_PI / 18000.0;
// Revert now because we don't commit in RotateUniverseCenter and
@@ -194,6 +195,13 @@ void MoveCenterTabController::setRotation( int value, bool notify )
m_adjustChaperone,
false );
=======
float angle = ( value - m_rotation ) * 2 * M_PI / 360.0;
parent->RotateUniverseCenter(
( vr::TrackingUniverseOrigin ) m_trackingUniverse,
angle,
m_adjustChaperone );
>>>>>>> master
m_rotation = value;
if ( notify )
{
@@ -242,6 +250,18 @@ void MoveCenterTabController::setRotation( int value, bool notify )
}
void MoveCenterTabController::setTempRotation( int value, bool notify )
<<<<<<< HEAD
=======
{
m_tempRotation = value;
if ( notify )
{
emit tempRotationChanged( m_tempRotation );
}
}
void MoveCenterTabController::applyRotation()
>>>>>>> master
{
m_tempRotation = value;
if ( notify )
src/tabcontrollers/MoveCenterTabController.h
+4
View File
@@ -54,6 +54,10 @@ private:
float m_offsetZ = 0.0f;
int m_rotation = 0;
int m_tempRotation = 0;
<<<<<<< HEAD
=======
int m_rotationOld = 0;
>>>>>>> master
bool m_adjustChaperone = true;
bool m_rotateHand = false;
bool m_moveShortcutRightPressed = false;