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

Merge branch 'development' into cmake/SPEC-2513_w4244

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

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
#	Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
This commit is contained in:
Esteban Papp
2021-08-19 08:53:41 -07:00
parent 1e136a02b0 fdc464c6fd
commit f8e99cd7dd
370 changed files with 3276 additions and 4248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysXDebug/Code/Source/SystemComponent.cpp
+10 -10
View File
@@ -347,7 +347,7 @@ namespace PhysXDebug
static const physx::PxRenderBuffer& GetRenderBuffer(physx::PxScene* physxScene)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Physics);
AZ_PROFILE_FUNCTION(Physics);
PHYSX_SCENE_READ_LOCK(physxScene);
return physxScene->getRenderBuffer();
}
@@ -439,7 +439,7 @@ namespace PhysXDebug
return;
}
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Physics);
AZ_PROFILE_FUNCTION(Physics);
m_currentTime = time;
bool dirty = true;
@@ -620,7 +620,7 @@ namespace PhysXDebug
void SystemComponent::ConfigurePhysXVisualizationParameters()
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Physics);
AZ_PROFILE_FUNCTION(Physics);
if (physx::PxScene* physxScene = GetCurrentPxScene())
{
@@ -667,7 +667,7 @@ namespace PhysXDebug
void SystemComponent::ConfigureCullingBox()
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Physics);
AZ_PROFILE_FUNCTION(Physics);
// Currently using the Cry view camera to support Editor, Game and Launcher modes. This will be updated in due course.
const AZ::Vector3 cameraTranslation = GetViewCameraPosition();
@@ -694,7 +694,7 @@ namespace PhysXDebug
void SystemComponent::GatherTriangles(const physx::PxRenderBuffer& rb)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Physics);
AZ_PROFILE_FUNCTION(Physics);
if (!m_settings.m_visualizationEnabled)
{
return;
@@ -728,7 +728,7 @@ namespace PhysXDebug
void SystemComponent::GatherLines(const physx::PxRenderBuffer& rb)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Physics);
AZ_PROFILE_FUNCTION(Physics);
if (!m_settings.m_visualizationEnabled)
{
@@ -763,7 +763,7 @@ namespace PhysXDebug
void SystemComponent::GatherJointLimits()
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Physics);
AZ_PROFILE_FUNCTION(Physics);
physx::PxScene* scene = GetCurrentPxScene();
@@ -824,7 +824,7 @@ namespace PhysXDebug
void SystemComponent::DrawDebugCullingBox(const AZ::Aabb& cullingBoxAabb)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Physics);
AZ_PROFILE_FUNCTION(Physics);
if (m_settings.m_visualizationEnabled && m_culling.m_boxWireframe)
{
@@ -842,7 +842,7 @@ namespace PhysXDebug
AZ::Color SystemComponent::MapOriginalPhysXColorToUserDefinedValues(const physx::PxU32& originalColor)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Physics);
AZ_PROFILE_FUNCTION(Physics);
// color mapping from PhysX to LY user preference: \PhysX_3.4\Include\common\PxRenderBuffer.h
switch (static_cast<physx::PxDebugColor::Enum>(originalColor))
@@ -878,7 +878,7 @@ namespace PhysXDebug
void SystemComponent::InitPhysXColorMappings()
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Physics);
AZ_PROFILE_FUNCTION(Physics);
m_colorMappings.m_defaultColor.FromU32(static_cast<AZ::u32>(physx::PxDebugColor::eARGB_GREEN));
m_colorMappings.m_black.FromU32(static_cast<AZ::u32>(physx::PxDebugColor::eARGB_BLACK));
m_colorMappings.m_red.FromU32(static_cast<AZ::u32>(physx::PxDebugColor::eARGB_RED));