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

Merge pull request #730 from aws-lumberyard-dev/non-uniform-scale-compatibility

Browse Source 
update compatibility for non-uniform scale service
This commit is contained in:
greerdv
2021-05-13 13:42:01 +01:00
committed by GitHub
parent d690c3fee4 ce3842ac84
commit 2ef0e70fff
61 changed files with 141 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.cpp
-23
View File
@@ -37,29 +37,6 @@ namespace AzFramework
void NonUniformScaleComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
incompatible.push_back(AZ_CRC_CE("DebugDrawObbService"));
incompatible.push_back(AZ_CRC_CE("DebugDrawService"));
incompatible.push_back(AZ_CRC_CE("EMotionFXActorService"));
incompatible.push_back(AZ_CRC_CE("EMotionFXSimpleMotionService"));
incompatible.push_back(AZ_CRC_CE("GradientTransformService"));
incompatible.push_back(AZ_CRC_CE("LegacyMeshService"));
incompatible.push_back(AZ_CRC_CE("LookAtService"));
incompatible.push_back(AZ_CRC_CE("SequenceService"));
incompatible.push_back(AZ_CRC_CE("ClothMeshService"));
incompatible.push_back(AZ_CRC_CE("PhysXJointService"));
incompatible.push_back(AZ_CRC_CE("PhysXCharacterControllerService"));
incompatible.push_back(AZ_CRC_CE("PhysXRagdollService"));
incompatible.push_back(AZ_CRC_CE("WhiteBoxService"));
incompatible.push_back(AZ_CRC_CE("NavigationAreaService"));
incompatible.push_back(AZ_CRC_CE("GeometryService"));
incompatible.push_back(AZ_CRC_CE("CapsuleShapeService"));
incompatible.push_back(AZ_CRC_CE("CompoundShapeService"));
incompatible.push_back(AZ_CRC_CE("CylinderShapeService"));
incompatible.push_back(AZ_CRC_CE("DiskShapeService"));
incompatible.push_back(AZ_CRC_CE("SphereShapeService"));
incompatible.push_back(AZ_CRC_CE("SplineService"));
incompatible.push_back(AZ_CRC_CE("TubeShapeService"));
}
void NonUniformScaleComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp
-23
View File
@@ -63,29 +63,6 @@ namespace AzToolsFramework
void EditorNonUniformScaleComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
incompatible.push_back(AZ_CRC_CE("DebugDrawObbService"));
incompatible.push_back(AZ_CRC_CE("DebugDrawService"));
incompatible.push_back(AZ_CRC_CE("EMotionFXActorService"));
incompatible.push_back(AZ_CRC_CE("EMotionFXSimpleMotionService"));
incompatible.push_back(AZ_CRC_CE("GradientTransformService"));
incompatible.push_back(AZ_CRC_CE("LegacyMeshService"));
incompatible.push_back(AZ_CRC_CE("LookAtService"));
incompatible.push_back(AZ_CRC_CE("SequenceService"));
incompatible.push_back(AZ_CRC_CE("ClothMeshService"));
incompatible.push_back(AZ_CRC_CE("PhysXJointService"));
incompatible.push_back(AZ_CRC_CE("PhysXCharacterControllerService"));
incompatible.push_back(AZ_CRC_CE("PhysXRagdollService"));
incompatible.push_back(AZ_CRC_CE("WhiteBoxService"));
incompatible.push_back(AZ_CRC_CE("NavigationAreaService"));
incompatible.push_back(AZ_CRC_CE("GeometryService"));
incompatible.push_back(AZ_CRC_CE("CapsuleShapeService"));
incompatible.push_back(AZ_CRC_CE("CompoundShapeService"));
incompatible.push_back(AZ_CRC_CE("CylinderShapeService"));
incompatible.push_back(AZ_CRC_CE("DiskShapeService"));
incompatible.push_back(AZ_CRC_CE("SphereShapeService"));
incompatible.push_back(AZ_CRC_CE("SplineService"));
incompatible.push_back(AZ_CRC_CE("TubeShapeService"));
}
void EditorNonUniformScaleComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
Gems/Atom/Component/DebugCamera/Code/Include/Atom/Component/DebugCamera/CameraControllerComponent.h
+2 -1
View File
@@ -41,7 +41,8 @@ namespace AZ
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
// CameraControllerRequestBus::Handler overrides
void Enable(TypeId typeId) override final;
void Reset() override final;
Gems/Atom/Component/DebugCamera/Code/Source/CameraComponent.cpp
+1
View File
@@ -69,6 +69,7 @@ namespace AZ
void CameraComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC("CameraService", 0x1dd1caa4));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void CameraComponent::Activate()
Gems/Atom/Component/DebugCamera/Code/Source/CameraControllerComponent.cpp
+6 -1
View File
@@ -32,12 +32,17 @@ namespace AZ
required.push_back(AZ_CRC("TransformService", 0x8ee22c50));
required.push_back(AZ_CRC("CameraService", 0x1dd1caa4));
}
void CameraControllerComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
{
provided.push_back(AZ_CRC("CameraControllerService", 0xc35788f9));
}
void CameraControllerComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void CameraControllerComponent::Enable(TypeId typeId)
{
// Enable this controller if type id matches, otherwise disable this controller
Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
+6
View File
@@ -78,6 +78,12 @@ void FlyCameraInputComponent::GetProvidedServices(AZ::ComponentDescriptor::Depen
provided.push_back(AZ_CRC("InputService", 0xd41af40c));
}
//////////////////////////////////////////////////////////////////////////////
void FlyCameraInputComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
//////////////////////////////////////////////////////////////////////////////
void FlyCameraInputComponent::Reflect(AZ::ReflectContext* reflection)
{
Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.h
+1
View File
@@ -30,6 +30,7 @@ namespace AZ
public:
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
static void Reflect(AZ::ReflectContext* reflection);
AZ_COMPONENT(FlyCameraInputComponent, "{7AE0D6AD-691C-41B6-9DD5-F23F78B1A02E}");
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.h
+1
View File
@@ -163,6 +163,7 @@ namespace AZ
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC("AttachmentService", 0x5aaa7b63));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DirectionalLightComponentController.cpp
+1
View File
@@ -121,6 +121,7 @@ namespace AZ
void DirectionalLightComponentController::GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC("DirectionalLightService", 0x5270619f));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleComponent"));
}
void DirectionalLightComponentController::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided)
Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp
+1
View File
@@ -73,6 +73,7 @@ namespace AZ
void DiffuseProbeGridComponentController::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC("DiffuseProbeGridService", 0x63d32042));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void DiffuseProbeGridComponentController::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp
+1
View File
@@ -80,6 +80,7 @@ namespace AZ
void ReflectionProbeComponentController::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC("ReflectionProbeService", 0xa5b919ce));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void ReflectionProbeComponentController::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp
+1
View File
@@ -51,6 +51,7 @@ namespace AZ
void HDRiSkyboxComponentController::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC("SkyBoxService", 0x8169a709));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void HDRiSkyboxComponentController::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.cpp
+1
View File
@@ -58,6 +58,7 @@ namespace AZ
void PhysicalSkyComponentController::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC("SkyBoxService", 0x8169a709));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void PhysicalSkyComponentController::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp
+1 -1
View File
@@ -71,7 +71,7 @@ namespace DebugDraw
void DebugDrawObbComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
(void)incompatible;
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void DebugDrawObbComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.h
+1
View File
@@ -136,6 +136,7 @@ namespace EMotionFX
{
incompatible.push_back(AZ_CRC("EMotionFXActorService", 0xd6e8f48d));
incompatible.push_back(AZ_CRC("MeshService", 0x71d8a455));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.h
+1
View File
@@ -87,6 +87,7 @@ namespace EMotionFX
{
incompatible.push_back(AZ_CRC("EMotionFXAnimGraphService", 0x9ec3c819));
incompatible.push_back(AZ_CRC("EMotionFXSimpleMotionService", 0xea7a05d8));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
static void Reflect(AZ::ReflectContext* /*context*/);
Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp
+1
View File
@@ -200,6 +200,7 @@ namespace GradientSignal
void GradientTransformComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
{
services.push_back(AZ_CRC("GradientTransformService", 0x8c8c5ecc));
services.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void GradientTransformComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& services)
Gems/LmbrCentral/Code/Source/Shape/CapsuleShapeComponent.cpp
+1
View File
@@ -32,6 +32,7 @@ namespace LmbrCentral
{
incompatible.push_back(AZ_CRC("ShapeService", 0xe86aa5fe));
incompatible.push_back(AZ_CRC("CapsuleShapeService", 0x9bc1122c));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void CapsuleShapeComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/LmbrCentral/Code/Source/Shape/CompoundShapeComponent.h
+1
View File
@@ -76,6 +76,7 @@ namespace LmbrCentral
{
incompatible.push_back(AZ_CRC("ShapeService", 0xe86aa5fe));
incompatible.push_back(AZ_CRC("CompoundShapeService", 0x4f7c640a));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
static void Reflect(AZ::ReflectContext* context);
Gems/LmbrCentral/Code/Source/Shape/CylinderShapeComponent.cpp
+1
View File
@@ -31,6 +31,7 @@ namespace LmbrCentral
{
incompatible.push_back(AZ_CRC("ShapeService", 0xe86aa5fe));
incompatible.push_back(AZ_CRC("CylinderShapeService", 0x507c688e));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void CylinderShapeComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/LmbrCentral/Code/Source/Shape/DiskShapeComponent.cpp
+1
View File
@@ -28,6 +28,7 @@ namespace LmbrCentral
{
incompatible.push_back(AZ_CRC("ShapeService", 0xe86aa5fe));
incompatible.push_back(AZ_CRC("DiskShapeService", 0xd90c482b));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void DiskShapeComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp
+6
View File
@@ -78,6 +78,12 @@ namespace LmbrCentral
EditorBaseShapeComponent::Deactivate();
}
void EditorCapsuleShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void EditorCapsuleShapeComponent::DisplayEntityViewport(
[[maybe_unused]] const AzFramework::ViewportInfo& viewportInfo,
AzFramework::DebugDisplayRequests& debugDisplay)
Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.h
+2
View File
@@ -40,6 +40,8 @@ namespace LmbrCentral
provided.push_back(AZ_CRC("CapsuleShapeService", 0x9bc1122c));
}
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
// EditorComponentBase
void BuildGameEntity(AZ::Entity* gameEntity) override;
Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp
+6
View File
@@ -59,6 +59,12 @@ namespace LmbrCentral
}
}
void EditorCompoundShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void EditorCompoundShapeComponent::Init()
{
// setup the contained runtime component so that it can manage the child entities in the editor.
Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.h
+2
View File
@@ -41,6 +41,8 @@ namespace LmbrCentral
provided.push_back(AZ_CRC("CompoundShapeService", 0x4f7c640a));
}
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
AZ::u32 ConfigurationChanged();
private:
Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp
+6
View File
@@ -55,6 +55,12 @@ namespace LmbrCentral
}
}
void EditorCylinderShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void EditorCylinderShapeComponent::Init()
{
EditorBaseShapeComponent::Init();
Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.h
+2
View File
@@ -40,6 +40,8 @@ namespace LmbrCentral
provided.push_back(AZ_CRC("CylinderShapeService", 0x507c688e));
}
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
// EditorComponentBase
void BuildGameEntity(AZ::Entity* gameEntity) override;
Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp
+6
View File
@@ -55,6 +55,12 @@ namespace LmbrCentral
provided.push_back(AZ_CRC("DiskShapeService", 0xd90c482b));
}
void EditorDiskShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void EditorDiskShapeComponent::Init()
{
EditorBaseShapeComponent::Init();
Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.h
+1
View File
@@ -39,6 +39,7 @@ namespace LmbrCentral
protected:
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
private:
AZ_DISABLE_COPY_MOVE(EditorDiskShapeComponent)
Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp
+6
View File
@@ -60,6 +60,12 @@ namespace LmbrCentral
}
}
void EditorSphereShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void EditorSphereShapeComponent::Init()
{
EditorBaseShapeComponent::Init();
Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.h
+2
View File
@@ -44,6 +44,8 @@ namespace LmbrCentral
provided.push_back(AZ_CRC("SphereShapeService", 0x90c8dc80));
}
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
private:
AZ_DISABLE_COPY_MOVE(EditorSphereShapeComponent)
Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
+1
View File
@@ -44,6 +44,7 @@ namespace LmbrCentral
{
incompatible.push_back(AZ_CRC("VariableVertexContainerService", 0x70c58740));
incompatible.push_back(AZ_CRC("FixedVertexContainerService", 0x83f1bbf2));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void EditorSplineComponent::Reflect(AZ::ReflectContext* context)
Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp
+6
View File
@@ -59,6 +59,12 @@ namespace LmbrCentral
}
}
void EditorTubeShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void EditorTubeShapeComponent::Init()
{
EditorBaseShapeComponent::Init();
Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.h
+1
View File
@@ -57,6 +57,7 @@ namespace LmbrCentral
required.push_back(AZ_CRC("SplineService", 0x2b674d3c));
}
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
private:
AZ_DISABLE_COPY_MOVE(EditorTubeShapeComponent)
Gems/LmbrCentral/Code/Source/Shape/SphereShapeComponent.cpp
+1
View File
@@ -29,6 +29,7 @@ namespace LmbrCentral
{
incompatible.push_back(AZ_CRC("ShapeService", 0xe86aa5fe));
incompatible.push_back(AZ_CRC("SphereShapeService", 0x90c8dc80));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void SphereShapeComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/LmbrCentral/Code/Source/Shape/SplineComponent.h
+1
View File
@@ -103,6 +103,7 @@ namespace LmbrCentral
incompatible.push_back(AZ_CRC("SplineService", 0x2b674d3c));
incompatible.push_back(AZ_CRC("VariableVertexContainerService", 0x70c58740));
incompatible.push_back(AZ_CRC("FixedVertexContainerService", 0x83f1bbf2));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/LmbrCentral/Code/Source/Shape/TubeShapeComponent.cpp
+1
View File
@@ -28,6 +28,7 @@ namespace LmbrCentral
{
incompatible.push_back(AZ_CRC("ShapeService", 0xe86aa5fe));
incompatible.push_back(AZ_CRC("TubeShapeService", 0x3fe791b4));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void TubeShapeComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/Maestro/Code/Source/Components/EditorSequenceComponent.h
+1
View File
@@ -98,6 +98,7 @@ namespace Maestro
{
// This guarantees that only one SequenceComponent will ever be on an entity
incompatible.push_back(AZ_CRC("SequenceService", 0x7cbe5938));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
// Required Reflect function.
Gems/Maestro/Code/Source/Components/SequenceComponent.cpp
+5
View File
@@ -139,6 +139,11 @@ namespace Maestro
}
}
void SequenceComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void SequenceComponent::ReflectCinematicsLib(AZ::ReflectContext* context)
{
// The Movie System itself
Gems/Maestro/Code/Source/Components/SequenceComponent.h
+2
View File
@@ -97,6 +97,8 @@ namespace Maestro
provided.push_back(AZ_CRC("SequenceService", 0x7cbe5938));
}
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
// Required Reflect function.
static void Reflect(AZ::ReflectContext* context);
private:
Gems/NvCloth/Code/Source/Components/ClothComponent.cpp
+5
View File
@@ -47,6 +47,11 @@ namespace NvCloth
required.push_back(AZ_CRC("TransformService", 0x8ee22c50));
}
void ClothComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void ClothComponent::Activate()
{
// Cloth components do not run on dedicated servers.
Gems/NvCloth/Code/Source/Components/ClothComponent.h
+1
View File
@@ -38,6 +38,7 @@ namespace NvCloth
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
const ClothComponentMesh* GetClothComponentMesh() const { return m_clothComponentMesh.get(); }
Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
+5
View File
@@ -415,6 +415,11 @@ namespace NvCloth
required.push_back(AZ_CRC("MeshService", 0x71d8a455));
}
void EditorClothComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
const MeshNodeList& EditorClothComponent::GetMeshNodeList() const
{
return m_meshNodeList;
Gems/NvCloth/Code/Source/Components/EditorClothComponent.h
+1
View File
@@ -39,6 +39,7 @@ namespace NvCloth
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
const MeshNodeList& GetMeshNodeList() const;
const AZStd::unordered_set<AZStd::string>& GetMeshNodesWithBackstopData() const;
Gems/PhysX/Code/Source/EditorBallJointComponent.cpp
+5
View File
@@ -63,6 +63,11 @@ namespace PhysX
required.push_back(AZ_CRC("PhysXRigidBodyService", 0x1d4c64a8));
}
void EditorBallJointComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void EditorBallJointComponent::Activate()
{
EditorJointComponent::Activate();
Gems/PhysX/Code/Source/EditorBallJointComponent.h
+1
View File
@@ -33,6 +33,7 @@ namespace PhysX
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
// AZ::Component
void Activate() override;
Gems/PhysX/Code/Source/EditorFixedJointComponent.cpp
+5
View File
@@ -60,6 +60,11 @@ namespace PhysX
required.push_back(AZ_CRC("PhysXRigidBodyService", 0x1d4c64a8));
}
void EditorFixedJointComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void EditorFixedJointComponent::Activate()
{
EditorJointComponent::Activate();
Gems/PhysX/Code/Source/EditorFixedJointComponent.h
+1
View File
@@ -33,6 +33,7 @@ namespace PhysX
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
// AZ::Component
void Activate() override;
Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp
+5
View File
@@ -63,6 +63,11 @@ namespace PhysX
required.push_back(AZ_CRC("PhysXRigidBodyService", 0x1d4c64a8));
}
void EditorHingeJointComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void EditorHingeJointComponent::Activate()
{
EditorJointComponent::Activate();
Gems/PhysX/Code/Source/EditorHingeJointComponent.h
+1
View File
@@ -33,6 +33,7 @@ namespace PhysX
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
// AZ::Component
void Activate() override;
Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.h
+1
View File
@@ -59,6 +59,7 @@ namespace PhysX
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC("PhysXCharacterControllerService", 0x428de4fa));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.cpp
+1
View File
@@ -51,6 +51,7 @@ namespace PhysX
void CharacterGameplayComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC("PhysXCharacterGameplayService", 0xfacd7876));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void CharacterGameplayComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.h
+1
View File
@@ -64,6 +64,7 @@ namespace PhysX
incompatible.push_back(AZ_CRC("PhysXCharacterControllerService", 0x428de4fa));
incompatible.push_back(AZ_CRC("LegacyCryPhysicsService", 0xbb370351));
incompatible.push_back(AZ_CRC("PhysXRigidBodyService", 0x1d4c64a8));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp
+1
View File
@@ -23,6 +23,7 @@ namespace PhysX
void EditorCharacterGameplayComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC("PhysXCharacterGameplayService", 0xfacd7876));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void EditorCharacterGameplayComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h
+1
View File
@@ -49,6 +49,7 @@ namespace PhysX
{
incompatible.push_back(AZ_CRC("PhysXRagdollService", 0x6d889c70));
incompatible.push_back(AZ_CRC("LegacyCryPhysicsService", 0xbb370351));
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp
+5
View File
@@ -75,6 +75,11 @@ namespace WhiteBox
required.push_back(AZ_CRC("WhiteBoxService", 0x2f2f42b8));
}
void EditorWhiteBoxColliderComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void EditorWhiteBoxColliderComponent::Activate()
{
AzToolsFramework::Components::EditorComponentBase::Activate();
Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.h
+1
View File
@@ -46,6 +46,7 @@ namespace WhiteBox
private:
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
// AZ::Component ...
void Activate() override;
Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp
+5
View File
@@ -44,6 +44,11 @@ namespace WhiteBox
required.push_back(AZ_CRC("TransformService", 0x8ee22c50));
}
void WhiteBoxColliderComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
WhiteBoxColliderComponent::WhiteBoxColliderComponent(
const Physics::CookedMeshShapeConfiguration& shapeConfiguration,
const Physics::ColliderConfiguration& physicsColliderConfiguration,
Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.h
+1
View File
@@ -41,6 +41,7 @@ namespace WhiteBox
private:
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
// AZ::Component ...
void Activate() override;
Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp
+5
View File
@@ -265,6 +265,11 @@ namespace WhiteBox
provided.push_back(AZ_CRC("WhiteBoxService", 0x2f2f42b8));
}
void EditorWhiteBoxComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
EditorWhiteBoxComponent::EditorWhiteBoxComponent() = default;
EditorWhiteBoxComponent::~EditorWhiteBoxComponent()
Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.h
+1
View File
@@ -89,6 +89,7 @@ namespace WhiteBox
private:
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
// EditorComponentBase overrides ...
void BuildGameEntity(AZ::Entity* gameEntity) override;