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

renamed to require_list instead of require in MaterialFileData

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-10-11 13:14:34 +08:00
parent 27c409c7fd
commit cfed14d746
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ShaderGen/MaterialFileData.h
View File

@ -84,8 +84,8 @@ namespace material_file
public: public:
AnsiStringList require; ///<需求的内部模块(如LocalToWorld,Sun,Shadow等系统内置元素) AnsiStringList require_list; ///<需求的内部模块(如LocalToWorld,Sun,Shadow等系统内置元素)
// AnsiStringList import; ///<引用的外部模块 // AnsiStringList import_list; ///<引用的外部模块
MaterialInstanceData mi{}; MaterialInstanceData mi{};

8
src/ShaderGen/MaterialFileLoader.cpp
View File

@ -67,7 +67,7 @@ namespace
{ {
MaterialFileBlock state; MaterialFileBlock state;
AnsiStringList *require=nullptr; AnsiStringList *require_list=nullptr;
public: public:
@ -75,7 +75,7 @@ namespace
{ {
state=MaterialFileBlock::None; state=MaterialFileBlock::None;
require=asl; require_list=asl;
} }
bool OnLine(char *text,const int len) override bool OnLine(char *text,const int len) override
@ -95,7 +95,7 @@ namespace
{ {
while(hgl::iscodechar(*text))++text; while(hgl::iscodechar(*text))++text;
require->Add(AnsiString(sp,text-sp)); require_list->Add(AnsiString(sp,text-sp));
while(!hgl::iscodechar(*text))++text; while(!hgl::iscodechar(*text))++text;
@ -461,7 +461,7 @@ namespace
state=GetMaterialFileState(text+1,len-1); state=GetMaterialFileState(text+1,len-1);
if(state==MaterialFileBlock::Material) if(state==MaterialFileBlock::Material)
parse=new MaterialBlockParse(&(mfd->require)); parse=new MaterialBlockParse(&(mfd->require_list));
else else
if(state==MaterialFileBlock::MaterialInstance) if(state==MaterialFileBlock::MaterialInstance)
parse=new MaterialInstanceBlockParse(&(mfd->mi)); parse=new MaterialInstanceBlockParse(&(mfd->mi));