Trying to fix invalid descriptorlayout

2020-10-03 11:00:10 +02:00
parent 79388bf41a
commit ceee96b462
69 changed files with 1087 additions and 393 deletions
@@ -5,9 +5,13 @@
 #include <future>
 #include <filesystem>

+struct aiScene;
+struct aiTexel;
 namespace Seele
 {
-DECLARE_REF(MeshAsset)
+DECLARE_REF(Mesh);
+DECLARE_REF(MeshAsset);
+DECLARE_REF(MaterialAsset);
 DECLARE_NAME_REF(Gfx, Graphics);
 class MeshLoader
 {
@@ -16,6 +20,11 @@ public:
    ~MeshLoader();
    void importAsset(const std::filesystem::path& filePath);
 private:
+    void loadMaterials(const aiScene* scene, Array<PMaterialAsset>& globalMaterials, Gfx::PGraphics graphics);
+    void loadTextures(const aiScene* scene, Gfx::PGraphics graphics, const std::filesystem::path& meshPath);
+    void loadGlobalMeshes(const aiScene* scene, Array<PMesh>& globalMeshes, Array<PMaterialAsset> materials, Gfx::PGraphics graphics);
+    void convertAssimpARGB(unsigned char* dst, aiTexel* src, uint32 numPixels);
+
    void import(const std::filesystem::path& path);
    List<std::future<void>> futures;
    Gfx::PGraphics graphics;