From cfed14d7468dc37eeb1d509a933b0bf438a50b94 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Wed, 11 Oct 2023 13:14:34 +0800 Subject: [PATCH] renamed to require_list instead of require in MaterialFileData --- src/ShaderGen/MaterialFileData.h | 4 ++-- src/ShaderGen/MaterialFileLoader.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ShaderGen/MaterialFileData.h b/src/ShaderGen/MaterialFileData.h index fe0556a1..00e65986 100644 --- a/src/ShaderGen/MaterialFileData.h +++ b/src/ShaderGen/MaterialFileData.h @@ -84,8 +84,8 @@ namespace material_file public: - AnsiStringList require; ///<需求的内部模块(如LocalToWorld,Sun,Shadow等系统内置元素) -// AnsiStringList import; ///<引用的外部模块 + AnsiStringList require_list; ///<需求的内部模块(如LocalToWorld,Sun,Shadow等系统内置元素) +// AnsiStringList import_list; ///<引用的外部模块 MaterialInstanceData mi{}; diff --git a/src/ShaderGen/MaterialFileLoader.cpp b/src/ShaderGen/MaterialFileLoader.cpp index 0461393c..ca480eaf 100644 --- a/src/ShaderGen/MaterialFileLoader.cpp +++ b/src/ShaderGen/MaterialFileLoader.cpp @@ -67,7 +67,7 @@ namespace { MaterialFileBlock state; - AnsiStringList *require=nullptr; + AnsiStringList *require_list=nullptr; public: @@ -75,7 +75,7 @@ namespace { state=MaterialFileBlock::None; - require=asl; + require_list=asl; } bool OnLine(char *text,const int len) override @@ -95,7 +95,7 @@ namespace { while(hgl::iscodechar(*text))++text; - require->Add(AnsiString(sp,text-sp)); + require_list->Add(AnsiString(sp,text-sp)); while(!hgl::iscodechar(*text))++text; @@ -461,7 +461,7 @@ namespace state=GetMaterialFileState(text+1,len-1); if(state==MaterialFileBlock::Material) - parse=new MaterialBlockParse(&(mfd->require)); + parse=new MaterialBlockParse(&(mfd->require_list)); else if(state==MaterialFileBlock::MaterialInstance) parse=new MaterialInstanceBlockParse(&(mfd->mi));