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

tidy up NonUniformScaleService compatibility

Browse Source
This commit is contained in:
greerdv
2021-05-12 21:20:23 +01:00
parent e915133bbf
commit 059f69e5e6
50 changed files with 119 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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;