Set Base-class StdMaterial to Std2DMaterial/Std3DMaterial

inc/hgl/graph/mtl/StdMaterial.h

@@ -10,16 +10,41 @@
 
 #define STD_MTL_FUNC NAMESPACE_USING using namespace hgl::graph::mtl::func;
 
-
 namespace hgl
 {
     namespace graph
     {
+        class ShaderCreateInfoVertex;
+        class ShaderCreateInfoGeometry;
+        class ShaderCreateInfoFragment;
+
         namespace mtl
         {
             namespace func
             {
             }//namespace func
+
+            class MaterialCreateInfo;
+
+            class StdMaterial
+            {
+            protected:
+
+                virtual bool BeginCustomShader(){return true;/*some work before creating shader*/};
+
+                virtual bool CustomVertexShader(ShaderCreateInfoVertex *)=0;
+                virtual bool CustomGeometryShader(ShaderCreateInfoGeometry *){return false;}
+                virtual bool CustomFragmentShader(ShaderCreateInfoFragment *)=0;
+
+                virtual bool EndCustomShader(){return true;/*some work after creating shader*/};
+
+            public:
+
+                StdMaterial()=default;
+                virtual ~StdMaterial()=default;
+    
+                virtual MaterialCreateInfo *Create()=0;
+            };//class StdMaterial
         }//namespace mtl
     }//namespace graph
 }//namespace hgl

src/ShaderGen/2d/Std2DMaterial.cpp

@@ -6,6 +6,7 @@
 #include"common/MFRectPrimitive.h"
 
 STD_MTL_NAMESPACE_BEGIN
+
 Std2DMaterial::Std2DMaterial(const Material2DCreateConfig *c)
 {
     mci=new MaterialCreateInfo(c);

src/ShaderGen/2d/Std2DMaterial.h

@@ -2,46 +2,28 @@
 
 #include<hgl/graph/mtl/StdMaterial.h>
 
-namespace hgl
+STD_MTL_NAMESPACE_BEGIN
+
+struct Material2DCreateConfig;
+
+class Std2DMaterial:public StdMaterial
 {
-    namespace graph
+protected:
-    {
-        struct GPUDeviceAttribute;
-
-        class ShaderCreateInfoVertex;
-        class ShaderCreateInfoGeometry;
-        class ShaderCreateInfoFragment;
-
-        namespace mtl
-        {
-            class MaterialCreateInfo;
-            struct Material2DCreateConfig;
-
-            class Std2DMaterial
-            {
-            protected:
 
     const Material2DCreateConfig *cfg;
 
     MaterialCreateInfo *mci;
 
-            protected:
+protected:
 
-                virtual bool BeginCustomShader(){return true;/*some work before creating shader*/};
+    virtual bool CustomVertexShader(ShaderCreateInfoVertex *) override;
 
-                virtual bool CustomVertexShader(ShaderCreateInfoVertex *);
+public:
-                virtual bool CustomGeometryShader(ShaderCreateInfoGeometry *){return false;}
-                virtual bool CustomFragmentShader(ShaderCreateInfoFragment *)=0;
-
-                virtual bool EndCustomShader(){return true;/*some work after creating shader*/};
-
-            public:
 
     Std2DMaterial(const Material2DCreateConfig *);
     virtual ~Std2DMaterial()=default;
     
-                virtual MaterialCreateInfo *Create();
+    virtual MaterialCreateInfo *Create() override;
-            };//class Std2DMaterial
+};//class Std2DMaterial
-        }//namespace mtl
+
-    }//namespace graph
+STD_MTL_NAMESPACE_END
-}//namespace hgl

src/ShaderGen/3d/Std3DMaterial.h

@@ -2,46 +2,28 @@
 
 #include<hgl/graph/mtl/StdMaterial.h>
 
-namespace hgl
+STD_MTL_NAMESPACE_BEGIN
+
+struct Material3DCreateConfig;
+
+class Std3DMaterial:public StdMaterial
 {
-    namespace graph
+protected:
-    {
-        struct GPUDeviceAttribute;
-
-        class ShaderCreateInfoVertex;
-        class ShaderCreateInfoGeometry;
-        class ShaderCreateInfoFragment;
-
-        namespace mtl
-        {
-            class MaterialCreateInfo;
-            struct Material3DCreateConfig;
-
-            class Std3DMaterial
-            {
-            protected:
 
     const Material3DCreateConfig *cfg;
 
     MaterialCreateInfo *mci;
 
-            protected:
+protected:
 
-                virtual bool BeginCustomShader(){return true;/*some work before creating shader*/};
+    virtual bool CustomVertexShader(ShaderCreateInfoVertex *) override;
 
-                virtual bool CustomVertexShader(ShaderCreateInfoVertex *);
+public:
-                virtual bool CustomGeometryShader(ShaderCreateInfoGeometry *){return false;}
-                virtual bool CustomFragmentShader(ShaderCreateInfoFragment *)=0;
-
-                virtual bool EndCustomShader(){return true;/*some work after creating shader*/};
-
-            public:
 
     Std3DMaterial(const Material3DCreateConfig *);
     virtual ~Std3DMaterial()=default;
     
-                virtual MaterialCreateInfo *Create();
+    virtual MaterialCreateInfo *Create() override;
-            };//class Std3DMaterial
+};//class Std3DMaterial
-        }//namespace mtl
+
-    }//namespace graph
+STD_MTL_NAMESPACE_END
-}//namespace hgl