1f9b284de2
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h # Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h # Code/Editor/Plugins/EditorCommon/stdafx.cpp # Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h # Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h # Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h # Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h # Code/Tools/AssetProcessor/native/precompiled.h # Code/Tools/Standalone/StandaloneTools_precompiled.h # Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h # Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h # Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h # Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h # Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h # Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h # Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake # Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h # Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h # Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp # Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake # Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h # Gems/Blast/Code/Source/StdAfx.cpp # Gems/Camera/Code/Source/Camera_precompiled.h # Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h # Gems/FastNoise/Code/Source/FastNoise_precompiled.h # Gems/Gestures/Code/Source/Gestures_precompiled.h # Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h # Gems/GraphCanvas/Code/precompiled.h # Gems/ImGui/Code/Source/ImGui_precompiled.h # Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h # Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h # Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp # Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h # Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h # Gems/LyShine/Code/Source/LyShine_precompiled.h # Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h # Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h # Gems/Maestro/Code/Source/Maestro_precompiled.h # Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h # Gems/Metastream/Code/Source/Metastream_precompiled.h # Gems/Microphone/Code/Source/Microphone_precompiled.h # Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h # Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h # Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h # Gems/PhysX/Code/Source/PhysX_precompiled.h # Gems/PhysX/Code/physx_unsupported_files.cmake # Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h # Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h # Gems/ScriptCanvas/Code/Editor/precompiled.h # Gems/ScriptCanvas/Code/Source/precompiled.h # Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h # Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h # Gems/ScriptEvents/Code/Source/precompiled.h # Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp # Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h # Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h # Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h # Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h # Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h # Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h # Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h # Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h # Gems/Twitch/Code/Source/Twitch_precompiled.h # Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h # Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h # Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
132 lines
5.5 KiB
C++
132 lines
5.5 KiB
C++
/*
|
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
*
|
|
*/
|
|
#include <PhysX/Configuration/PhysXConfiguration.h>
|
|
|
|
#include <AzCore/Memory/SystemAllocator.h>
|
|
#include <AzCore/Serialization/SerializeContext.h>
|
|
#include <AzCore/Serialization/EditContext.h>
|
|
|
|
namespace PhysX
|
|
{
|
|
namespace PhysXInternal
|
|
{
|
|
AzPhysics::CollisionConfiguration CreateDefaultCollisionConfiguration()
|
|
{
|
|
AzPhysics::CollisionConfiguration configuration;
|
|
configuration.m_collisionLayers.SetName(AzPhysics::CollisionLayer::Default, "Default");
|
|
|
|
configuration.m_collisionGroups.CreateGroup("All", AzPhysics::CollisionGroup::All, AzPhysics::CollisionGroups::Id(), true);
|
|
configuration.m_collisionGroups.CreateGroup("None", AzPhysics::CollisionGroup::None, AzPhysics::CollisionGroups::Id::Create(), true);
|
|
|
|
#ifdef TOUCHBENDING_LAYER_BIT
|
|
configuration.m_collisionLayers.SetName(AzPhysics::CollisionLayer::TouchBend, "TouchBend");
|
|
configuration.m_collisionGroups.CreateGroup("All_NoTouchBend", AzPhysics::CollisionGroup::All_NoTouchBend, AzPhysics::CollisionGroups::Id::Create(), true);
|
|
#endif
|
|
|
|
return configuration;
|
|
}
|
|
|
|
bool PhysXSystemConfigurationConverter([[maybe_unused]] AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& dataElement)
|
|
{
|
|
if (dataElement.GetVersion() <= 1)
|
|
{
|
|
dataElement.RemoveElementByName(AZ_CRC_CE("DefaultMaterialLibrary"));
|
|
AZ_Warning("PhysXSystemConfigurationConverter", false,
|
|
"Old version of PhysX Configuration data found. Physics material library will be reset to default.");
|
|
}
|
|
|
|
return true;
|
|
}
|
|
}
|
|
|
|
AZ_CLASS_ALLOCATOR_IMPL(WindConfiguration, AZ::SystemAllocator, 0);
|
|
AZ_CLASS_ALLOCATOR_IMPL(PhysXSystemConfiguration, AZ::SystemAllocator, 0);
|
|
|
|
/*static*/ void WindConfiguration::Reflect(AZ::ReflectContext* context)
|
|
{
|
|
if (auto* serialize = azrtti_cast<AZ::SerializeContext*>(context))
|
|
{
|
|
serialize->Class<PhysX::WindConfiguration>()
|
|
->Version(1)
|
|
->Field("GlobalWindTag", &WindConfiguration::m_globalWindTag)
|
|
->Field("LocalWindTag", &WindConfiguration::m_localWindTag)
|
|
;
|
|
|
|
if (AZ::EditContext* editContext = serialize->GetEditContext())
|
|
{
|
|
editContext->Class<PhysX::WindConfiguration>("Wind Configuration", "Wind settings for PhysX")
|
|
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
|
|
->Attribute(AZ::Edit::Attributes::AutoExpand, true)
|
|
->DataElement(AZ::Edit::UIHandlers::Default, &WindConfiguration::m_globalWindTag,
|
|
"Global wind tag",
|
|
"Tag value that will be used to mark entities that provide global wind value.\n"
|
|
"Global wind has no bounds and affects objects across entire level.")
|
|
->DataElement(AZ::Edit::UIHandlers::Default, &WindConfiguration::m_localWindTag,
|
|
"Local wind tag",
|
|
"Tag value that will be used to mark entities that provide local wind value.\n"
|
|
"Local wind is only applied within bounds defined by PhysX collider.")
|
|
;
|
|
}
|
|
}
|
|
}
|
|
|
|
bool WindConfiguration::operator==(const WindConfiguration& other) const
|
|
{
|
|
return m_globalWindTag == other.m_globalWindTag &&
|
|
m_localWindTag == other.m_localWindTag
|
|
;
|
|
}
|
|
|
|
bool WindConfiguration::operator!=(const WindConfiguration& other) const
|
|
{
|
|
return !(*this == other);
|
|
}
|
|
|
|
/*static*/ void PhysXSystemConfiguration::Reflect(AZ::ReflectContext* context)
|
|
{
|
|
AzPhysics::SystemConfiguration::Reflect(context);
|
|
WindConfiguration::Reflect(context);
|
|
|
|
if (auto* serializeContext = azdynamic_cast<AZ::SerializeContext*>(context))
|
|
{
|
|
serializeContext->Class<PhysX::PhysXSystemConfiguration, AzPhysics::SystemConfiguration>()
|
|
->Version(2, &PhysXInternal::PhysXSystemConfigurationConverter)
|
|
->Field("WindConfiguration", &PhysXSystemConfiguration::m_windConfiguration)
|
|
;
|
|
|
|
if (AZ::EditContext* editContext = serializeContext->GetEditContext())
|
|
{
|
|
// this is needed so the edit context of AzPhysics::SystemConfiguration can be used.
|
|
editContext->Class<PhysX::PhysXSystemConfiguration>("System Configuration", "PhysX system configuration")
|
|
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
|
|
->Attribute(AZ::Edit::Attributes::AutoExpand, true)
|
|
;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*static*/ PhysXSystemConfiguration PhysXSystemConfiguration::CreateDefault()
|
|
{
|
|
PhysXSystemConfiguration systemConfig;
|
|
systemConfig.m_collisionConfig = PhysXInternal::CreateDefaultCollisionConfiguration();
|
|
return systemConfig;
|
|
}
|
|
|
|
bool PhysXSystemConfiguration::operator==(const PhysXSystemConfiguration& other) const
|
|
{
|
|
return AzPhysics::SystemConfiguration::operator==(other) &&
|
|
m_windConfiguration == other.m_windConfiguration
|
|
;
|
|
}
|
|
|
|
bool PhysXSystemConfiguration::operator!=(const PhysXSystemConfiguration& other) const
|
|
{
|
|
return !(*this == other);
|
|
}
|
|
}
|