birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant API calls from EditorViewportWidget and use new WorldToScreen call (#4022)

Browse Source 
* remove redundant API calls from EditorViewportWidget and use new WorldToScreen call

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove additional pre/post widget render calls that are no longer required

Signed-off-by: hultonha <hultonha@amazon.co.uk>
This commit is contained in:
hultonha
2021-09-13 09:36:34 +01:00
committed by GitHub
parent 51ce59e240
commit 28d45891f2
12 changed files with 42 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Editor/EditorViewportEntityPicker.cpp
+15 -23
View File
@@ -6,12 +6,12 @@
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include <AzCore/Math/IntersectSegment.h>
#include <AzFramework/Entity/EntityDebugDisplayBus.h>
#include <AzFramework/Viewport/CameraState.h>
#include <AzToolsFramework/Viewport/ViewportMessages.h>
#include <AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h>
#include <Editor/EditorViewportEntityPicker.h>
namespace PhysX
@@ -28,17 +28,13 @@ namespace PhysX
}
AZ::EntityId EditorViewportEntityPicker::PickEntity(
[[maybe_unused]] const AzFramework::CameraState& cameraState
, const AzToolsFramework::ViewportInteraction::MouseInteractionEvent& mouseInteraction
, AZ::Vector3& pickPosition
, AZ::Aabb& pickAabb)
{
[[maybe_unused]] const AzFramework::CameraState& cameraState,
const AzToolsFramework::ViewportInteraction::MouseInteractionEvent& mouseInteraction,
AZ::Vector3& pickPosition,
AZ::Aabb& pickAabb)
{
const int viewportId = mouseInteraction.m_mouseInteraction.m_interactionId.m_viewportId;
// set the widget context before calls to ViewportWorldToScreen so we are not
// going to constantly be pushing/popping the widget context
AzToolsFramework::ViewportInteraction::WidgetContextGuard widgetContextGuard(viewportId);
// selecting new entities
AZ::EntityId entityIdUnderCursor;
pickPosition = AZ::Vector3::CreateZero();
@@ -48,31 +44,29 @@ namespace PhysX
{
const AZ::EntityId entityId = m_entityDataCache->GetVisibleEntityId(entityCacheIndex);
if (m_entityDataCache->IsVisibleEntityLocked(entityCacheIndex)
|| !m_entityDataCache->IsVisibleEntityVisible(entityCacheIndex))
if (m_entityDataCache->IsVisibleEntityLocked(entityCacheIndex) || !m_entityDataCache->IsVisibleEntityVisible(entityCacheIndex))
{
continue;
}
// Ignore the case where the mouse hovers over an icon. Proceed to check for intersection with entity's AABB.
if (const AZ::Aabb aabb = AzToolsFramework::CalculateEditorEntitySelectionBounds(
entityId, AzFramework::ViewportInfo{viewportId});
if (const AZ::Aabb aabb =
AzToolsFramework::CalculateEditorEntitySelectionBounds(entityId, AzFramework::ViewportInfo{ viewportId });
aabb.IsValid())
{
const float pickRayLength = 1000.0f;
const AZ::Vector3 rayScaledDir =
mouseInteraction.m_mouseInteraction.m_mousePick.m_rayDirection * pickRayLength;
const AZ::Vector3 rayScaledDir = mouseInteraction.m_mouseInteraction.m_mousePick.m_rayDirection * pickRayLength;
AZ::Vector3 startNormal;
float t, end;
int intersectResult = AZ::Intersect::IntersectRayAABB(
mouseInteraction.m_mouseInteraction.m_mousePick.m_rayOrigin, rayScaledDir,
rayScaledDir.GetReciprocal(), aabb, t, end, startNormal);
mouseInteraction.m_mouseInteraction.m_mousePick.m_rayOrigin, rayScaledDir, rayScaledDir.GetReciprocal(), aabb, t, end,
startNormal);
if (intersectResult > 0)
{
entityIdUnderCursor = entityId;
pickPosition = mouseInteraction.m_mouseInteraction.m_mousePick.m_rayOrigin
+ (mouseInteraction.m_mouseInteraction.m_mousePick.m_rayDirection * pickRayLength * t);
pickPosition = mouseInteraction.m_mouseInteraction.m_mousePick.m_rayOrigin +
(mouseInteraction.m_mouseInteraction.m_mousePick.m_rayDirection * pickRayLength * t);
pickAabb = aabb;
}
}
@@ -82,10 +76,8 @@ namespace PhysX
}
void EditorViewportEntityPicker::DisplayViewport(
const AzFramework::ViewportInfo& viewportInfo,
AzFramework::DebugDisplayRequests& debugDisplay)
const AzFramework::ViewportInfo& viewportInfo, [[maybe_unused]] AzFramework::DebugDisplayRequests& debugDisplay)
{
AZ_UNUSED(debugDisplay);
m_entityDataCache->CalculateVisibleEntityDatas(viewportInfo);
}
} // namespace PhysX