From fb830270c5269a22819a0c0f1ee280f9aa3f1b39 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sun, 17 Mar 2019 09:12:29 +0800
Subject: *luax

---
 Source/3rdParty/Luax/luax_memberref.h              |  1 +
 Source/Asura.Editor/Source/Widgets/Button.h        |  4 +-
 Source/Asura.Editor/source/widgets/button.h        |  4 +-
 Source/Asura.Engine/Graphics/Shader.h              |  2 +-
 .../graphics/binding/mesh2d_data.binding.cpp       |  9 +++++
 .../graphics/binding/shader.binding.cpp            | 44 +++++++++++-----------
 Source/Asura.Engine/graphics/mesh2d_data.cpp       |  0
 Source/Asura.Engine/graphics/mesh2d_data.h         |  0
 Source/Asura.Engine/graphics/shader.h              |  2 +-
 Source/Asura.Engine/graphics/stb_decoder.h         |  3 +-
 Source/Asura.Engine/scripting/portable.hpp         | 11 ++++--
 Source/Asura.Engine/scripting/portable.inl         |  3 +-
 12 files changed, 51 insertions(+), 32 deletions(-)
 create mode 100644 Source/Asura.Engine/graphics/mesh2d_data.cpp
 create mode 100644 Source/Asura.Engine/graphics/mesh2d_data.h

(limited to 'Source')

diff --git a/Source/3rdParty/Luax/luax_memberref.h b/Source/3rdParty/Luax/luax_memberref.h
index bb373ab..cda7946 100644
--- a/Source/3rdParty/Luax/luax_memberref.h
+++ b/Source/3rdParty/Luax/luax_memberref.h
@@ -8,6 +8,7 @@ namespace Luax
 
 	///
 	/// 实例的ref table保存的member ref。由luax class做具体的管理。实例的ref table是强引用，用来管理里面member的生命周期。
+	/// 用来在lua和native之间进行数据沟通。
 	///
 	class LuaxMemberRef
 	{
diff --git a/Source/Asura.Editor/Source/Widgets/Button.h b/Source/Asura.Editor/Source/Widgets/Button.h
index b8c2f56..00f1c99 100644
--- a/Source/Asura.Editor/Source/Widgets/Button.h
+++ b/Source/Asura.Editor/Source/Widgets/Button.h
@@ -9,7 +9,9 @@
 namespace AsuraEditor
 {
 
-	class Button : public Widget
+	class Button 
+		: public Widget
+		, public AEScripting::Portable<Button>
 	{
 
 	public: 
diff --git a/Source/Asura.Editor/source/widgets/button.h b/Source/Asura.Editor/source/widgets/button.h
index b8c2f56..00f1c99 100644
--- a/Source/Asura.Editor/source/widgets/button.h
+++ b/Source/Asura.Editor/source/widgets/button.h
@@ -9,7 +9,9 @@
 namespace AsuraEditor
 {
 
-	class Button : public Widget
+	class Button 
+		: public Widget
+		, public AEScripting::Portable<Button>
 	{
 
 	public: 
diff --git a/Source/Asura.Engine/Graphics/Shader.h b/Source/Asura.Engine/Graphics/Shader.h
index 4976106..65f214e 100644
--- a/Source/Asura.Engine/Graphics/Shader.h
+++ b/Source/Asura.Engine/Graphics/Shader.h
@@ -11,7 +11,7 @@
 #include "Math/Vector4.h"
 #include "Math/Matrix44.h"
 #include "StringMap.hpp"
-#include "scripting/portable.h"
+#include "scripting/portable.hpp"
 #include "Color.h"
 #include "Manager.hpp"
 #include "Texture.h"
diff --git a/Source/Asura.Engine/graphics/binding/mesh2d_data.binding.cpp b/Source/Asura.Engine/graphics/binding/mesh2d_data.binding.cpp
index e69de29..6e15052 100644
--- a/Source/Asura.Engine/graphics/binding/mesh2d_data.binding.cpp
+++ b/Source/Asura.Engine/graphics/binding/mesh2d_data.binding.cpp
@@ -0,0 +1,9 @@
+namespace AsuraEngine
+{
+	namespace Graphics
+	{
+
+
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Asura.Engine/graphics/binding/shader.binding.cpp b/Source/Asura.Engine/graphics/binding/shader.binding.cpp
index 3f24bb7..1190997 100644
--- a/Source/Asura.Engine/graphics/binding/shader.binding.cpp
+++ b/Source/Asura.Engine/graphics/binding/shader.binding.cpp
@@ -1,4 +1,4 @@
-#include "../Shader.h"
+#include "../shader.h"
 
 using namespace Luax;
 
@@ -7,6 +7,27 @@ namespace AsuraEngine
 	namespace Graphics
 	{
 
+		void Shader::RegisterLuaxInterface(LuaxState& state)
+		{
+
+		}
+
+		void Shader::RegisterLuaxClass(LuaxState& state)
+		{
+
+			LuaxEnum EBuiltIn[] = {
+				{0, 0}
+			};
+
+			state.RegisterEnum("EBuiltIn", EBuiltIn);
+
+		}
+
+		void Shader::RegisterLuaxPostprocess(LuaxState& state)
+		{
+
+		}
+
 		///
 		/// 将此shader设置为活动。
 		///
@@ -94,26 +115,5 @@ namespace AsuraEngine
 
 		}
 
-		void Shader::RegisterLuaxInterface(LuaxState& state)
-		{
-
-		}
-
-		void Shader::RegisterLuaxClass(LuaxState& state)
-		{
-
-			LuaxEnum EBuiltIn[] = {
-				{0, 0}
-			};
-
-			state.RegisterEnum("EBuiltIn", EBuiltIn);
-
-		}
-
-		void Shader::RegisterLuaxPostprocess(LuaxState& state)
-		{
-
-		}
-
 	}
 }
\ No newline at end of file
diff --git a/Source/Asura.Engine/graphics/mesh2d_data.cpp b/Source/Asura.Engine/graphics/mesh2d_data.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/Source/Asura.Engine/graphics/mesh2d_data.h b/Source/Asura.Engine/graphics/mesh2d_data.h
new file mode 100644
index 0000000..e69de29
diff --git a/Source/Asura.Engine/graphics/shader.h b/Source/Asura.Engine/graphics/shader.h
index 4976106..65f214e 100644
--- a/Source/Asura.Engine/graphics/shader.h
+++ b/Source/Asura.Engine/graphics/shader.h
@@ -11,7 +11,7 @@
 #include "Math/Vector4.h"
 #include "Math/Matrix44.h"
 #include "StringMap.hpp"
-#include "scripting/portable.h"
+#include "scripting/portable.hpp"
 #include "Color.h"
 #include "Manager.hpp"
 #include "Texture.h"
diff --git a/Source/Asura.Engine/graphics/stb_decoder.h b/Source/Asura.Engine/graphics/stb_decoder.h
index b8fb83c..57b247c 100644
--- a/Source/Asura.Engine/graphics/stb_decoder.h
+++ b/Source/Asura.Engine/graphics/stb_decoder.h
@@ -11,7 +11,8 @@ namespace AsuraEngine
 		///
 		/// 使用stb_image解压JPEG、TGA、BMP文件
 		///
-		class STBDecoder ASURA_FINAL: public ImageDecoder
+		class STBDecoder ASURA_FINAL
+			: public ImageDecoder
 		{
 		public:
 
diff --git a/Source/Asura.Engine/scripting/portable.hpp b/Source/Asura.Engine/scripting/portable.hpp
index 773e7ad..450f4bb 100644
--- a/Source/Asura.Engine/scripting/portable.hpp
+++ b/Source/Asura.Engine/scripting/portable.hpp
@@ -17,12 +17,15 @@ namespace AsuraEngine
 
 			Portable();
 			virtual ~Portable();
-
+/*
+			///
+			/// 在多个线程间
+			///
 			void Retain();
 			void Release();
-
+*/
 		private:
-
+/*
 			///
 			/// 多线程保护，lua调用gc后，如果在其他线程用了此native object，不会调用delete。
 			///
@@ -32,7 +35,7 @@ namespace AsuraEngine
 			/// delete保险，继承portable的类，无法使用delete，只能使用Release。
 			///
 			bool mSafer;
-
+*/
 		};
 
 #include "portable.inl"
diff --git a/Source/Asura.Engine/scripting/portable.inl b/Source/Asura.Engine/scripting/portable.inl
index a27b2e8..f73046a 100644
--- a/Source/Asura.Engine/scripting/portable.inl
+++ b/Source/Asura.Engine/scripting/portable.inl
@@ -1,4 +1,4 @@
-
+/*
 template<typename T>
 Portable<T>::Portable()
 	: mRefCount(1)
@@ -28,3 +28,4 @@ void Portable<T>::Release()
 	}
 }
 
+*/
\ No newline at end of file
-- 
cgit v1.1-26-g67d0