From dfd0cbb0fdc27ebd1e23f5dd2390c1589caf6bca Mon Sep 17 00:00:00 2001
From: mnaumov <mnaumov@amazon.com>
Date: Thu, 6 May 2021 13:10:55 -0700
Subject: [PATCH] Material Editor camera controller zoom respects viewport
 boundary

---
 .../Viewport/ViewportMessages.h                 |  2 ++
 .../Viewport/RenderViewportWidget.h             |  1 +
 .../Source/Viewport/RenderViewportWidget.cpp    |  5 +++++
 .../MaterialEditorViewportInputController.cpp   | 17 +++++++++++++++--
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
index a9949d382e..07f0964fc7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
@@ -246,6 +246,8 @@ namespace AzToolsFramework
             /// from ViewportCursorScreenPosition. This method will always return the correct position to generate a mouse
             /// position delta.
             virtual AZStd::optional<AzFramework::ScreenPoint> PreviousViewportCursorScreenPosition() = 0;
+            /// Is mouse over viewport.
+            virtual bool IsMouseOver() const = 0;
 
         protected:
             ~ViewportMouseCursorRequests() = default;
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
index 5dbbf04f1b..cde3dacbc4 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
@@ -103,6 +103,7 @@ namespace AtomToolsFramework
         void EndCursorCapture() override;
         AzFramework::ScreenPoint ViewportCursorScreenPosition() override;
         AZStd::optional<AzFramework::ScreenPoint> PreviousViewportCursorScreenPosition() override;
+        bool IsMouseOver() const override;
 
         // AzFramework::WindowRequestBus::Handler ...
         void SetWindowTitle(const AZStd::string& title) override;
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
index 483b4bc55b..19da0c2b91 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
@@ -472,6 +472,11 @@ namespace AtomToolsFramework
                                                 : AZStd::optional<AzFramework::ScreenPoint>{};
     }
 
+    bool RenderViewportWidget::IsMouseOver() const
+    {
+        return m_mouseOver;
+    }
+
     void RenderViewportWidget::BeginCursorCapture()
     {
         if (m_capturingCursor)
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
index 83ec5a41c5..36e4b76cec 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
@@ -17,6 +17,8 @@
 #include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
 #include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
 #include <AzFramework/Components/CameraBus.h>
+#include <AzFramework/Viewport/ScreenGeometry.h>
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
 
 #include <AtomLyIntegration/CommonFeatures/Mesh/MeshComponentBus.h>
 #include <Atom/RPI.Public/RPISystemInterface.h>
@@ -136,6 +138,11 @@ namespace MaterialEditor
         const InputChannel::State state = event.m_inputChannel.GetState();
         const KeyMask keysOld = m_keys;
 
+        bool mouseOver = false;
+        AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::EventResult(
+            mouseOver, GetViewportId(),
+            &AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Events::IsMouseOver);
+
         if (!m_behavior)
         {
             EvaluateControlBehavior();
@@ -178,7 +185,10 @@ namespace MaterialEditor
             }
             else if (inputChannelId == InputDeviceMouse::Movement::Z)
             {
-                m_behavior->MoveZ(event.m_inputChannel.GetValue());
+                if (mouseOver)
+                {
+                    m_behavior->MoveZ(event.m_inputChannel.GetValue());
+                }
             }
             break;
         case InputChannel::State::Ended:
@@ -222,7 +232,10 @@ namespace MaterialEditor
             }
             else if (inputChannelId == InputDeviceMouse::Movement::Z)
             {
-                m_behavior->MoveZ(event.m_inputChannel.GetValue());
+                if (mouseOver)
+                {
+                    m_behavior->MoveZ(event.m_inputChannel.GetValue());
+                }
             }
             break;
         }