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

update compatibility of atom components with NonUniformScaleService

Browse Source
This commit is contained in:
greerdv
2021-05-12 22:16:14 +01:00
parent 059f69e5e6
commit 655d71e0dd
11 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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)