renamed few class name;

This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-10-09 21:13:34 +08:00
parent c5dd359d18
commit 55fee1e5d7

View File

@ -11,7 +11,7 @@
STD_MTL_NAMESPACE_BEGIN STD_MTL_NAMESPACE_BEGIN
namespace namespace
{ {
using MaterialFileParse=io::TextInputStream::ParseCallback<char>; using TextParse=io::TextInputStream::ParseCallback<char>;
enum class MaterialFileBlock enum class MaterialFileBlock
{ {
@ -59,7 +59,7 @@ namespace
return MaterialFileBlock::None; return MaterialFileBlock::None;
} }
struct MaterialFileBlockParse:public MaterialFileParse struct MaterialFileBlockParse:public TextParse
{ {
MaterialFileBlock state; MaterialFileBlock state;
@ -77,7 +77,7 @@ namespace
} }
};//struct MaterialFileBlockParse };//struct MaterialFileBlockParse
struct CodeParse:public MaterialFileParse struct CodeParse:public TextParse
{ {
const char *start =nullptr; const char *start =nullptr;
const char *end =nullptr; const char *end =nullptr;
@ -108,7 +108,7 @@ namespace
} }
};//struct CodeParse };//struct CodeParse
struct MaterialInstanceStateParse:public MaterialFileParse struct MaterialInstanceStateParse:public TextParse
{ {
bool code =false; bool code =false;
CodeParse code_parse; CodeParse code_parse;
@ -198,7 +198,7 @@ namespace
return(true); return(true);
} }
struct VertexInputBlockParse:public MaterialFileParse struct VertexInputBlockParse:public TextParse
{ {
List<UniformAttrib> input_list; List<UniformAttrib> input_list;
@ -218,7 +218,7 @@ namespace
} }
};//struct VertexInputBlockParse };//struct VertexInputBlockParse
struct ShaderBlockParse:public MaterialFileParse struct ShaderBlockParse:public TextParse
{ {
bool output=false; bool output=false;
List<UniformAttrib> output_list; List<UniformAttrib> output_list;
@ -338,21 +338,21 @@ namespace
};//struct GeometryShaderBlockParse };//struct GeometryShaderBlockParse
struct MaterialTextParse:public MaterialFileParse struct MaterialFileParse:public TextParse
{ {
MaterialFileBlock state; MaterialFileBlock state;
MaterialFileParse *parse; TextParse *parse;
public: public:
MaterialTextParse() MaterialFileParse()
{ {
state=MaterialFileBlock::None; state=MaterialFileBlock::None;
parse=nullptr; parse=nullptr;
} }
~MaterialTextParse() ~MaterialFileParse()
{ {
SAFE_CLEAR(parse) SAFE_CLEAR(parse)
} }
@ -405,7 +405,7 @@ bool LoadMaterialFromFile(const AnsiString &mtl_filename)
if(!fis) if(!fis)
return(false); return(false);
MaterialTextParse mtp; MaterialFileParse mtp;
io::TextInputStream tis(fis,0); io::TextInputStream tis(fis,0);