Merge branch 'development' into ImGuiNoEntityProblem

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp

@@ -67,6 +67,17 @@ namespace AzPhysics
         }
     }
 
+    // class for exposing free functions to script
+    class SceneQueries
+    {
+    public:
+        AZ_TYPE_INFO(SceneQueries, "{4EFA3DA5-C0E3-4753-8C55-202228CA527E}");
+        AZ_CLASS_ALLOCATOR(SceneQueries, AZ::SystemAllocator, 0);
+
+        SceneQueries() = default;
+        ~SceneQueries() = default;
+    };
+
     /*static*/ void SceneQueryRequest::Reflect(AZ::ReflectContext* context)
     {
         if (auto* serializeContext = azdynamic_cast<AZ::SerializeContext*>(context))
@@ -96,6 +107,7 @@ namespace AzPhysics
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Module, "physics")
                 ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                 ->Property("Collision", BehaviorValueProperty(&SceneQueryRequest::m_collisionGroup))
                 // Until enum class support for behavior context is done, expose this as an int
                 ->Property("QueryType", [](const SceneQueryRequest& self) { return static_cast<int>(self.m_queryType); },
@@ -134,11 +146,28 @@ namespace AzPhysics
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Module, "physics")
                 ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                 ->Property("Distance", BehaviorValueProperty(&RayCastRequest::m_distance))
                 ->Property("Start", BehaviorValueProperty(&RayCastRequest::m_start))
                 ->Property("Direction", BehaviorValueProperty(&RayCastRequest::m_direction))
                 ->Property("ReportMultipleHits", BehaviorValueProperty(&RayCastRequest::m_reportMultipleHits))
                 ;
+
+            behaviorContext->Class<SceneQueries>("SceneQueries")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
+                ->Attribute(AZ::Script::Attributes::Module, "physics")
+                ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Method(
+                    "CreateRayCastRequest",
+                    [](const AZ::Vector3& start, const AZ::Vector3& direction, float distance, const AZStd::string& collisionGroup)
+                    {
+                        RayCastRequest request;
+                        request.m_start = start;
+                        request.m_direction = direction;
+                        request.m_distance = distance;
+                        request.m_collisionGroup = CollisionGroup(collisionGroup);
+                        return request;
+                    });
         }
     }
 
@@ -162,6 +191,7 @@ namespace AzPhysics
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Module, "physics")
                 ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                 ->Property("Distance", BehaviorValueProperty(&ShapeCastRequest::m_distance))
                 ->Property("Start", BehaviorValueProperty(&ShapeCastRequest::m_start))
                 ->Property("Direction", BehaviorValueProperty(&ShapeCastRequest::m_direction))
@@ -175,7 +205,6 @@ namespace AzPhysics
                     return ShapeCastRequestHelpers::CreateSphereCastRequest(
                         radius, startPose, direction, distance, queryType, collisionGroup, nullptr);
                 });
-
             behaviorContext->Method(
                 "CreateBoxCastRequest",
                 [](const AZ::Vector3& boxDimensions, const AZ::Transform& startPose, const AZ::Vector3& direction, float distance,
@@ -184,7 +213,6 @@ namespace AzPhysics
                     return ShapeCastRequestHelpers::CreateBoxCastRequest(
                         boxDimensions, startPose, direction, distance, queryType, collisionGroup, nullptr);
                 });
-
             behaviorContext->Method(
                 "CreateCapsuleCastRequest",
                 [](float capsuleRadius, float capsuleHeight, const AZ::Transform& startPose, const AZ::Vector3& direction, float distance,
@@ -267,6 +295,7 @@ namespace AzPhysics
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Module, "physics")
                 ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                 ->Property("Pose", BehaviorValueProperty(&OverlapRequest::m_pose))
                 ;
 
@@ -349,6 +378,7 @@ namespace AzPhysics
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Module, "physics")
                 ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                 ->Property("Distance", BehaviorValueProperty(&SceneQueryHit::m_distance))
                 ->Property("Position", BehaviorValueProperty(&SceneQueryHit::m_position))
                 ->Property("Normal", BehaviorValueProperty(&SceneQueryHit::m_normal))

Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.cpp

@@ -51,7 +51,10 @@ namespace AzPhysics
                 ->Method("GetOnPostsimulateEvent", getOnPostsimulateEvent)
                     ->Attribute(AZ::Script::Attributes::AzEventDescription, postsimulateEventDescription)
                 ->Method("GetSceneHandle", &SystemInterface::GetSceneHandle)
-                ->Method("GetScene", &SystemInterface::GetScene);
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
+                ->Method("GetScene", &SystemInterface::GetScene)
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
+                ;
 
             behaviorContext->Method(
                     "GetPhysicsSystem",

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp

@@ -363,16 +363,16 @@ namespace AzToolsFramework::ViewportUi::Internal
     {
         // no background for the widget else each set of buttons/textfields/etc would have a black box around them
         SetTransparentBackground(widget);
-        widget->setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
+        widget->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
     }
 
     void ViewportUiDisplay::InitializeUiOverlay()
     {
-        m_uiMainWindow.setObjectName(m_uiMainWindow.windowTitle());
+        m_uiMainWindow.setObjectName(QString("ViewportUiWindow"));
         ConfigureWidgetForViewportUi(&m_uiMainWindow);
         m_uiMainWindow.setVisible(false);
 
-        m_uiOverlay.setObjectName(m_uiOverlay.windowTitle());
+        m_uiOverlay.setObjectName(QString("ViewportUiOverlay"));
         m_uiMainWindow.setCentralWidget(&m_uiOverlay);
         m_uiOverlay.setVisible(false);