*thread

11 files changed, 8 insertions, 147 deletions

diff --git a/source/libs/asura-lib-core/graphics/binding/_image.cpp b/source/libs/asura-lib-core/graphics/binding/_image.cpp
index b455ad5..cb008d3 100644
--- a/source/libs/asura-lib-core/graphics/binding/_image.cpp
+++ b/source/libs/asura-lib-core/graphics/binding/_image.cpp
@@ -80,8 +80,8 @@ namespace AsuraEngine
 		{
 			LUAX_PREPARE(L, Image);
 
-			uint x = state.CheckParam<uint>(2);
-			uint y = state.CheckParam<uint>(3);
+			uint x = state.CheckValue<uint>(2);
+			uint y = state.CheckValue<uint>(3);
 			Color32* c32 = new Color32(self->GetPixel(x, y));
 			c32->PushLuaxUserdata(state);
 			return 1;
diff --git a/source/libs/asura-lib-core/graphics/image.h b/source/libs/asura-lib-core/graphics/image.h
index 4c1c7b5..4d9787b 100644
--- a/source/libs/asura-lib-core/graphics/image.h
+++ b/source/libs/asura-lib-core/graphics/image.h
@@ -22,8 +22,9 @@ namespace AsuraEngine
 		class ImageFactory;
 
 		///
-		/// Image��ͼƬ���ڴ�������󣬶�ȡ����Ϸ�󱣴�Ľ����һ��Image���ڴ桢�Դ���ֻ�ᱣ��һ�ݣ����������������Ҫ����
-		/// ��������image����ê��λ�ã����ź���ת�Ƕȣ�ʹ��sprite����һ��ֻ���ࡣ��Ҫ�ǿ��ǵ�editor��engineʹ�ò�ͬ�ķ�װ��
+		/// Image��ͼƬ���ڴ�������󣬶�ȡ����Ϸ�󱣴�Ľ����һ��Image���ڴ桢�Դ���ֻ�ᱣ��һ
+		/// �ݣ����������������Ҫ������������image����ê��λ�ã����ź���ת�Ƕȣ�ʹ��sprite��
+		/// ��һ��ֻ���ࡣ��Ҫ�ǿ��ǵ�editor��engineʹ�ò�ͬ�ķ�װ��
 		///
 		class Image ASURA_FINAL
 			: public Drawable
@@ -39,8 +40,8 @@ namespace AsuraEngine
 			~Image();
 
 			///
-			/// ������buffer����image������Ϣ�����mPixels��Ϊ�գ���������ݡ��������¹���image��ʹ��glTexImage2D�����ύimage
-			/// ���������ݡ�
+			/// ������buffer����image������Ϣ�����mPixels��Ϊ�գ���������ݡ��������¹���image��
+			/// ʹ��glTexImage2D�����ύimage���������ݡ�
 			///
 			bool Load(ImageData* data);
 
diff --git a/source/libs/asura-lib-core/graphics/shader.h b/source/libs/asura-lib-core/graphics/shader.h
index 575a37e..1c81355 100644
--- a/source/libs/asura-lib-core/graphics/shader.h
+++ b/source/libs/asura-lib-core/graphics/shader.h
@@ -94,7 +94,7 @@ namespace AsuraEngine
 			/// 
 			GLuint mProgramHandle;
 
-		//------------------------------------------------------------------------------------------------------------
+		//------------------------------------------------------------------------------//
 
 		public:
 
diff --git a/source/libs/asura-lib-core/graphics/window.cpp b/source/libs/asura-lib-core/graphics/window.cpp
deleted file mode 100644
index 83a4f53..0000000
--- a/source/libs/asura-lib-core/graphics/window.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "Config.h"
-#include "Window.h"
-
-namespace AsuraEngine
-{
-	namespace Graphics
-	{
-
-		Window::Window(WindowStyle style)
-		{
-		}
-
-		Window::~Window()
-		{
-
-		}
-
-		void Window::SetPosition(int x, int y)
-		{
-			ASSERT(mWindowHandle);
-			SDL_SetWindowPosition(mWindowHandle, x, y);
-		}
-
-		void Window::SetTitle(const std::string& title)
-		{
-
-		}
-
-		void Window::Show()
-		{
-
-		}
-
-		void Window::Hide()
-		{
-
-		}
-
-		void Window::SetWindowStyle(WindowStyle style)
-		{
-
-		}
-
-		void Window::SwapRenderBuffer()
-		{
-
-		}
-
-	}
-}
diff --git a/source/libs/asura-lib-core/graphics/window.h b/source/libs/asura-lib-core/graphics/window.h
deleted file mode 100644
index 1b219a2..0000000
--- a/source/libs/asura-lib-core/graphics/window.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef __ASURA_ENGINE_WINDOW_H__
-#define __ASURA_ENGINE_WINDOW_H__
-
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/math/vector2.hpp>
-
-#include "render_state.h"
-#include "render_target.h"
-
-namespace AsuraEngine
-{
-	namespace Graphics
-	{
-
-		class WindowImpl;
-
-		enum WindowStyle
-		{
-			WINDOW_STYLE_FULLSCREEN = 1 << 1,
-		};
-
-		///
-		/// ��Ϸ�ĵ����ڣ�runnerֻ��Ҫһ�����ڡ���ͬ�Ŀͻ���ʵ�ִ˽ӿڲ��ֶ�ע�ᵽlua���༭�����ᵼ����࣬����޽ӵ��༭����
-		/// ���ⴰ���ϡ�
-		///
-		class Window 
-			: public RenderTarget
-			, public AEScripting::Portable<Window>
-		{
-		public:
-
-			LUAX_DECL_SINGLETON(Window);
-
-			Window(WindowStyle style);
-
-			~Window();
-
-			void SetSize(uint width, uint height); 
-
-			void SetPosition(int x, int y);
-
-			void SetTitle(const std::string& title);
-
-			void SetWindowStyle(WindowStyle style);
-
-			void Show();
-
-			void Hide();
-
-			///
-			/// ����ǿ���˫����Ĵ��ڣ���Ҫ������������չʾ��ǰ̨
-			///
-			void SwapRenderBuffer();
-
-			void Clear(const Color& col = Color::Black);
-
-			void Clear(const Math::Recti& quad, const Color& col = Color::Black);
-
-			void Draw(const Drawable* texture, const RenderState& state);
-
-			void Draw(const Drawable* texture, const Math::Recti& quad, const RenderState& state);
-
-		protected:
-
-			WindowImpl* mImpl;
-
-			LUAX_DECL_METHOD(_Show);
-			LUAX_DECL_METHOD(_Hide);
-			LUAX_DECL_METHOD(_SetResolution);
-			LUAX_DECL_METHOD(_SetFullScreen);
-			LUAX_DECL_METHOD(_SetTitle);
-			LUAX_DECL_METHOD(_SetWindowStyle);
-			LUAX_DECL_METHOD(_Clear);
-			LUAX_DECL_METHOD(_Draw);
-			LUAX_DECL_METHOD(_SwapRenderBuffer);
-
-		};
-
-		using RenderWindow = Window;
-
-		ASURA_ABSTRACT class WindowImpl
-		{
-		public:
-
-		};
-
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/source/libs/asura-lib-core/graphics/window_impl_glew.cpp b/source/libs/asura-lib-core/graphics/window_impl_glew.cpp
deleted file mode 100644
index e69de29..0000000
--- a/source/libs/asura-lib-core/graphics/window_impl_glew.cpp
+++ /dev/null
diff --git a/source/libs/asura-lib-core/graphics/window_impl_glew.h b/source/libs/asura-lib-core/graphics/window_impl_glew.h
deleted file mode 100644
index e69de29..0000000
--- a/source/libs/asura-lib-core/graphics/window_impl_glew.h
+++ /dev/null
diff --git a/source/libs/asura-lib-core/graphics/window_impl_glut.cpp b/source/libs/asura-lib-core/graphics/window_impl_glut.cpp
deleted file mode 100644
index e69de29..0000000
--- a/source/libs/asura-lib-core/graphics/window_impl_glut.cpp
+++ /dev/null
diff --git a/source/libs/asura-lib-core/graphics/window_impl_glut.h b/source/libs/asura-lib-core/graphics/window_impl_glut.h
deleted file mode 100644
index e69de29..0000000
--- a/source/libs/asura-lib-core/graphics/window_impl_glut.h
+++ /dev/null
diff --git a/source/libs/asura-lib-core/graphics/window_impl_sdl.cpp b/source/libs/asura-lib-core/graphics/window_impl_sdl.cpp
deleted file mode 100644
index e69de29..0000000
--- a/source/libs/asura-lib-core/graphics/window_impl_sdl.cpp
+++ /dev/null
diff --git a/source/libs/asura-lib-core/graphics/window_impl_sdl.h b/source/libs/asura-lib-core/graphics/window_impl_sdl.h
deleted file mode 100644
index e69de29..0000000
--- a/source/libs/asura-lib-core/graphics/window_impl_sdl.h
+++ /dev/null