compiles again

src/Engine/Material/MaterialInstance.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "Material.h"
 #include "Graphics/Buffer.h"
+#include "Asset/MaterialAsset.h"
 
 namespace Seele
 {
@@ -8,16 +9,22 @@ class MaterialInstance
 {
 public:
     MaterialInstance();
-    MaterialInstance(uint64 id, Gfx::PGraphics graphics, PMaterial baseMaterial, Gfx::PDescriptorLayout descriptor, Array<OShaderParameter> params, uint32 uniformBinding, uint32 uniformSize);
+    MaterialInstance(uint64 id, 
+        Gfx::PGraphics graphics, 
+        Map<std::string, OShaderExpression>& expressions,
+        Array<std::string> params, 
+        uint32 uniformBinding, 
+        uint32 uniformSize);
     ~MaterialInstance();
     void updateDescriptor();
     Gfx::PDescriptorSet getDescriptorSet() const;
-    PMaterial getBaseMaterial() const { return baseMaterial; }
+    PMaterial getBaseMaterial() const { return baseMaterial->getMaterial(); }
     uint64 getId() const { return id; }
 
+    void setBaseMaterial(PMaterialAsset asset);
+
     void save(ArchiveBuffer& buffer) const;
     void load(ArchiveBuffer& buffer);
-    void setBaseMaterial(PMaterial material);
 
 private:
     Gfx::PGraphics graphics;
@@ -25,9 +32,8 @@ private:
     uint32 uniformBinding;
     Gfx::OUniformBuffer uniformBuffer;
     Array<OShaderParameter> parameters;
-    Gfx::PDescriptorLayout layout;
     Gfx::PDescriptorSet descriptor;
-    PMaterial baseMaterial;
+    PMaterialAsset baseMaterial;
     uint64 id;
 };
 DEFINE_REF(MaterialInstance)