Finished writeup and fixed crashes

src/Engine/Asset/AssetRegistry.cpp

@@ -4,7 +4,7 @@
 #include "TextureLoader.h"
 #include "MaterialLoader.h"
 #include "MeshLoader.h"
-#include "Material/Material.h"
+#include "Material/MaterialAsset.h"
 #include "Graphics/Graphics.h"
 #include "Window/WindowManager.h"
 #include "MeshAsset.h"

src/Engine/Asset/MaterialLoader.cpp

@@ -1,6 +1,6 @@
 #include "MaterialLoader.h"
-#include "Material/Material.h"
 #include "Graphics/Graphics.h"
+#include "Material/MaterialAsset.h"
 #include "AssetRegistry.h"
 
 using namespace Seele;
@@ -8,8 +8,8 @@ using namespace Seele;
 MaterialLoader::MaterialLoader(Gfx::PGraphics graphics)
     : graphics(graphics)
 {
-    placeholderMaterial = new Material(std::filesystem::absolute("./shaders/Placeholder.asset"));
-    placeholderMaterial->compile();
+    placeholderMaterial = new MaterialAsset(std::filesystem::absolute("./shaders/Placeholder.asset"));
+    placeholderMaterial->load();
     graphics->getShaderCompiler()->registerMaterial(placeholderMaterial);
 }
 
@@ -17,10 +17,10 @@ MaterialLoader::~MaterialLoader()
 {
 }
 
-PMaterial MaterialLoader::queueAsset(const std::filesystem::path& filePath)
+PMaterialAsset MaterialLoader::queueAsset(const std::filesystem::path& filePath)
 {
-    PMaterial result = new Material(filePath);
-    result->compile();
+    PMaterialAsset result = new MaterialAsset(filePath);
+    result->load();
     graphics->getShaderCompiler()->registerMaterial(result);
     AssetRegistry::get().registerMaterial(result);
     // TODO: There is actually no real reason to import a standalone material,
@@ -28,7 +28,7 @@ PMaterial MaterialLoader::queueAsset(const std::filesystem::path& filePath)
     return result;
 }
 
-PMaterial MaterialLoader::getPlaceHolderMaterial() 
+PMaterialAsset MaterialLoader::getPlaceHolderMaterial() 
 {
     return placeholderMaterial;
 }

src/Engine/Asset/MaterialLoader.h

@@ -7,19 +7,19 @@
 
 namespace Seele
 {
-DECLARE_REF(Material)
+DECLARE_REF(MaterialAsset)
 DECLARE_NAME_REF(Gfx, Graphics)
 class MaterialLoader
 {
 public:
     MaterialLoader(Gfx::PGraphics graphic);
     ~MaterialLoader();
-    PMaterial queueAsset(const std::filesystem::path& filePath);
-    PMaterial getPlaceHolderMaterial();
+    PMaterialAsset queueAsset(const std::filesystem::path& filePath);
+    PMaterialAsset getPlaceHolderMaterial();
 private:
     Gfx::PGraphics graphics;
     List<std::future<void>> futures;
-    PMaterial placeholderMaterial;
+    PMaterialAsset placeholderMaterial;
 };
 DEFINE_REF(MaterialLoader)
 } // namespace Seele

src/Engine/Asset/MeshLoader.cpp

@@ -5,7 +5,6 @@
 #include "Graphics/Mesh.h"
 #include "Graphics/StaticMeshVertexInput.h"
 #include "AssetRegistry.h"
-#include "Material/Material.h"
 #include <fstream>
 #include <iostream>
 #include <nlohmann/json.hpp>
@@ -88,8 +87,8 @@ void MeshLoader::loadMaterials(const aiScene* scene, Array<PMaterialAsset>& glob
         outMatFile.close();
 
         std::cout << "writing json to " << outMatFilename << std::endl;
-        PMaterial result = new Material(outMatFilename);
-        result->compile();
+        PMaterialAsset result = new MaterialAsset(outMatFilename);
+        result->load();
         graphics->getShaderCompiler()->registerMaterial(result);
         AssetRegistry::get().registerMaterial(result);
         PMaterialAsset asset = AssetRegistry::findMaterial(result->getFileName());