hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add mtl_name value in Material class,It's name of material.

Browse Source
This commit is contained in:
hyzboy
2021-05-10 15:19:16 +08:00
parent 7f0a786122
commit b86742109b
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp
View File

@@ -44,7 +44,7 @@ const ShaderModule *RenderResource::CreateShaderModule(const OSString &filename)
return sm;
}
Material *RenderResource::CreateMaterial(const OSString &vertex_shader_filename,const OSString &fragment_shader_filename)
Material *RenderResource::CreateMaterial(const UTF8String &mtl_name,const OSString &vertex_shader_filename,const OSString &fragment_shader_filename)
{
const ShaderModule *vs=CreateShaderModule(vertex_shader_filename);
@@ -56,10 +56,10 @@ Material *RenderResource::CreateMaterial(const OSString &vertex_shader_filename,
if(!fs)
return(nullptr);
return(device->CreateMaterial((VertexShaderModule *)vs,fs));
return(device->CreateMaterial(mtl_name,(VertexShaderModule *)vs,fs));
}
Material *RenderResource::CreateMaterial(const OSString &vertex_shader_filename,const OSString &geometry_shader_filename,const OSString &fragment_shader_filename)
Material *RenderResource::CreateMaterial(const UTF8String &mtl_name,const OSString &vertex_shader_filename,const OSString &geometry_shader_filename,const OSString &fragment_shader_filename)
{
const ShaderModule *vs=CreateShaderModule(vertex_shader_filename);
@@ -76,7 +76,7 @@ Material *RenderResource::CreateMaterial(const OSString &vertex_shader_filename,
if(!fs)
return(nullptr);
return(device->CreateMaterial((VertexShaderModule *)vs,gs,fs));
return(device->CreateMaterial(mtl_name,(VertexShaderModule *)vs,gs,fs));
}
Material *RenderResource::CreateMaterial(const OSString &filename)
@@ -163,7 +163,7 @@ Material *RenderResource::CreateMaterial(const OSString &filename)
if(result)
{
mtl=device->CreateMaterial(smm);
mtl=device->CreateMaterial(ToUTF8String(filename),smm);
Add(mtl);
}
else