Browse Source

Fix for OS X scene editor mouse wheel, camera speed adjustment

Josh Engebretson 9 years ago
parent
commit
80249b1e34
1 changed files with 10 additions and 5 deletions
  1. 10 5
      Source/AtomicEditor/Editors/SceneEditor3D/SceneView3D.cpp

+ 10 - 5
Source/AtomicEditor/Editors/SceneEditor3D/SceneView3D.cpp

@@ -247,11 +247,16 @@ void SceneView3D::MoveCamera(float timeStep)
 
 
     if (changingCameraSpeed)
     if (changingCameraSpeed)
     {
     {
-        if (input->GetMouseMoveWheel() > 0)
-            cameraMoveSpeed_ += input->GetMouseMoveWheel() * CAMERA_MOVE_TEMPO;
-        else
-            if (input->GetMouseMoveWheel() < 0)
-                cameraMoveSpeed_ += input->GetMouseMoveWheel() * CAMERA_MOVE_TEMPO;
+
+        int mouseWheel = input->GetMouseMoveWheel();
+
+        // Apple decided to change the direction of mousewheel input to match touch devices
+#ifdef ATOMIC_PLATFORM_OSX
+        mouseWheel = -mouseWheel;
+#endif
+
+        if (mouseWheel)
+            cameraMoveSpeed_ += mouseWheel * CAMERA_MOVE_TEMPO;
 
 
         CheckCameraSpeedBounds();
         CheckCameraSpeedBounds();
     }
     }