renamed MaterialInstance to MaterialParameters.

src/SceneGraph/Vulkan/VKMaterialInstance.cpp

@@ -4,18 +4,18 @@
 #include<hgl/graph/VKDescriptorSets.h>
 
 VK_NAMESPACE_BEGIN
-MaterialInstance::MaterialInstance(Material *m,DescriptorSets *ds)
+MaterialParameters::MaterialParameters(Material *m,DescriptorSets *ds)
 {
     material=m;
     descriptor_sets=ds;
 }
 
-MaterialInstance::~MaterialInstance()
+MaterialParameters::~MaterialParameters()
 {
     delete descriptor_sets;
 }
 
-bool MaterialInstance::BindUBO(const AnsiString &name,GPUBuffer *ubo,bool dynamic)
+bool MaterialParameters::BindUBO(const AnsiString &name,GPUBuffer *ubo,bool dynamic)
 {
     if(name.IsEmpty()||!ubo)
         return(false);
@@ -31,7 +31,7 @@ bool MaterialInstance::BindUBO(const AnsiString &name,GPUBuffer *ubo,bool dynami
     return(true);
 }
 
-bool MaterialInstance::BindSSBO(const AnsiString &name,GPUBuffer *ssbo,bool dynamic)
+bool MaterialParameters::BindSSBO(const AnsiString &name,GPUBuffer *ssbo,bool dynamic)
 {
     if(name.IsEmpty()||!ssbo)
         return(false);
@@ -47,7 +47,7 @@ bool MaterialInstance::BindSSBO(const AnsiString &name,GPUBuffer *ssbo,bool dyna
     return(true);
 }
 
-bool MaterialInstance::BindSampler(const AnsiString &name,Texture *tex,Sampler *sampler)
+bool MaterialParameters::BindSampler(const AnsiString &name,Texture *tex,Sampler *sampler)
 {
     if(name.IsEmpty()||!tex||!sampler)
         return(false);
@@ -63,17 +63,17 @@ bool MaterialInstance::BindSampler(const AnsiString &name,Texture *tex,Sampler *
     return(true);
 }
 
-void MaterialInstance::Update()
+void MaterialParameters::Update()
 {
     descriptor_sets->Update();
 }
 
-MaterialInstance *Material::CreateInstance()
+MaterialParameters *Material::CreateInstance()
 {
     DescriptorSets *ds=CreateMIDescriptorSets();
 
     if(!ds)return(nullptr);
 
-    return(new MaterialInstance(this,ds));
+    return(new MaterialParameters(this,ds));
 }
 VK_NAMESPACE_END

src/SceneGraph/Vulkan/VKRenderResource.cpp

@@ -50,11 +50,11 @@ IndexBuffer *RenderResource::CreateIBO(IndexType index_type,uint32_t count,const
     return(buf);
 }
         
-MaterialInstance *RenderResource::CreateMaterialInstance(Material *mtl)
+MaterialParameters *RenderResource::CreateMaterialInstance(Material *mtl)
 {
     if(!mtl)return(nullptr);
 
-    MaterialInstance *mi=mtl->CreateInstance();
+    MaterialParameters *mi=mtl->CreateInstance();
 
     if(mi)
         Add(mi);
@@ -62,7 +62,7 @@ MaterialInstance *RenderResource::CreateMaterialInstance(Material *mtl)
     return mi;
 }
 
-MaterialInstance *RenderResource::CreateMaterialInstance(const OSString &mtl_filename)
+MaterialParameters *RenderResource::CreateMaterialInstance(const OSString &mtl_filename)
 {
     Material *mtl=this->CreateMaterial(mtl_filename);
 
@@ -96,7 +96,7 @@ TextRenderable *RenderResource::CreateTextRenderable(Material *mtl)
     return tr;
 }
 
-RenderableInstance *RenderResource::CreateRenderableInstance(Renderable *r,MaterialInstance *mi,Pipeline *p)
+RenderableInstance *RenderResource::CreateRenderableInstance(Renderable *r,MaterialParameters *mi,Pipeline *p)
 {
     if(!p||!mi||!r)
         return(nullptr);

src/SceneGraph/Vulkan/VKRenderTargetPipeline.cpp

@@ -21,7 +21,7 @@ Pipeline *RenderTarget::CreatePipeline(Material *mtl,const InlinePipeline &ip,co
     return p;
 }
 
-Pipeline *RenderTarget::CreatePipeline(MaterialInstance *mi,const InlinePipeline &ip,const Prim &prim,const bool prim_restart)
+Pipeline *RenderTarget::CreatePipeline(MaterialParameters *mi,const InlinePipeline &ip,const Prim &prim,const bool prim_restart)
 {
     if(!mi)return(nullptr);
 
@@ -40,7 +40,7 @@ Pipeline *RenderTarget::CreatePipeline(Material *mtl,PipelineData *pd,const Prim
     return(p);
 }
 
-Pipeline *RenderTarget::CreatePipeline(MaterialInstance *mi,PipelineData *pd,const Prim &prim,const bool prim_restart)
+Pipeline *RenderTarget::CreatePipeline(MaterialParameters *mi,PipelineData *pd,const Prim &prim,const bool prim_restart)
 {
     return CreatePipeline(mi->GetMaterial(),pd,prim,prim_restart);
 }
@@ -54,7 +54,7 @@ Pipeline *RenderTarget::CreatePipeline(Material *mtl,const OSString &pipeline_fi
     return CreatePipeline(mtl,pd,prim,prim_restart);
 }
 
-Pipeline *RenderTarget::CreatePipeline(MaterialInstance *mi,const OSString &filename,const Prim &prim,const bool prim_restart)
+Pipeline *RenderTarget::CreatePipeline(MaterialParameters *mi,const OSString &filename,const Prim &prim,const bool prim_restart)
 {
     return CreatePipeline(mi->GetMaterial(),filename,prim,prim_restart);
 }

src/SceneGraph/Vulkan/VKRenderableInstance.cpp

@@ -8,7 +8,7 @@ VK_NAMESPACE_BEGIN
 
 using namespace util;
 
-RenderableInstance::RenderableInstance(Renderable *r,MaterialInstance *mi,Pipeline *p,const uint32_t count,VkBuffer *bl,VkDeviceSize *bs)
+RenderableInstance::RenderableInstance(Renderable *r,MaterialParameters *mi,Pipeline *p,const uint32_t count,VkBuffer *bl,VkDeviceSize *bs)
 {
     render_obj=r;
     mat_inst=mi;
@@ -35,7 +35,7 @@ RenderableInstance::~RenderableInstance()
     delete[] buffer_size;
 }
 
-RenderableInstance *CreateRenderableInstance(Renderable *r,MaterialInstance *mi,Pipeline *p)
+RenderableInstance *CreateRenderableInstance(Renderable *r,MaterialParameters *mi,Pipeline *p)
 {
     if(!r||!mi||!p)return(nullptr);