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

Clean-up after merge

Browse Source
This commit is contained in:
Kung-vr
2019-01-17 02:01:23 +09:00
parent 6fcf0b1a54
commit 0c0a616691
3 changed files with 0 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/res/qml/PlayspacePage.qml
-38
View File
@@ -249,19 +249,11 @@ 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
}
}
@@ -274,17 +266,10 @@ 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) + "°"
}
}
@@ -294,19 +279,11 @@ 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
}
}
@@ -321,17 +298,10 @@ 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
}
}
}
@@ -340,11 +310,7 @@ MyStackViewPage {
Layout.preferredWidth: 145
text:"Apply"
onClicked: {
<<<<<<< HEAD
MoveCenterTabController.rotation = MoveCenterTabController.tempRotation
=======
MoveCenterTabController.rotation = MoveCenterTabController.tempRotation
>>>>>>> master
}
}
}
@@ -486,10 +452,6 @@ 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,7 +151,6 @@ 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
@@ -195,13 +194,6 @@ 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 )
{
@@ -250,18 +242,6 @@ 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,10 +54,6 @@ 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;