From 138d3f4d3d6e2aaf5ba34f89af15ef85ea074357 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 8 Nov 2021 09:23:38 +0800
Subject: *misc

---
 Data/Scripts/Editor/AssetBrowser.lua |  2 +-
 Data/Scripts/EditorApplication.lua   | 47 +++++-------------------------------
 Data/Scripts/macro.lua               |  3 +++
 Data/Scripts/settings.lua            |  9 +++++++
 4 files changed, 19 insertions(+), 42 deletions(-)
 create mode 100644 Data/Scripts/macro.lua
 create mode 100644 Data/Scripts/settings.lua

(limited to 'Data/Scripts')

diff --git a/Data/Scripts/Editor/AssetBrowser.lua b/Data/Scripts/Editor/AssetBrowser.lua
index 42f4d71..37e9358 100644
--- a/Data/Scripts/Editor/AssetBrowser.lua
+++ b/Data/Scripts/Editor/AssetBrowser.lua
@@ -39,7 +39,7 @@ AssetBrowser.OnGUI = function(self)
 	Engine.Rendering.SetVector2("gamelab_ui_position", {0, 0})
 	--Engine.Rendering.SetTexture("gamelab_main_tex", tex)
 	--Engine.Rendering.DrawUIQuad({0, 0, 200, 200})
-	Editor.GUI.Text(_G["default_font"], "你好世界！\nHello,World!\nProject Window Properties", 12)	
+	Editor.GUI.Text(_G["default_font"], "你好世界！\nMaterials\nHello,World!\nProject Window Properties", 12)	
 	
 	-- Engine.Rendering.SetVector2("gamelab_ui_position", {0, 100})
 	-- Editor.GUI.Text(_G["default_font"], "你好世界！\nHello,World!\nProject Window Properties", 12)	
diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua
index 0576994..4c91f72 100644
--- a/Data/Scripts/EditorApplication.lua
+++ b/Data/Scripts/EditorApplication.lua
@@ -21,16 +21,20 @@ local mainWindow = GUI.ContainerWindow.New({400, 400, 800, 500}, GUI.EShowMode.M
 mainWindow:SetTitle("GameLab")
 mainWindow:SetIcon("./Data/Icon/GameLab.ico")
 
-app:SetMainWindow(mainWindow)
+app:SetMainWindow(mainWindow:GetInternal())
 
 local guiWindow = GUI.GUIWindow.New() 
 guiWindow:SetContainerWindow(mainWindow)
 guiWindow:SetPosition({0,0, 400, 400})
 
+
+local guiWindow2 = GUI.GUIWindow.New() 
+guiWindow2:SetContainerWindow(mainWindow)
+guiWindow2:SetPosition({500,0, 400, 400})
+
 collectgarbage()
 
 local wnd = AssetBrowser.New() 
-guiWindow:SetInstance(wnd)
 
 local v = GameLab.Engine.Math.Vector4.New(1,2,3,4)
 
@@ -57,45 +61,6 @@ local tex = Engine.Resource.LoadTexture("./Resources/Images/brickwall.jpg")
 
 local request = Engine.Resource.LoadImageDataAsync("./Resources/Images/brickwall.jpg")
 
-local vsh = [[
-	#version 330 core
-	layout (location = 0) in vec3 aPos;
-	layout (location = 1) in vec3 aColor;
-	layout (location = 2) in vec2 aTexCoord;
-	
-	out vec3 ourColor;
-	out vec2 TexCoord;
-	
-	void main()
-	{
-		gl_Position = vec4(aPos, 1.0);
-		ourColor = aColor;
-		TexCoord = vec2(aTexCoord.x, aTexCoord.y);
-	}
-]]
-
-local fsh = [[
-	#version 330 core
-	out vec4 FragColor;
-
-	in vec3 ourColor;
-	in vec2 TexCoord;
-
-	uniform float mixValue;
-
-	// texture samplers
-	uniform sampler2D texture1;
-	uniform sampler2D texture2;
-
-	void main()
-	{
-		// linearly interpolate between both textures
-		FragColor = mix(texture(texture1, TexCoord), texture(texture2, TexCoord), mixValue);
-	}
-]]
-
-BeforeMainLoop()
-
 local font = Engine.GUI.Font.New("./Resources/Font/msyh.ttc", {512, 512}, 5, 5)
 _G["default_font"] =  font 
 
diff --git a/Data/Scripts/macro.lua b/Data/Scripts/macro.lua
new file mode 100644
index 0000000..c8a4895
--- /dev/null
+++ b/Data/Scripts/macro.lua
@@ -0,0 +1,3 @@
+-- "macros"
+GAMELAB_PROFILE = true
+GAMELAB_DEBUG = true
diff --git a/Data/Scripts/settings.lua b/Data/Scripts/settings.lua
new file mode 100644
index 0000000..c837e5c
--- /dev/null
+++ b/Data/Scripts/settings.lua
@@ -0,0 +1,9 @@
+local opentags = {
+    "WndProc",
+}
+
+local Debug = GameLab.Debug
+
+for _, tag in ipairs(opentags) do 
+    Debug.OpenTag(tag)
+end 
-- 
cgit v1.1-26-g67d0