diff options
Diffstat (limited to 'Data')
69 files changed, 86 insertions, 16 deletions
diff --git a/Data/Configs/Settings.json b/Data/Configs/Settings.json index e69de29..cb92a2e 100644 --- a/Data/Configs/Settings.json +++ b/Data/Configs/Settings.json @@ -0,0 +1,3 @@ +{
+
+}
\ No newline at end of file diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Math/Vector2.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Math/Vector2.lua index 5697797..822537f 100644 --- a/Data/DefaultContent/Libraries/GameLab/Engine/Math/Vector2.lua +++ b/Data/DefaultContent/Libraries/GameLab/Engine/Math/Vector2.lua @@ -1,5 +1,8 @@ local Vector2 = GameLab.Class("GameLab.Engine.Math.Vector2")
-
+Vector2.Ctor = function(self, x, y)
+ self.x = x or 0
+ self.y = y or 0
+end
return Vector2
\ No newline at end of file diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Math/Vector3.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Math/Vector3.lua index caa28a4..e383bf0 100644 --- a/Data/DefaultContent/Libraries/GameLab/Engine/Math/Vector3.lua +++ b/Data/DefaultContent/Libraries/GameLab/Engine/Math/Vector3.lua @@ -1,5 +1,9 @@ local Vector3 = GameLab.Class("GameLab.Engine.Math.Vector3")
-
+Vector3.Ctor = function(self, x, y, z)
+ self.x = x or 0
+ self.y = y or 0
+ self.z = z or 0
+end
return Vector3
\ No newline at end of file diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/Image.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/Image.lua new file mode 100644 index 0000000..b209425 --- /dev/null +++ b/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/Image.lua @@ -0,0 +1,20 @@ +-- Image在texture基础上增加了一些元数据
+local Image = GameLab.Class("GameLab.Engine.Rendering.Image")
+
+Image.Ctor = function(self, texture)
+ self.texture = texture -- "atlas"
+ self.rect = {0, 0, 1, 1} -- 这个image在texture中的位置
+ self.isSlicing = false
+ self.slicing = {0, 0, 0, 0}
+end
+
+Image.GetWidth = function(self)
+end
+
+Image.GetHeight = function(self)
+end
+
+Image.GetSize = function(self)
+end
+
+return Image
\ No newline at end of file diff --git a/Data/DefaultContent/Resources/Images/white.png b/Data/DefaultContent/Resources/Images/white.png Binary files differnew file mode 100644 index 0000000..ce5b789 --- /dev/null +++ b/Data/DefaultContent/Resources/Images/white.png diff --git a/Data/Libraries/GameLab/Editor/init.lua b/Data/Libraries/GameLab/Editor/init.lua index 99a8091..97b4b2e 100644 --- a/Data/Libraries/GameLab/Editor/init.lua +++ b/Data/Libraries/GameLab/Editor/init.lua @@ -1,2 +1,8 @@ +local m = GameLab.Editor or {}
+GameLab.Editor = m
+local import = GameLab.import(...)
+m.AssetManager = import("AssetManager")
+
+return m
\ No newline at end of file diff --git a/Data/DefaultContent/Libraries/lua-csv/.gitignore b/Data/Libraries/lua-csv/.gitignore index 131f9b6..131f9b6 100644 --- a/Data/DefaultContent/Libraries/lua-csv/.gitignore +++ b/Data/Libraries/lua-csv/.gitignore diff --git a/Data/DefaultContent/Libraries/lua-csv/AUTHORS b/Data/Libraries/lua-csv/AUTHORS index 84961bd..84961bd 100644 --- a/Data/DefaultContent/Libraries/lua-csv/AUTHORS +++ b/Data/Libraries/lua-csv/AUTHORS diff --git a/Data/DefaultContent/Libraries/lua-csv/LICENSE b/Data/Libraries/lua-csv/LICENSE index d8472a0..d8472a0 100644 --- a/Data/DefaultContent/Libraries/lua-csv/LICENSE +++ b/Data/Libraries/lua-csv/LICENSE diff --git a/Data/DefaultContent/Libraries/lua-csv/README.md b/Data/Libraries/lua-csv/README.md index d10314a..d10314a 100644 --- a/Data/DefaultContent/Libraries/lua-csv/README.md +++ b/Data/Libraries/lua-csv/README.md diff --git a/Data/DefaultContent/Libraries/lua-csv/lua/config.ld b/Data/Libraries/lua-csv/lua/config.ld index af51949..af51949 100644 --- a/Data/DefaultContent/Libraries/lua-csv/lua/config.ld +++ b/Data/Libraries/lua-csv/lua/config.ld diff --git a/Data/DefaultContent/Libraries/lua-csv/lua/csv.lua b/Data/Libraries/lua-csv/lua/csv.lua index 64196c0..64196c0 100644 --- a/Data/DefaultContent/Libraries/lua-csv/lua/csv.lua +++ b/Data/Libraries/lua-csv/lua/csv.lua diff --git a/Data/DefaultContent/Libraries/lua-csv/lua/test.lua b/Data/Libraries/lua-csv/lua/test.lua index f418cf6..f418cf6 100644 --- a/Data/DefaultContent/Libraries/lua-csv/lua/test.lua +++ b/Data/Libraries/lua-csv/lua/test.lua diff --git a/Data/DefaultContent/Libraries/lua-csv/makefile b/Data/Libraries/lua-csv/makefile index dfa7596..dfa7596 100644 --- a/Data/DefaultContent/Libraries/lua-csv/makefile +++ b/Data/Libraries/lua-csv/makefile diff --git a/Data/DefaultContent/Libraries/lua-csv/rockspecs/csv-1-1.rockspec b/Data/Libraries/lua-csv/rockspecs/csv-1-1.rockspec index 6f280aa..6f280aa 100644 --- a/Data/DefaultContent/Libraries/lua-csv/rockspecs/csv-1-1.rockspec +++ b/Data/Libraries/lua-csv/rockspecs/csv-1-1.rockspec diff --git a/Data/DefaultContent/Libraries/lua-csv/rockspecs/csv-scm-1.rockspec b/Data/Libraries/lua-csv/rockspecs/csv-scm-1.rockspec index 29629da..29629da 100644 --- a/Data/DefaultContent/Libraries/lua-csv/rockspecs/csv-scm-1.rockspec +++ b/Data/Libraries/lua-csv/rockspecs/csv-scm-1.rockspec diff --git a/Data/DefaultContent/Libraries/lua-csv/test-data/BOM.csv b/Data/Libraries/lua-csv/test-data/BOM.csv index 9787c0d..9787c0d 100644 --- a/Data/DefaultContent/Libraries/lua-csv/test-data/BOM.csv +++ b/Data/Libraries/lua-csv/test-data/BOM.csv diff --git a/Data/DefaultContent/Libraries/lua-csv/test-data/bars.txt b/Data/Libraries/lua-csv/test-data/bars.txt index 9decabc..9decabc 100644 --- a/Data/DefaultContent/Libraries/lua-csv/test-data/bars.txt +++ b/Data/Libraries/lua-csv/test-data/bars.txt diff --git a/Data/DefaultContent/Libraries/lua-csv/test-data/blank-line.csv b/Data/Libraries/lua-csv/test-data/blank-line.csv index 63fc515..63fc515 100644 --- a/Data/DefaultContent/Libraries/lua-csv/test-data/blank-line.csv +++ b/Data/Libraries/lua-csv/test-data/blank-line.csv diff --git a/Data/DefaultContent/Libraries/lua-csv/test-data/embedded-newlines.csv b/Data/Libraries/lua-csv/test-data/embedded-newlines.csv index 67987d1..67987d1 100644 --- a/Data/DefaultContent/Libraries/lua-csv/test-data/embedded-newlines.csv +++ b/Data/Libraries/lua-csv/test-data/embedded-newlines.csv diff --git a/Data/DefaultContent/Libraries/lua-csv/test-data/embedded-quotes.csv b/Data/Libraries/lua-csv/test-data/embedded-quotes.csv index e0c5c73..e0c5c73 100644 --- a/Data/DefaultContent/Libraries/lua-csv/test-data/embedded-quotes.csv +++ b/Data/Libraries/lua-csv/test-data/embedded-quotes.csv diff --git a/Data/DefaultContent/Libraries/lua-csv/test-data/header.csv b/Data/Libraries/lua-csv/test-data/header.csv index 89f702e..89f702e 100644 --- a/Data/DefaultContent/Libraries/lua-csv/test-data/header.csv +++ b/Data/Libraries/lua-csv/test-data/header.csv diff --git a/Data/Resources/Gizmos/Gizmos.xlsx b/Data/Resources/Gizmos/Gizmos.xlsx Binary files differdeleted file mode 100644 index cb921d4..0000000 --- a/Data/Resources/Gizmos/Gizmos.xlsx +++ /dev/null diff --git a/Data/Resources/Icons/buttons/add.png b/Data/Resources/Icons/buttons/add.png Binary files differnew file mode 100644 index 0000000..332a030 --- /dev/null +++ b/Data/Resources/Icons/buttons/add.png diff --git a/Data/Resources/Icons/buttons/alpha.png b/Data/Resources/Icons/buttons/alpha.png Binary files differnew file mode 100644 index 0000000..207c18b --- /dev/null +++ b/Data/Resources/Icons/buttons/alpha.png diff --git a/Data/Resources/Icons/buttons/checker.png b/Data/Resources/Icons/buttons/checker.png Binary files differnew file mode 100644 index 0000000..f6c3f0f --- /dev/null +++ b/Data/Resources/Icons/buttons/checker.png diff --git a/Data/Resources/Icons/buttons/cog.png b/Data/Resources/Icons/buttons/cog.png Binary files differnew file mode 100644 index 0000000..5cf1e16 --- /dev/null +++ b/Data/Resources/Icons/buttons/cog.png diff --git a/Data/Resources/Icons/buttons/del.png b/Data/Resources/Icons/buttons/del.png Binary files differnew file mode 100644 index 0000000..34a9b5a --- /dev/null +++ b/Data/Resources/Icons/buttons/del.png diff --git a/Data/Resources/Icons/buttons/del2.png b/Data/Resources/Icons/buttons/del2.png Binary files differnew file mode 100644 index 0000000..22cb0d3 --- /dev/null +++ b/Data/Resources/Icons/buttons/del2.png diff --git a/Data/Resources/Icons/buttons/del3.png b/Data/Resources/Icons/buttons/del3.png Binary files differnew file mode 100644 index 0000000..16d30d1 --- /dev/null +++ b/Data/Resources/Icons/buttons/del3.png diff --git a/Data/Resources/Icons/buttons/delete.png b/Data/Resources/Icons/buttons/delete.png Binary files differnew file mode 100644 index 0000000..31da2d8 --- /dev/null +++ b/Data/Resources/Icons/buttons/delete.png diff --git a/Data/Resources/Icons/buttons/disable.png b/Data/Resources/Icons/buttons/disable.png Binary files differnew file mode 100644 index 0000000..cfdc3da --- /dev/null +++ b/Data/Resources/Icons/buttons/disable.png diff --git a/Data/Resources/Icons/buttons/down.png b/Data/Resources/Icons/buttons/down.png Binary files differnew file mode 100644 index 0000000..3fe5bf0 --- /dev/null +++ b/Data/Resources/Icons/buttons/down.png diff --git a/Data/Resources/Icons/buttons/forward.png b/Data/Resources/Icons/buttons/forward.png Binary files differnew file mode 100644 index 0000000..ee986ea --- /dev/null +++ b/Data/Resources/Icons/buttons/forward.png diff --git a/Data/Resources/Icons/buttons/invisible.png b/Data/Resources/Icons/buttons/invisible.png Binary files differnew file mode 100644 index 0000000..a5a1f55 --- /dev/null +++ b/Data/Resources/Icons/buttons/invisible.png diff --git a/Data/Resources/Icons/buttons/lock.png b/Data/Resources/Icons/buttons/lock.png Binary files differnew file mode 100644 index 0000000..e5ae209 --- /dev/null +++ b/Data/Resources/Icons/buttons/lock.png diff --git a/Data/Resources/Icons/buttons/open.png b/Data/Resources/Icons/buttons/open.png Binary files differnew file mode 100644 index 0000000..178b46b --- /dev/null +++ b/Data/Resources/Icons/buttons/open.png diff --git a/Data/Resources/Icons/buttons/pause.png b/Data/Resources/Icons/buttons/pause.png Binary files differnew file mode 100644 index 0000000..380f5a1 --- /dev/null +++ b/Data/Resources/Icons/buttons/pause.png diff --git a/Data/Resources/Icons/buttons/pen.png b/Data/Resources/Icons/buttons/pen.png Binary files differnew file mode 100644 index 0000000..3707dd5 --- /dev/null +++ b/Data/Resources/Icons/buttons/pen.png diff --git a/Data/Resources/Icons/buttons/play.png b/Data/Resources/Icons/buttons/play.png Binary files differnew file mode 100644 index 0000000..bcf2bae --- /dev/null +++ b/Data/Resources/Icons/buttons/play.png diff --git a/Data/Resources/Icons/buttons/play2.png b/Data/Resources/Icons/buttons/play2.png Binary files differnew file mode 100644 index 0000000..fadfed2 --- /dev/null +++ b/Data/Resources/Icons/buttons/play2.png diff --git a/Data/Resources/Icons/buttons/pop_disabled.png b/Data/Resources/Icons/buttons/pop_disabled.png Binary files differnew file mode 100644 index 0000000..72b38d5 --- /dev/null +++ b/Data/Resources/Icons/buttons/pop_disabled.png diff --git a/Data/Resources/Icons/buttons/pop_hover.png b/Data/Resources/Icons/buttons/pop_hover.png Binary files differnew file mode 100644 index 0000000..b9518e8 --- /dev/null +++ b/Data/Resources/Icons/buttons/pop_hover.png diff --git a/Data/Resources/Icons/buttons/pop_normal.png b/Data/Resources/Icons/buttons/pop_normal.png Binary files differnew file mode 100644 index 0000000..63ef8d0 --- /dev/null +++ b/Data/Resources/Icons/buttons/pop_normal.png diff --git a/Data/Resources/Icons/buttons/pop_selected.png b/Data/Resources/Icons/buttons/pop_selected.png Binary files differnew file mode 100644 index 0000000..a26b9b3 --- /dev/null +++ b/Data/Resources/Icons/buttons/pop_selected.png diff --git a/Data/Resources/Icons/buttons/prefab_apply.png b/Data/Resources/Icons/buttons/prefab_apply.png Binary files differnew file mode 100644 index 0000000..0b35e92 --- /dev/null +++ b/Data/Resources/Icons/buttons/prefab_apply.png diff --git a/Data/Resources/Icons/buttons/prefab_revert.png b/Data/Resources/Icons/buttons/prefab_revert.png Binary files differnew file mode 100644 index 0000000..bc47649 --- /dev/null +++ b/Data/Resources/Icons/buttons/prefab_revert.png diff --git a/Data/Resources/Icons/buttons/rgb.png b/Data/Resources/Icons/buttons/rgb.png Binary files differnew file mode 100644 index 0000000..710a6cf --- /dev/null +++ b/Data/Resources/Icons/buttons/rgb.png diff --git a/Data/Resources/Icons/buttons/search.png b/Data/Resources/Icons/buttons/search.png Binary files differnew file mode 100644 index 0000000..843fc7a --- /dev/null +++ b/Data/Resources/Icons/buttons/search.png diff --git a/Data/Resources/Icons/buttons/smalladd.png b/Data/Resources/Icons/buttons/smalladd.png Binary files differnew file mode 100644 index 0000000..bb3b03a --- /dev/null +++ b/Data/Resources/Icons/buttons/smalladd.png diff --git a/Data/Resources/Icons/buttons/smalldel.png b/Data/Resources/Icons/buttons/smalldel.png Binary files differnew file mode 100644 index 0000000..aafffd4 --- /dev/null +++ b/Data/Resources/Icons/buttons/smalldel.png diff --git a/Data/Resources/Icons/buttons/smalldisable.png b/Data/Resources/Icons/buttons/smalldisable.png Binary files differnew file mode 100644 index 0000000..b1d5999 --- /dev/null +++ b/Data/Resources/Icons/buttons/smalldisable.png diff --git a/Data/Resources/Icons/buttons/smalldisableempty.png b/Data/Resources/Icons/buttons/smalldisableempty.png Binary files differnew file mode 100644 index 0000000..ce5068f --- /dev/null +++ b/Data/Resources/Icons/buttons/smalldisableempty.png diff --git a/Data/Resources/Icons/buttons/smalllock.png b/Data/Resources/Icons/buttons/smalllock.png Binary files differnew file mode 100644 index 0000000..9716287 --- /dev/null +++ b/Data/Resources/Icons/buttons/smalllock.png diff --git a/Data/Resources/Icons/buttons/star.png b/Data/Resources/Icons/buttons/star.png Binary files differnew file mode 100644 index 0000000..c8b11f5 --- /dev/null +++ b/Data/Resources/Icons/buttons/star.png diff --git a/Data/Resources/Icons/buttons/stopplay.png b/Data/Resources/Icons/buttons/stopplay.png Binary files differnew file mode 100644 index 0000000..bfe1897 --- /dev/null +++ b/Data/Resources/Icons/buttons/stopplay.png diff --git a/Data/Resources/Icons/buttons/up.png b/Data/Resources/Icons/buttons/up.png Binary files differnew file mode 100644 index 0000000..75713f0 --- /dev/null +++ b/Data/Resources/Icons/buttons/up.png diff --git a/Data/Resources/Images/UI.csv b/Data/Resources/Images/UI.csv deleted file mode 100644 index e9c9eea..0000000 --- a/Data/Resources/Images/UI.csv +++ /dev/null @@ -1,2 +0,0 @@ -filePath type slice left right top bottom -asdasd diff --git a/Data/Resources/Images/UI.xlsx b/Data/Resources/Images/UI.xlsx Binary files differdeleted file mode 100644 index 15e2235..0000000 --- a/Data/Resources/Images/UI.xlsx +++ /dev/null diff --git a/Data/Resources/Images/brickwall.jpg b/Data/Resources/Images/brickwall.jpg Binary files differnew file mode 100644 index 0000000..39478d3 --- /dev/null +++ b/Data/Resources/Images/brickwall.jpg diff --git a/Data/Resources/Metatable/Excel/Extract_All.cmd b/Data/Resources/Metatable/Excel/Extract_All.cmd index f6dd7d2..8cd629f 100644 --- a/Data/Resources/Metatable/Excel/Extract_All.cmd +++ b/Data/Resources/Metatable/Excel/Extract_All.cmd @@ -1,2 +1,3 @@ ./Extract_Gizmos.cmd
-./Extract_Icons.cmd
\ No newline at end of file +./Extract_Icons.cmd
+./Extract_Shaders.cmd
\ No newline at end of file diff --git a/Data/Resources/Metatable/Excel/Extract_Shaders.cmd b/Data/Resources/Metatable/Excel/Extract_Shaders.cmd new file mode 100644 index 0000000..312000b --- /dev/null +++ b/Data/Resources/Metatable/Excel/Extract_Shaders.cmd @@ -0,0 +1 @@ +"../../../../Tools/XlsxToCsv/xlsxToCsv.exe" Shaders.xlsx ../Shaders.csv
\ No newline at end of file diff --git a/Data/Resources/Metatable/Excel/Icons.xlsx b/Data/Resources/Metatable/Excel/Icons.xlsx Binary files differindex 501ae81..bc359e5 100644 --- a/Data/Resources/Metatable/Excel/Icons.xlsx +++ b/Data/Resources/Metatable/Excel/Icons.xlsx diff --git a/Data/Resources/Metatable/Excel/Shaders.xlsx b/Data/Resources/Metatable/Excel/Shaders.xlsx Binary files differnew file mode 100644 index 0000000..3dcafa2 --- /dev/null +++ b/Data/Resources/Metatable/Excel/Shaders.xlsx diff --git a/Data/Resources/Metatable/Icons.csv b/Data/Resources/Metatable/Icons.csv index 04cb8d7..0b7221a 100644 --- a/Data/Resources/Metatable/Icons.csv +++ b/Data/Resources/Metatable/Icons.csv @@ -1,8 +1,7 @@ -Path,Type,Left,Right,Top,Bottom, -UI.png,1,12,12,13,13, -UI.png,1,12,12,13,13, -UI.png,1,12,12,13,13, -UI.png,1,12,12,13,13, -UI.png,1,12,12,13,13, -UI.png,1,12,12,13,13, -UI.png,1,12,12,13,13, +Name,Category,Path,Filter,Wrap,Slicing,Left,Right,Top,Bottom, +btn_add,Button,buttons/add.png,,,,,,,, +btn_alpha,Button,buttons/alpha.png,,,,,,,, +btn_checker,Button,buttons/checker.png,,,,,,,, +,,,,,,,,,, +,,,,,,,,,, +,,,,,,,,,, diff --git a/Data/Resources/Metatable/Shaders.csv b/Data/Resources/Metatable/Shaders.csv new file mode 100644 index 0000000..c0d2337 --- /dev/null +++ b/Data/Resources/Metatable/Shaders.csv @@ -0,0 +1,2 @@ +name,path, +UI,UI.glsl, diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua index d9f8b1f..8b54e41 100644 --- a/Data/Scripts/EditorApplication.lua +++ b/Data/Scripts/EditorApplication.lua @@ -63,6 +63,12 @@ GameLab.IO.ReadFilesAsync(files, function() Debug.Log("finished") end) +local imgData = Rendering.LoadImage("./Resources/Images/brickwall.jpg") +Debug.Log(tostring(imgData:GetWidth())) +Debug.Log(tostring(imgData:GetHeight())) + +local tex = Rendering.Texture.New(imgData, false) + while true do app:OnStep() diff --git a/Data/Scripts/EditorGUI/EditorImages.lua b/Data/Scripts/EditorGUI/EditorImages.lua index e98d064..3945edc 100644 --- a/Data/Scripts/EditorGUI/EditorImages.lua +++ b/Data/Scripts/EditorGUI/EditorImages.lua @@ -1,2 +1,25 @@ --- 编辑器图片资源 +-- 编辑器图片资源管理 +local EditorImages = {} +EditorImages.icons = {} --[name] = image, +EditorImages.gizmos = {} + +EditorImages.isImagesReady = false + +EditorImages.GetIcon = function(name) + +end + +EditorImages.GetGizmos = function(name) + +end + +local icons_metatable = "./Resources/Metatable/Icons.csv" +local gizmos_metatable = "./Resources/Metatable/Gizmos.csv" + +-- 读取所有的编辑器图片资源 +EditorImages.LoadAllImages = function() + +end + +return EditorImages
\ No newline at end of file diff --git a/Data/boot.lua b/Data/boot.lua index 6f49da7..7e7cfdc 100644 --- a/Data/boot.lua +++ b/Data/boot.lua @@ -13,7 +13,8 @@ local editorCLibs = "./Libraries/?.dll" .. "./Plugins/?.dll" package.cpath=package.cpath .. ";" .. engineCLibs .. ";" .. editorCLibs
-- debugging
-require("LuaPanda").start("127.0.0.1",8818)
+-- 在这里会报一个异常， 不知道为什么
+--require("LuaPanda").start("127.0.0.1",8818)
-- redirect
if GAMELAB_DEBUG then
@@ -29,5 +30,8 @@ require "GameLab.Engine.GL" require "GameLab.Editor"
require "GameLab.Editor.GUI"
+-- debugging
+require("LuaPanda").start("127.0.0.1",8818)
+
-- launch editor
-dofile("./Scripts/EditorApplication.lua")
\ No newline at end of file +dofile("./Scripts/EditorApplication.lua")
|
