From bd4fc34cbbefb62f248c4ac75b2b4bfadf93acf2 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sat, 27 Jul 2024 19:13:35 +0800 Subject: [PATCH] renamed values's name. --- src/ShaderGen/2d/Std2DMaterialLoader.cpp | 14 +++++++------- src/ShaderGen/3d/Std3DMaterialLoader.cpp | 14 +++++++------- src/ShaderGen/MaterialFileData.h | 8 ++++---- src/ShaderGen/MaterialFileLoader.cpp | 8 ++++---- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/ShaderGen/2d/Std2DMaterialLoader.cpp b/src/ShaderGen/2d/Std2DMaterialLoader.cpp index 9a958e7c..5ae3ab6c 100644 --- a/src/ShaderGen/2d/Std2DMaterialLoader.cpp +++ b/src/ShaderGen/2d/Std2DMaterialLoader.cpp @@ -31,11 +31,11 @@ namespace if(!Std2DMaterial::BeginCustomShader()) return(false); - if(mfd->mi.mi_bytes>0) + if(mfd->mi_data.data_bytes>0) { - mci->SetMaterialInstance( mfd->mi.code, - mfd->mi.mi_bytes, - mfd->mi.shader_stage_flag_bits); + mci->SetMaterialInstance( mfd->mi_data.code, + mfd->mi_data.data_bytes, + mfd->mi_data.shader_stage_flag_bits); } for(const auto ubo:mfd->ubo_list) @@ -56,7 +56,7 @@ namespace template SD *CommonProc(SCI *sc) { - SD *sd=(SD *)(mfd->shader[ss]); + SD *sd=(SD *)(mfd->shader_data_map[ss]); if(!sd) return(nullptr); @@ -73,7 +73,7 @@ namespace bool CustomVertexShader(ShaderCreateInfoVertex *vsc) override { - vsc->AddInput(mfd->via); + vsc->AddInput(mfd->via_list); if(!Std2DMaterial::CustomVertexShader(vsc)) return(false); @@ -112,7 +112,7 @@ MaterialCreateInfo *LoadMaterialFromFile(const AnsiString &name,Material2DCreate if(!mfd) return nullptr; - if(mfd->mi.mi_bytes>0) + if(mfd->mi_data.data_bytes>0) cfg->material_instance=true; cfg->shader_stage_flag_bit=mfd->shader_stage_flag_bit; diff --git a/src/ShaderGen/3d/Std3DMaterialLoader.cpp b/src/ShaderGen/3d/Std3DMaterialLoader.cpp index 56a303ec..acbaf3fa 100644 --- a/src/ShaderGen/3d/Std3DMaterialLoader.cpp +++ b/src/ShaderGen/3d/Std3DMaterialLoader.cpp @@ -44,11 +44,11 @@ namespace ubo.name); } - if(mfd->mi.mi_bytes>0) + if(mfd->mi_data.data_bytes>0) { - mci->SetMaterialInstance(mfd->mi.code, - mfd->mi.mi_bytes, - mfd->mi.shader_stage_flag_bits); + mci->SetMaterialInstance(mfd->mi_data.code, + mfd->mi_data.data_bytes, + mfd->mi_data.shader_stage_flag_bits); } return true; @@ -57,7 +57,7 @@ namespace template SD *CommonProc(SCI *sc) { - SD *sd=(SD *)(mfd->shader[ss]); + SD *sd=(SD *)(mfd->shader_data_map[ss]); if(!sd) return (nullptr); @@ -74,7 +74,7 @@ namespace bool CustomVertexShader(ShaderCreateInfoVertex *vsc) override { - vsc->AddInput(mfd->via); + vsc->AddInput(mfd->via_list); if(!Std3DMaterial::CustomVertexShader(vsc)) return (false); @@ -113,7 +113,7 @@ MaterialCreateInfo *LoadMaterialFromFile(const AnsiString &name,Material3DCreate if(!mfd) return nullptr; - if(mfd->mi.mi_bytes>0) + if(mfd->mi_data.data_bytes>0) cfg->material_instance=true; cfg->shader_stage_flag_bit=mfd->shader_stage_flag_bit; diff --git a/src/ShaderGen/MaterialFileData.h b/src/ShaderGen/MaterialFileData.h index 5cb63246..dc1be48a 100644 --- a/src/ShaderGen/MaterialFileData.h +++ b/src/ShaderGen/MaterialFileData.h @@ -20,7 +20,7 @@ namespace material_file const char *code; uint code_length; - uint mi_bytes; + uint data_bytes; uint32_t shader_stage_flag_bits; }; @@ -127,13 +127,13 @@ namespace material_file AnsiStringList require_list; ///<需求的内部模块(如LocalToWorld,Sun,Shadow等系统内置元素) // AnsiStringList import_list; ///<引用的外部模块 - MaterialInstanceData mi{}; + MaterialInstanceData mi_data{}; - VIAList via; ///code =code_parse.start; mid->code_length =code_parse.end-code_parse.start; - mid->mi_bytes =mi_bytes; + mid->data_bytes =mi_bytes; mid->shader_stage_flag_bits =shader_stage_flag_bits; } } @@ -655,10 +655,10 @@ namespace parse=new MaterialBlockParse(&(mfd->require_list),&(mfd->ubo_list)); else if(state==MaterialFileBlock::MaterialInstance) - parse=new MaterialInstanceBlockParse(&(mfd->mi)); + parse=new MaterialInstanceBlockParse(&(mfd->mi_data)); else if(state==MaterialFileBlock::VertexInput) - parse=new VertexInputBlockParse(&(mfd->via)); + parse=new VertexInputBlockParse(&(mfd->via_list)); else if(state>=MaterialFileBlock::Vertex &&state<=MaterialFileBlock::Fragment) @@ -689,7 +689,7 @@ namespace if(!sd) return(false); - mfd->shader.Add(sd->GetShaderStage(),sd); + mfd->shader_data_map.Add(sd->GetShaderStage(),sd); mfd->shader_stage_flag_bit|=sd->GetShaderStage(); }