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

Added configurable physics materials per asset in PhysX group in FBX Settings. (#1186)

Browse Source 
- Added back the' Physics Materials from Asset' tick in the collider components.
- Made physics materials names case insensitive.
- Refactored how to gather material information from fbx and used the same code for exporter and physx groups.
This commit is contained in:
Aaron Ruiz Mora
2021-06-10 12:22:16 +01:00
committed by GitHub
parent adf6d93a06
commit 9d41954d0e
20 changed files with 374 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Editor/ConfigStringLineEditCtrl.cpp
+6 -6
View File
@@ -93,7 +93,7 @@ namespace PhysX
}
}
void ConfigStringLineEditCtrl::SetForbiddenStrings(const AZStd::unordered_set<AZStd::string>& forbiddenStrings)
void ConfigStringLineEditCtrl::SetForbiddenStrings(const UniqueStringContainer::StringSet& forbiddenStrings)
{
m_forbiddenStrings = forbiddenStrings;
}
@@ -122,7 +122,7 @@ namespace PhysX
void ConfigStringLineEditValidator::OnEditStart(AZ::Crc32 stringGroupId
, const AZStd::string& stringToEdit
, const AZStd::unordered_set<AZStd::string>& forbiddenStrings
, const UniqueStringContainer::StringSet& forbiddenStrings
, int stringMaxLength
, bool removeEditedString)
{
@@ -229,23 +229,23 @@ namespace PhysX
}
else if (attrib == Physics::MaterialConfiguration::s_forbiddenStringSet)
{
AZStd::unordered_set<AZStd::string> forbiddenStringsUnorderedSet;
UniqueStringContainer::StringSet forbiddenStringsUnorderedSet;
AZStd::set<AZStd::string> forbiddenStringsSet;
AZStd::vector<AZStd::string> forbiddenStringsVector;
if (attrValue->Read<AZStd::unordered_set<AZStd::string>>(forbiddenStringsUnorderedSet))
if (attrValue->Read<UniqueStringContainer::StringSet>(forbiddenStringsUnorderedSet))
{
GUI->SetForbiddenStrings(forbiddenStringsUnorderedSet);
}
else if (attrValue->Read<AZStd::set<AZStd::string>>(forbiddenStringsSet))
{
forbiddenStringsUnorderedSet = AZStd::unordered_set<AZStd::string>(forbiddenStringsSet.begin()
forbiddenStringsUnorderedSet = UniqueStringContainer::StringSet(forbiddenStringsSet.begin()
, forbiddenStringsSet.end());
GUI->SetForbiddenStrings(forbiddenStringsUnorderedSet);
}
else if (attrValue->Read<AZStd::vector<AZStd::string>>(forbiddenStringsVector))
{
forbiddenStringsUnorderedSet = AZStd::unordered_set<AZStd::string>(forbiddenStringsVector.begin()
forbiddenStringsUnorderedSet = UniqueStringContainer::StringSet(forbiddenStringsVector.begin()
, forbiddenStringsVector.end());
GUI->SetForbiddenStrings(forbiddenStringsUnorderedSet);
}