*miscHEADmaster

18 files changed, 25 insertions, 205 deletions

diff --git a/source/Asura.Editor/Controls/GUIPanel.cpp b/source/Asura.Editor/Controls/GUIPanel.cpp
index 3a78af7..e69de29 100644
--- a/source/Asura.Editor/Controls/GUIPanel.cpp
+++ b/source/Asura.Editor/Controls/GUIPanel.cpp
@@ -1,6 +0,0 @@
-#include "GUIPanel.h"
-
-namespace_begin(AsuraEditor)
-
-
-namespace_end
diff --git a/source/Asura.Editor/Controls/GUIPanel.h b/source/Asura.Editor/Controls/GUIPanel.h
index 0f98eaa..9ff6eed 100644
--- a/source/Asura.Editor/Controls/GUIPanel.h
+++ b/source/Asura.Editor/Controls/GUIPanel.h
@@ -1,11 +1,13 @@
-#ifndef _ASURA_EDITOR_GUI_PANEL_H_
-#define _ASURA_EDITOR_GUI_PANEL_H_
+#ifndef _ASURA_EDITOR_GUIPANEL_H_
+#define _ASURA_EDITOR_GUIPANEL_H_
 
 #include <asura-base/Classes.h>
 
+#include "../System/GUIWindow.h"
+
 namespace_begin(AsuraEditor)
 
-/// IMGUI panel
+// GUIWindow�ĵ������
 class GUIPanel
 {
 public: 
@@ -15,10 +17,12 @@ public:
 
 private: 
 
+	GUIWindow* m_GUIWindow; // �����Ļ��ƴ���
 
 
 };
 
+
 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/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
diff --git a/source/Asura.Editor/Graphics/shaders/image.shader.h b/source/Asura.Editor/Graphics/shaders/image.shader.h
deleted file mode 100644
index cbdd542..0000000
--- a/source/Asura.Editor/Graphics/shaders/image.shader.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#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/shaders/polygon.shader.h b/source/Asura.Editor/Graphics/shaders/polygon.shader.h
deleted file mode 100644
index a92e9a6..0000000
--- a/source/Asura.Editor/Graphics/shaders/polygon.shader.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _ASURA_EDITOR_SHADER_H_
-#include "../shader.h"
-#endif
-
-// ����
-static AsuraEditor::Graphics::ShaderProgram polygon_shader =
-{
-	R"(
-in vec2 position; 
-
-uniform mat4 mvp_matrix; 
-
-void main() 
-{
-	gl_Position = mvp_matrix * vec4(position, 0, 1);
-}
-
-)",
-
-R"(
-uniform vec4 color;
-
-void main() 
-{
-		gl_FragColor = color;
-}
-
-)"
-};
\ No newline at end of file
diff --git a/source/Asura.Editor/System/ContainerWindow.h b/source/Asura.Editor/System/ContainerWindow.h
index 5893aff..06a7b82 100644
--- a/source/Asura.Editor/System/ContainerWindow.h
+++ b/source/Asura.Editor/System/ContainerWindow.h
@@ -11,9 +11,7 @@
 
 namespace_begin(AsuraEditor)
 
-/// 
-/// �����༭�����ڵ�native����
-/// 
+/// �����༭�����ڵ�native���ڣ���Ϊ��menu��û��menu�ģ���������GUIWindow��
 class ContainerWindow : public AEScripting::Portable<ContainerWindow>
 {
 public:
@@ -40,10 +38,9 @@ public:
         
 private: 
 
-	ContainerWindow* mParent;
-	WindowStyle      mStyle;
-	HWND             mHWND;
-	HDC              mHDC;
+	WindowStyle m_Style;
+	HWND        m_HWND;
+	HDC         m_HDC;
 
 luaxport:
 
@@ -57,6 +54,9 @@ luaxport:
 
 };
 
+// ����GUIWindow�Ŀ��
+using ContainerFrame = ContainerWindow;
+
 namespace_end
 
 #endif
\ No newline at end of file
diff --git a/source/Asura.Editor/System/Input.cpp b/source/Asura.Editor/System/Input.cpp
index c10eb3b..80086d3 100644
--- a/source/Asura.Editor/System/Input.cpp
+++ b/source/Asura.Editor/System/Input.cpp
@@ -49,7 +49,7 @@ LRESULT Input::OnDeviceChange(LPCWSTR name, bool add)
 {
 }
 
-bool Input::ConvertPositionToClientAreaCoord(HWND activeWindow, POINT position, AEMath::Vector2f& newPos)
+bool Input::ConvertPositionToClientAreaCoord(HWND activeWindow, POINT position, Vector2f& newPos)
 {
 }
 
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/image.shader.h
deleted file mode 100644
index cbdd542..0000000
--- a/source/Asura.Editor/graphics/shaders/image.shader.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#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/shaders/polygon.shader.h b/source/Asura.Editor/graphics/shaders/polygon.shader.h
deleted file mode 100644
index a92e9a6..0000000
--- a/source/Asura.Editor/graphics/shaders/polygon.shader.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _ASURA_EDITOR_SHADER_H_
-#include "../shader.h"
-#endif
-
-// ����
-static AsuraEditor::Graphics::ShaderProgram polygon_shader =
-{
-	R"(
-in vec2 position; 
-
-uniform mat4 mvp_matrix; 
-
-void main() 
-{
-	gl_Position = mvp_matrix * vec4(position, 0, 1);
-}
-
-)",
-
-R"(
-uniform vec4 color;
-
-void main() 
-{
-		gl_FragColor = color;
-}
-
-)"
-};
\ 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