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

adjust class's name in MaterialFileLoader.cpp

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-10-10 19:21:33 +08:00
parent 737438aaed
commit a2669d2123
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ShaderGen/MaterialFileLoader.cpp
View File

@ -63,11 +63,11 @@ namespace
return MaterialFileBlock::None; return MaterialFileBlock::None;
} }
struct MaterialFileBlockParse:public TextParse struct MaterialBlockParse:public TextParse
{ {
MaterialFileBlock state; MaterialFileBlock state;
MaterialFileBlockParse() MaterialBlockParse()
{ {
state=MaterialFileBlock::None; state=MaterialFileBlock::None;
} }
@ -79,7 +79,7 @@ namespace
return(true); return(true);
} }
};//struct MaterialFileBlockParse };//struct MaterialBlockParse
struct CodeParse:public TextParse struct CodeParse:public TextParse
{ {
@ -113,7 +113,7 @@ namespace
} }
};//struct CodeParse };//struct CodeParse
struct MaterialInstanceStateParse:public TextParse struct MaterialInstanceBlockParse:public TextParse
{ {
bool code =false; bool code =false;
CodeParse code_parse; CodeParse code_parse;
@ -125,12 +125,12 @@ namespace
public: public:
MaterialInstanceStateParse(MaterialInstanceData *d) MaterialInstanceBlockParse(MaterialInstanceData *d)
{ {
mid=d; mid=d;
} }
~MaterialInstanceStateParse() ~MaterialInstanceBlockParse()
{ {
if(code_parse.start&&code_parse.end) if(code_parse.start&&code_parse.end)
{ {
@ -191,7 +191,7 @@ namespace
return(true); return(true);
} }
};//struct MaterialInstanceStateParse };//struct MaterialInstanceBlockParse
bool ParseUniformAttrib(UniformAttrib *ua,const char *str) bool ParseUniformAttrib(UniformAttrib *ua,const char *str)
{ {
@ -435,10 +435,10 @@ namespace
state=GetMaterialFileState(text+1,len-1); state=GetMaterialFileState(text+1,len-1);
if(state==MaterialFileBlock::Material) if(state==MaterialFileBlock::Material)
parse=new MaterialFileBlockParse; parse=new MaterialBlockParse;
else else
if(state==MaterialFileBlock::MaterialInstance) if(state==MaterialFileBlock::MaterialInstance)
parse=new MaterialInstanceStateParse(&(mfd->mi)); parse=new MaterialInstanceBlockParse(&(mfd->mi));
else else
if(state==MaterialFileBlock::VertexInput) if(state==MaterialFileBlock::VertexInput)
parse=new VertexInputBlockParse(&(mfd->vi)); parse=new VertexInputBlockParse(&(mfd->vi));