Merge branch 'restore-gamepad-zoom' into 'master'

Restore Gamepad Zooming

See merge request OpenMW/openmw!276

apps/openmw/mwbase/world.hpp

@@ -416,6 +416,7 @@ namespace MWBase
 
             virtual void togglePOV(bool force = false) = 0;
             virtual bool isFirstPerson() const = 0;
+            virtual bool isPreviewModeEnabled() const = 0;
             virtual void togglePreviewMode(bool enable) = 0;
             virtual bool toggleVanityMode(bool enable) = 0;
             virtual void allowVanityMode(bool allow) = 0;

apps/openmw/mwinput/actionmanager.cpp

@@ -167,6 +167,11 @@ namespace MWInput
 
         mAttemptJump = false;
     }
+    
+    bool ActionManager::isPreviewModeEnabled()
+    {
+        return MWBase::Environment::get().getWorld()->isPreviewModeEnabled();
+    }
 
     void ActionManager::resetIdleTime()
     {

apps/openmw/mwinput/actionmanager.hpp

@@ -54,7 +54,7 @@ namespace MWInput
 
         void setAttemptJump(bool enabled) { mAttemptJump = enabled; }
 
-        float getPreviewDelay() const { return mPreviewPOVDelay; };
+        bool isPreviewModeEnabled();
 
     private:
         void handleGuiArrowKey(int action);

apps/openmw/mwinput/controllermanager.cpp

@@ -89,7 +89,7 @@ namespace MWInput
 
     bool ControllerManager::update(float dt)
     {
-        mGamepadPreviewMode = mActionManager->getPreviewDelay() == 1.f;
+        mGamepadPreviewMode = mActionManager->isPreviewModeEnabled();
 
         if (mGuiCursorEnabled && !(mJoystickLastUsed && !mGamepadGuiCursorEnabled))
         {
@@ -287,7 +287,7 @@ namespace MWInput
         }
         else
         {
-            if (mGamepadPreviewMode && arg.value) // Preview Mode Gamepad Zooming
+            if (mGamepadPreviewMode) // Preview Mode Gamepad Zooming
             {
                 if (arg.axis == SDL_CONTROLLER_AXIS_TRIGGERRIGHT)
                 {

apps/openmw/mwworld/worldimp.cpp

@@ -2394,6 +2394,11 @@ namespace MWWorld
     {
         return mRendering->getCamera()->isFirstPerson();
     }
+    
+    bool World::isPreviewModeEnabled() const
+    {
+        return mRendering->getCamera()->getMode() == MWRender::Camera::Mode::Preview;
+    }
 
     void World::togglePreviewMode(bool enable)
     {

apps/openmw/mwworld/worldimp.hpp

@@ -524,6 +524,7 @@ namespace MWWorld
             void togglePOV(bool force = false) override;
 
             bool isFirstPerson() const override;
+            bool isPreviewModeEnabled() const override;
 
             void togglePreviewMode(bool enable) override;