Merge branch 'master' into alpha-kung

2019-01-17 01:55:12 +09:00
parent 8a779b518f 5ee667a56b
commit 6fcf0b1a54
6 changed files with 65 additions and 3 deletions
@@ -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 )