From a2669d21233b1c153dfa2c1b10d5bcc9eb9a7580 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Tue, 10 Oct 2023 19:21:33 +0800 Subject: [PATCH] adjust class's name in MaterialFileLoader.cpp --- src/ShaderGen/MaterialFileLoader.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ShaderGen/MaterialFileLoader.cpp b/src/ShaderGen/MaterialFileLoader.cpp index a4fd6c19..77dfa884 100644 --- a/src/ShaderGen/MaterialFileLoader.cpp +++ b/src/ShaderGen/MaterialFileLoader.cpp @@ -63,11 +63,11 @@ namespace return MaterialFileBlock::None; } - struct MaterialFileBlockParse:public TextParse + struct MaterialBlockParse:public TextParse { MaterialFileBlock state; - MaterialFileBlockParse() + MaterialBlockParse() { state=MaterialFileBlock::None; } @@ -79,7 +79,7 @@ namespace return(true); } - };//struct MaterialFileBlockParse + };//struct MaterialBlockParse struct CodeParse:public TextParse { @@ -113,7 +113,7 @@ namespace } };//struct CodeParse - struct MaterialInstanceStateParse:public TextParse + struct MaterialInstanceBlockParse:public TextParse { bool code =false; CodeParse code_parse; @@ -125,12 +125,12 @@ namespace public: - MaterialInstanceStateParse(MaterialInstanceData *d) + MaterialInstanceBlockParse(MaterialInstanceData *d) { mid=d; } - ~MaterialInstanceStateParse() + ~MaterialInstanceBlockParse() { if(code_parse.start&&code_parse.end) { @@ -191,7 +191,7 @@ namespace return(true); } - };//struct MaterialInstanceStateParse + };//struct MaterialInstanceBlockParse bool ParseUniformAttrib(UniformAttrib *ua,const char *str) { @@ -435,10 +435,10 @@ namespace state=GetMaterialFileState(text+1,len-1); if(state==MaterialFileBlock::Material) - parse=new MaterialFileBlockParse; + parse=new MaterialBlockParse; else if(state==MaterialFileBlock::MaterialInstance) - parse=new MaterialInstanceStateParse(&(mfd->mi)); + parse=new MaterialInstanceBlockParse(&(mfd->mi)); else if(state==MaterialFileBlock::VertexInput) parse=new VertexInputBlockParse(&(mfd->vi));