From c270d033fa04873ee7a8925dbb00cae5edc4555c Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 30 Mar 2019 11:59:35 +0800
Subject: *misc

---
 source/modules/asura-utils/scripting/lua_env.h    | 72 -----------------------
 source/modules/asura-utils/scripting/portable.hpp |  8 ++-
 2 files changed, 6 insertions(+), 74 deletions(-)
 delete mode 100644 source/modules/asura-utils/scripting/lua_env.h

(limited to 'source/modules/asura-utils/scripting')

diff --git a/source/modules/asura-utils/scripting/lua_env.h b/source/modules/asura-utils/scripting/lua_env.h
deleted file mode 100644
index e2fc4fc..0000000
--- a/source/modules/asura-utils/scripting/lua_env.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef __ASURA_LUA_ENV_H__
-#define __ASURA_LUA_ENV_H__
-
-extern "C"
-{
-#include <Lua51/lua.h>
-#include <Lua51/lauxlib.h>
-}
-#include <Luax/luax.h>
-
-#include "../singleton.hpp"
-
-namespace AsuraEngine
-{
-	namespace Scripting
-	{
-
-		///
-		/// 程序通过这个接口访问主lua state。Asura程序的思想是，进程主线程维护一个lua虚拟机，应用
-		/// 的主要逻辑跑在此虚拟机的主lua线程里（或者叫主栈里）。
-		///
-		class LuaEnv ASURA_FINAL : public Singleton<LuaEnv>
-		{
-		public:
-
-			LuaEnv() : mVM(0) {};
-			~LuaEnv() {};
-
-			///
-			/// 设置主虚拟机的主执行栈。
-			///
-			inline void Init() 
-			{ 
-				ASSERT(!mVM);
-				mVM = new Luax::LuaxVM();
-				ASSERT(mVM);
-				mVM->Setup();
-			};
-
-			inline lua_State* GetMainThread()
-			{ 
-				return mVM->GetMainThread(); 
-			};
-
-			inline void Exit()
-			{
-				delete mVM;
-				mVM = nullptr;
-			}
-
-		private:
-
-			///
-			/// 主线程保存一个主lua虚拟机。一个Asura程序永远只有一个主虚拟机，大部分代码都在这个虚
-			/// 拟机中运行，且只能设置一次。主线程\主执行栈对应的是global_State里面的：
-			///
-			///	    struct lua_State *mainthread;
-			///
-			/// 使用lua_newstate()，会创建一个虚拟机，包含一个global_State结构，并创建一个这个虚
-			/// 拟机的主线程lua_State并返回。global_State由这个虚拟机的所有线程共享，除了第一个主
-			/// 线程由lua_newstate()创建外，其余线程由lua_newthread()创建。
-			///
-			Luax::LuaxVM* mVM;
-
-		};
-
-	}
-}
-
-namespace AEScripting = AsuraEngine::Scripting;
-
-#endif
\ No newline at end of file
diff --git a/source/modules/asura-utils/scripting/portable.hpp b/source/modules/asura-utils/scripting/portable.hpp
index 5badf8d..ffed49e 100644
--- a/source/modules/asura-utils/scripting/portable.hpp
+++ b/source/modules/asura-utils/scripting/portable.hpp
@@ -1,10 +1,14 @@
 #ifndef __ASURA_ENGINE_PORTABLE_H__
 #define __ASURA_ENGINE_PORTABLE_H__
 
+extern "C" {
+#include <lua51/lua.h>
+#include <lua51/lualib.h>
+#include <lua51/lauxlib.h>
+}
+#include <luax/luax.h>
 #include "../type.h"
 
-#include "lua_env.h"
-
 namespace AsuraEngine
 {
 	namespace Scripting
-- 
cgit v1.1-26-g67d0