tidy up NonUniformScaleService compatibility

main
greerdv 5 years ago
parent e915133bbf
commit 059f69e5e6

@ -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)

@ -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)

@ -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)

@ -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)

@ -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*/);

@ -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)

@ -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)

@ -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);

@ -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)

@ -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)

@ -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)

@ -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;

@ -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.

@ -41,6 +41,8 @@ namespace LmbrCentral
provided.push_back(AZ_CRC("CompoundShapeService", 0x4f7c640a));
}
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
AZ::u32 ConfigurationChanged();
private:

@ -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();

@ -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;

@ -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();

@ -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)

@ -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();

@ -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)

@ -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)

@ -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();

@ -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)

@ -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)

@ -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)

@ -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)

@ -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.

@ -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

@ -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:

@ -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.

@ -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(); }

@ -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;

@ -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;

@ -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();

@ -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;

@ -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();

@ -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;

@ -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();

@ -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;

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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();

@ -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;

@ -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,

@ -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;

@ -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()

@ -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;

Loading…
Cancel
Save