Merge branch 'master' into alpha-kung

src/tabcontrollers/MoveCenterTabController.cpp

@@ -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

@@ -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;