From c5dd359d185e7ce68c3a4dca25b1ea671a651e69 Mon Sep 17 00:00:00 2001
From: "HuYingzhuo(hugo/hyzboy)" <hyzboy@gmail.com>
Date: Mon, 9 Oct 2023 20:57:46 +0800
Subject: [PATCH] Added Std2DMaterialLoader and Std3DMaterialLoader

---
 src/ShaderGen/2d/Std2DMaterialLoader.cpp | 24 ++++++++++++++++++++++++
 src/ShaderGen/3d/Std3DMaterialLoader.cpp |  0
 src/ShaderGen/CMakeLists.txt             |  2 ++
 src/ShaderGen/MaterialFileLoader.cpp     |  7 -------
 4 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 src/ShaderGen/2d/Std2DMaterialLoader.cpp
 create mode 100644 src/ShaderGen/3d/Std3DMaterialLoader.cpp

diff --git a/src/ShaderGen/2d/Std2DMaterialLoader.cpp b/src/ShaderGen/2d/Std2DMaterialLoader.cpp
new file mode 100644
index 00000000..959a13b7
--- /dev/null
+++ b/src/ShaderGen/2d/Std2DMaterialLoader.cpp
@@ -0,0 +1,24 @@
+#include"Std2DMaterial.h"
+
+STD_MTL_NAMESPACE_BEGIN
+class Std2DMaterialLoader:public Std2DMaterial
+{
+public:
+
+    using Std2DMaterial::Std2DMaterial;
+    ~Std2DMaterialLoader()=default;
+
+    bool CustomVertexShader(ShaderCreateInfoVertex *vsc) override{return true;}
+    bool CustomGeometryShader(ShaderCreateInfoGeometry *) override{return true;}
+    bool CustomFragmentShader(ShaderCreateInfoFragment *) override{return true;}
+
+    bool EndCustomShader() override{return true;}
+};//class Std2DMaterialLoader:public Std2DMaterial
+
+MaterialCreateInfo *LoadMaterialFromFile(const AnsiString &name,const Material2DCreateConfig *cfg)
+{
+    Std2DMaterialLoader *mtl=new Std2DMaterialLoader(cfg);
+
+    return nullptr;
+}
+STD_MTL_NAMESPACE_END
diff --git a/src/ShaderGen/3d/Std3DMaterialLoader.cpp b/src/ShaderGen/3d/Std3DMaterialLoader.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/ShaderGen/CMakeLists.txt b/src/ShaderGen/CMakeLists.txt
index 7763c988..f078ffb9 100644
--- a/src/ShaderGen/CMakeLists.txt
+++ b/src/ShaderGen/CMakeLists.txt
@@ -52,6 +52,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 SET(STD_MTL_2D_SOURCE_FILES	${STD_MTL_HEADER_PATH}/Material2DCreateConfig.h
                             2d/Std2DMaterial.h
                             2d/Std2DMaterial.cpp
+                            2d/Std2DMaterialLoader.cpp
                             2d/M_VertexColor2D.cpp
                             2d/M_PureColor2D.cpp
                             2d/M_PureTexture2D.cpp
@@ -62,6 +63,7 @@ SET(STD_MTL_2D_SOURCE_FILES	${STD_MTL_HEADER_PATH}/Material2DCreateConfig.h
 SET(STD_MTL_3D_SOURCE_FILES	${STD_MTL_HEADER_PATH}/Material3DCreateConfig.h
                             3d/Std3DMaterial.h
                             3d/Std3DMaterial.cpp
+                            3d/Std3DMaterialLoader.cpp
                             3d/M_VertexColor3D.cpp
                             3d/M_VertexLum3D.cpp
 )
diff --git a/src/ShaderGen/MaterialFileLoader.cpp b/src/ShaderGen/MaterialFileLoader.cpp
index 3c127650..fa842479 100644
--- a/src/ShaderGen/MaterialFileLoader.cpp
+++ b/src/ShaderGen/MaterialFileLoader.cpp
@@ -419,13 +419,6 @@ MaterialCreateInfo *LoadMaterialFromFile(const AnsiString &name,const MaterialCr
     return nullptr;
 }
 
-//MaterialCreateInfo *LoadMaterialFromFile(const AnsiString &name,const Material2DCreateConfig *cfg)
-//{
-//    Std2DMaterial *mtl=new Std2DMaterial(cfg);
-//
-//    
-//}
-//
 //MaterialCreateInfo *LoadMaterialFromFile(const AnsiString &name,const Material3DCreateConfig *cfg)
 //{
 //}