Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -12,10 +12,9 @@

 #pragma once

-#include <Utils/AssetHelper.h>
+#include <Atom/RPI.Reflect/Model/ModelLodAsset.h>

-struct IRenderMesh;
-struct SMeshColor;
+#include <Utils/AssetHelper.h>

 namespace NvCloth
 {
@@ -40,9 +39,8 @@ namespace NvCloth
        }

    private:
-        bool CopyDataFromRenderMesh(
-            IRenderMesh& renderMesh,
-            const AZStd::vector<SMeshColor>& renderMeshClothData,
+        bool CopyDataFromMeshes(
+            const AZStd::vector<const AZ::RPI::ModelLodAsset::Mesh*>& meshes,
            MeshClothInfo& meshClothInfo);
    };
 } // namespace NvCloth