Integrating latest from github/staging

Integrating up through commit 5e1bdae
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -66,6 +66,19 @@ namespace AZ
                m_vertexLinks[vertexIndex].push_back(link);
            }

+            bool CompareLinks(const SceneAPI::DataTypes::ISkinWeightData::Link& left, const SceneAPI::DataTypes::ISkinWeightData::Link& right)
+            {
+                // sort highest to lowest
+                return left.weight >= right.weight;
+            }
+
+            void SkinWeightData::AddAndSortLink(size_t vertexIndex, const SceneAPI::DataTypes::ISkinWeightData::Link& link)
+            {
+                AZ_Assert(vertexIndex < m_vertexLinks.size(), "Invalid vertex index %i for skin weight data links.", vertexIndex);
+                m_vertexLinks[vertexIndex].insert(
+                    AZStd::lower_bound(m_vertexLinks[vertexIndex].begin(), m_vertexLinks[vertexIndex].end(), link, CompareLinks), link);
+            }
+
            int SkinWeightData::GetBoneId(const AZStd::string& boneName)
            {
                if (m_boneNameIdMap.find(boneName) == m_boneNameIdMap.end())