diff options
Diffstat (limited to 'Resources')
25 files changed, 32 insertions, 7 deletions
diff --git a/Resources/DefaultContent/Libraries/Framework/Class.lua b/Resources/DefaultContent/Libraries/Framework/Class.lua deleted file mode 100644 index 78c577c..0000000 --- a/Resources/DefaultContent/Libraries/Framework/Class.lua +++ /dev/null @@ -1,3 +0,0 @@ -function Class() - -end
\ No newline at end of file diff --git a/Resources/DefaultContent/Libraries/Framework/Math/Quaternion.lua b/Resources/DefaultContent/Libraries/Framework/Math/Quaternion.lua deleted file mode 100644 index e69de29..0000000 --- a/Resources/DefaultContent/Libraries/Framework/Math/Quaternion.lua +++ /dev/null diff --git a/Resources/DefaultContent/Libraries/Framework/init.lua b/Resources/DefaultContent/Libraries/Framework/init.lua deleted file mode 100644 index 8b96176..0000000 --- a/Resources/DefaultContent/Libraries/Framework/init.lua +++ /dev/null @@ -1,2 +0,0 @@ ---Jin游戏框架 ---可选，用户可以自行决定是否使用此框架 diff --git a/Resources/DefaultContent/Libraries/GameLab/Class.lua b/Resources/DefaultContent/Libraries/GameLab/Class.lua new file mode 100644 index 0000000..346d807 --- /dev/null +++ b/Resources/DefaultContent/Libraries/GameLab/Class.lua @@ -0,0 +1,5 @@ +-- GameLab Class
+local Class = {}
+GameLab.Class = Class
+
+
diff --git a/Resources/DefaultContent/Libraries/Framework/Animation/Animation.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Animation/Animation.lua index e69de29..e69de29 100644 --- a/Resources/DefaultContent/Libraries/Framework/Animation/Animation.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Animation/Animation.lua diff --git a/Resources/DefaultContent/Libraries/Framework/Core/Camera.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Core/Camera.lua index 5fcfbe7..5fcfbe7 100644 --- a/Resources/DefaultContent/Libraries/Framework/Core/Camera.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Core/Camera.lua diff --git a/Resources/DefaultContent/Libraries/Framework/Core/Component.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Core/Component.lua index 00bf2ca..00bf2ca 100644 --- a/Resources/DefaultContent/Libraries/Framework/Core/Component.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Core/Component.lua diff --git a/Resources/DefaultContent/Libraries/Framework/Core/Game.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Core/Game.lua index 51ce25f..51ce25f 100644 --- a/Resources/DefaultContent/Libraries/Framework/Core/Game.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Core/Game.lua diff --git a/Resources/DefaultContent/Libraries/Framework/Core/GameObject.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Core/GameObject.lua index ee0d143..ee0d143 100644 --- a/Resources/DefaultContent/Libraries/Framework/Core/GameObject.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Core/GameObject.lua diff --git a/Resources/DefaultContent/Libraries/Framework/Core/Sprite.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Core/Sprite.lua index 47cb50d..47cb50d 100644 --- a/Resources/DefaultContent/Libraries/Framework/Core/Sprite.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Core/Sprite.lua diff --git a/Resources/DefaultContent/Scripts/Math/Euler.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Euler.lua index e69de29..e69de29 100644 --- a/Resources/DefaultContent/Scripts/Math/Euler.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Euler.lua diff --git a/Resources/DefaultContent/Libraries/Framework/Math/Matrix44.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Matrix44.lua index b572f74..b572f74 100644 --- a/Resources/DefaultContent/Libraries/Framework/Math/Matrix44.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Matrix44.lua diff --git a/Resources/DefaultContent/Scripts/Math/Matrix4x4.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Matrix4x4.lua index e69de29..e69de29 100644 --- a/Resources/DefaultContent/Scripts/Math/Matrix4x4.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Matrix4x4.lua diff --git a/Resources/DefaultContent/Scripts/Math/Quaternion.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Quaternion.lua index 4c71f52..4c71f52 100644 --- a/Resources/DefaultContent/Scripts/Math/Quaternion.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Quaternion.lua diff --git a/Resources/DefaultContent/Libraries/Framework/Math/Vector2.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Vector2.lua index e69de29..e69de29 100644 --- a/Resources/DefaultContent/Libraries/Framework/Math/Vector2.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Vector2.lua diff --git a/Resources/DefaultContent/Libraries/Framework/Math/Vector3.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Vector3.lua index e69de29..e69de29 100644 --- a/Resources/DefaultContent/Libraries/Framework/Math/Vector3.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Vector3.lua diff --git a/Resources/DefaultContent/Libraries/Framework/Math/Vector4.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Vector4.lua index e69de29..e69de29 100644 --- a/Resources/DefaultContent/Libraries/Framework/Math/Vector4.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/Vector4.lua diff --git a/Resources/DefaultContent/Libraries/GameLab/Engine/Math/init.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/init.lua new file mode 100644 index 0000000..ef33c08 --- /dev/null +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Math/init.lua @@ -0,0 +1,4 @@ +GameLab = GameLab or {}
+GameLab.Math = GameLab.Math or {}
+
+
diff --git a/Resources/DefaultContent/Libraries/Framework/Utils/EventCenter.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Utils/EventCenter.lua index 664ecba..664ecba 100644 --- a/Resources/DefaultContent/Libraries/Framework/Utils/EventCenter.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Utils/EventCenter.lua diff --git a/Resources/DefaultContent/Libraries/Framework/Utils/StateMachine.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Utils/StateMachine.lua index e69de29..e69de29 100644 --- a/Resources/DefaultContent/Libraries/Framework/Utils/StateMachine.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Utils/StateMachine.lua diff --git a/Resources/DefaultContent/Libraries/Framework/Utils/Util.lua b/Resources/DefaultContent/Libraries/GameLab/Engine/Utils/Util.lua index e69de29..e69de29 100644 --- a/Resources/DefaultContent/Libraries/Framework/Utils/Util.lua +++ b/Resources/DefaultContent/Libraries/GameLab/Engine/Utils/Util.lua diff --git a/Resources/DefaultContent/Scripts/Math/Vector2.lua b/Resources/DefaultContent/Scripts/Math/Vector2.lua deleted file mode 100644 index e69de29..0000000 --- a/Resources/DefaultContent/Scripts/Math/Vector2.lua +++ /dev/null diff --git a/Resources/DefaultContent/Scripts/Math/Vector3.lua b/Resources/DefaultContent/Scripts/Math/Vector3.lua deleted file mode 100644 index e69de29..0000000 --- a/Resources/DefaultContent/Scripts/Math/Vector3.lua +++ /dev/null diff --git a/Resources/Scripts/EditorApplication.lua b/Resources/Scripts/EditorApplication.lua index d7beb3c..a01778d 100644 --- a/Resources/Scripts/EditorApplication.lua +++ b/Resources/Scripts/EditorApplication.lua @@ -1,4 +1,5 @@ -require("LuaPanda").start("127.0.0.1",8818); + +require "GameLab.Engine.Math" local Debug = GameLab.Debug local GUI = GameLab.Editor.GUI @@ -19,7 +20,9 @@ local guiWindow = GUI.GUIWindow.New() guiWindow:SetContainnerWindow(mainWindow) guiWindow:SetPosition({0,0, 500, 400}) -Debug.Log(package.cpath) + +Debug.Log(GameLab.Path.GetRootDirectory()) + while true do diff --git a/Resources/boot.lua b/Resources/boot.lua new file mode 100644 index 0000000..66cc78f --- /dev/null +++ b/Resources/boot.lua @@ -0,0 +1,18 @@ +
+-- 妯″潡鎼滅储鐩綍
+local engineLuaLibs = "./DefaultContent/Libraries/?.lua" .. ";./DefaultContent/Libraries/?/init.lua"
+local editorLuaLibs = "./Libraries/?.lua" .. ";./Libraries/?/init.lua"
+local editorScripts = "./Scripts/?.lua"
+package.path=package.path .. ";" .. editorScripts .. ";" .. engineLuaLibs .. ";" .. editorLuaLibs
+
+local engineCLibs = "./DefaultContent/Libraries/?.dll"
+local editorCLibs = "./Libraries/?.dll"
+package.cpath=package.cpath .. ";" .. engineCLibs .. ";" .. editorCLibs
+
+
+-- redirect
+print = GameLab.Debug.Log
+
+
+
+require("LuaPanda").start("127.0.0.1",8818);
|