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

Merge branch 'development' into cmake/warn_format_security

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	cmake/Platform/Common/Clang/Configurations_clang.cmake
This commit is contained in:
Esteban Papp
2021-09-03 11:10:40 -07:00
parent 0df55c3a7f 5851031d2e
commit 522e4bff9e
641 changed files with 32438 additions and 32687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzManipulatorTestFramework/Source/DirectManipulatorViewportInteraction.cpp
+1 -1
View File
@@ -34,7 +34,7 @@ namespace AzManipulatorTestFramework
ViewportInteractionInterface* viewportInteraction, AZStd::shared_ptr<CustomManipulatorManager> manipulatorManager);
// ManipulatorManagerInterface ...
void ConsumeMouseInteractionEvent(const MouseInteractionEvent& event);
void ConsumeMouseInteractionEvent(const MouseInteractionEvent& event) override;
AzToolsFramework::ManipulatorManagerId GetId() const override;
bool ManipulatorBeingInteracted() const override;
Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp
+5
View File
@@ -62,6 +62,11 @@ namespace AzManipulatorTestFramework
return m_angularStep;
}
float ViewportInteraction::ManipulatorLineBoundWidth()
{
return 0.1f;
}
AzFramework::ScreenPoint ViewportInteraction::ViewportWorldToScreen(const AZ::Vector3& worldPosition)
{
return AzFramework::WorldToScreen(worldPosition, m_cameraState);