*miscHEADmaster

12 files changed, 105 insertions, 30 deletions

diff --git a/Source/Asura.Editor/Graphics/GUIMaterial.cpp b/Source/Asura.Editor/Graphics/GUIMaterial.cpp
new file mode 100644
index 0000000..b82afaa
--- /dev/null
+++ b/Source/Asura.Editor/Graphics/GUIMaterial.cpp
@@ -0,0 +1,5 @@
+#include "GUIMaterial.h"
+
+namespace_begin(AsuraEditor)
+
+namespace_end
diff --git a/Source/Asura.Editor/Graphics/GUIMaterial.h b/Source/Asura.Editor/Graphics/GUIMaterial.h
new file mode 100644
index 0000000..bccfc7e
--- /dev/null
+++ b/Source/Asura.Editor/Graphics/GUIMaterial.h
@@ -0,0 +1,22 @@
+#ifndef _ASURA_EDITOR_GUI_MATERIAL_H_
+#define _ASURA_EDITOR_GUI_MATERIAL_H_
+
+#include <asura-base/Classes.h>
+
+namespace_begin(AsuraEditor)
+
+// GUI�ڽ�����
+class GUIMaterial
+{
+public: 
+
+private: 
+
+
+
+};
+
+
+namespace_end
+
+#endif
diff --git a/Source/Asura.Editor/Graphics/GUIStyle.cpp b/Source/Asura.Editor/Graphics/GUIStyle.cpp
new file mode 100644
index 0000000..4da2847
--- /dev/null
+++ b/Source/Asura.Editor/Graphics/GUIStyle.cpp
@@ -0,0 +1,4 @@
+#include "GUIStyle.h"
+
+
+
diff --git a/Source/Asura.Editor/Graphics/GUIStyle.h b/Source/Asura.Editor/Graphics/GUIStyle.h
new file mode 100644
index 0000000..8556397
--- /dev/null
+++ b/Source/Asura.Editor/Graphics/GUIStyle.h
@@ -0,0 +1,34 @@
+#ifndef _ASURA_EDITOR_GUI_STYLE_H_
+#define _ASURA_EDITOR_GUI_STYLE_H_
+
+#include <asura-base/Classes.h>
+
+#include "GUIMaterial.h"
+
+namespace_begin(AsuraEditor)
+
+/// �༭����ʽ
+class GUIStyle
+{
+public: 
+
+	GUIStyle();
+	~GUIStyle();
+
+	void DrawContent();
+
+private: 
+
+	GUIMaterial* GetGUITextMaterial();
+	GUIMaterial* GetGUIBlendMaterial();
+	GUIMaterial* GetGUIBlitMaterial();
+
+	GUIMaterial* m_GUITextMaterial;
+	GUIMaterial* m_GUIBlendMaterial;
+	GUIMaterial* m_GUIBlitMaterial;
+
+};
+
+namespace_end
+
+#endif
\ No newline at end of file
diff --git a/Source/Asura.Editor/Graphics/Pen.cpp b/Source/Asura.Editor/Graphics/Pen.cpp
deleted file mode 100644
index e69de29..0000000
--- a/Source/Asura.Editor/Graphics/Pen.cpp
+++ /dev/null
diff --git a/Source/Asura.Editor/Graphics/Pen.h b/Source/Asura.Editor/Graphics/Pen.h
deleted file mode 100644
index b949d14..0000000
--- a/Source/Asura.Editor/Graphics/Pen.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASURA_EDITOR_PEN_H_
-#define _ASURA_EDITOR_PEN_H_
-
-
-
-
-#endif
\ No newline at end of file
diff --git a/Source/Asura.Editor/Graphics/Shader.h b/Source/Asura.Editor/Graphics/Shader.h
index a3abec1..af291a5 100644
--- a/Source/Asura.Editor/Graphics/Shader.h
+++ b/Source/Asura.Editor/Graphics/Shader.h
@@ -3,16 +3,13 @@
 
 namespace AsuraEditor
 {
-	namespace Graphics
-	{
 
-		struct ShaderProgram
-		{
-			const char* vert; 
-			const char* frag;
-		};
+struct ShaderProgram
+{
+	const char* vert; 
+	const char* frag;
+};
 
-	}
 }
 
 #endif
\ No newline at end of file
diff --git a/Source/Asura.Editor/Graphics/shaders/image.shader.h b/Source/Asura.Editor/Graphics/Shaders/GUIClip.shader.h
index cbdd542..cbdd542 100644
--- a/Source/Asura.Editor/Graphics/shaders/image.shader.h
+++ b/Source/Asura.Editor/Graphics/Shaders/GUIClip.shader.h
diff --git a/Source/Asura.Editor/Graphics/shaders/polygon.shader.h b/Source/Asura.Editor/Graphics/Shaders/GUIText.shader.h
index a92e9a6..a92e9a6 100644
--- a/Source/Asura.Editor/Graphics/shaders/polygon.shader.h
+++ b/Source/Asura.Editor/Graphics/Shaders/GUIText.shader.h
diff --git a/Source/Asura.Editor/Graphics/Shaders/GUITexture.shader.h b/Source/Asura.Editor/Graphics/Shaders/GUITexture.shader.h
new file mode 100644
index 0000000..cbdd542
--- /dev/null
+++ b/Source/Asura.Editor/Graphics/Shaders/GUITexture.shader.h
@@ -0,0 +1,35 @@
+#ifndef _ASURA_EDITOR_SHADER_H_
+#include "../shader.h"
+#endif
+
+// ����
+static AsuraEditor::Graphics::ShaderProgram image_shader =
+{
+R"(
+in vec2 asura_position; 
+in vec2 asura_texcoord0; 
+
+uniform mat4 asura_model_matrix; 
+uniform mat4 asura_view_matrix; 
+uniform mat4 asura_projection_matrix; 
+
+void main() 
+{
+	gl_Position = asura_projection_matrix * asura_view_matrix * asura_model_matrix * vec4(asura_position, 0, 1);
+	uv = asura_texcoord0;
+}
+
+)",
+
+R"(
+in vec2 uv;
+
+uniform sampler2D asura_maintex;
+
+void main() 
+{
+		
+}
+
+)"
+};
\ No newline at end of file
diff --git a/Source/Asura.Editor/Graphics/Style.cpp b/Source/Asura.Editor/Graphics/Style.cpp
deleted file mode 100644
index e69de29..0000000
--- a/Source/Asura.Editor/Graphics/Style.cpp
+++ /dev/null
diff --git a/Source/Asura.Editor/Graphics/Style.h b/Source/Asura.Editor/Graphics/Style.h
deleted file mode 100644
index 2676c68..0000000
--- a/Source/Asura.Editor/Graphics/Style.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ASURA_EDITOR_GUI_STYLE_H_
-#define _ASURA_EDITOR_GUI_STYLE_H_
-
-#include <asura-base/Classes.h>
-
-namespace_begin(AsuraEditor)
-
-class GUIStyle
-{
-
-};
-
-namespace_end
-
-#endif
\ No newline at end of file