8 files changed, 29 insertions, 13 deletions
diff --git a/Data/Resources/Font/latin.txt b/Data/Configs/latin.txt
index e69de29..e69de29 100644
--- a/Data/Resources/Font/latin.txt
+++ b/Data/Configs/latin.txt
diff --git a/Data/Resources/Font/zh3500.txt b/Data/Configs/zh3500.txt
index 154917c..154917c 100644
--- a/Data/Resources/Font/zh3500.txt
+++ b/Data/Configs/zh3500.txt
diff --git a/Data/DefaultContent/Resources/Images/tile.png b/Data/DefaultContent/Resources/Images/tile.png
new file mode 100644
index 0000000..9105f17
--- /dev/null
+++ b/Data/DefaultContent/Resources/Images/tile.png
diff --git a/Data/Resources/Images/brickwall_small.jpg b/Data/Resources/Images/brickwall_small.jpg
new file mode 100644
index 0000000..8a762a2
--- /dev/null
+++ b/Data/Resources/Images/brickwall_small.jpg
diff --git a/Data/Resources/Images/tile.png b/Data/Resources/Images/tile.png
new file mode 100644
index 0000000..8933ea6
--- /dev/null
+++ b/Data/Resources/Images/tile.png
diff --git a/Data/Resources/Shaders/Editor-UI.glsl b/Data/Resources/Shaders/Editor-UI.glsl
index 91aeb01..b831d6c 100644
--- a/Data/Resources/Shaders/Editor-UI.glsl
+++ b/Data/Resources/Shaders/Editor-UI.glsl
@@ -1,32 +1,46 @@
+
 #version 330 core
 
-VSH_BEGIN
+CMD_BEGIN
+Cull Off
+Blend SrcAlpha OneMinusSrcAlpha
+DepthTest Off
+CMD_END
+ 
+uniform mat4 gamelab_mat_mvp;
+uniform sampler2D gamelab_main_tex;
+uniform vec2 gamelab_ui_position;
 
+VSH_BEGIN
 layout (location = 0) in vec2 vPos;
 layout (location = 1) in vec2 vUV;
-
-uniform mat4 mvp;
+layout (location = 2) in vec4 vColor;
 
 out vec2 uv;
+out vec4 color;
 
 void main()
 {
-	vec4 clip = mvp * vec4(vPos, -1, 1.0);
+	vec2 pos = vPos + gamelab_ui_position;
+	vec4 clip = gamelab_mat_mvp * vec4(pos, -1, 1.0);
 	gl_Position = clip;
 	uv = vUV;
+	color = vColor;
 }
-
 VSH_END
 
 FSH_BEGIN
-uniform sampler2D uiTex;
-
 in vec2 uv;
+in vec4 color;
 
 out vec4 FragColor;
 
 void main()
 {
-	FragColor = texture(uiTex, uv);
+	//vec2 uv = vec2(uv.x, 1 - uv.y);
+    vec4 sampled = texture(gamelab_main_tex, uv);
+	// sampled *= color;
+    //sampled = vec4(1,1,1,1);
+	FragColor = sampled;
 }
 FSH_END
diff --git a/Data/Scripts/Editor/AssetBrowser.lua b/Data/Scripts/Editor/AssetBrowser.lua
index 8d8efa6..177d073 100644
--- a/Data/Scripts/Editor/AssetBrowser.lua
+++ b/Data/Scripts/Editor/AssetBrowser.lua
@@ -17,7 +17,8 @@ local tex
 AssetBrowser.OnGUI = function(self)
 
 	if tex == nil then 
-		tex = Engine.Resource.LoadTexture("./Resources/Images/brickwall.jpg")
+		tex = Engine.Resource.LoadTexture("./Resources/Images/tile.png")
+		--tex = Engine.Resource.LoadTexture("./Resources/Images/brickwall_small.jpg")
 	end
 
 	if shader == nil then 
@@ -30,15 +31,16 @@ AssetBrowser.OnGUI = function(self)
     ortho:SetOrtho(0, 400, 400, 0,  0.1, 10)
 
 	Debug.Log("AssetBrowser.OnGUI()")
-	GL.ClearColor({0.1,0.1,0.1,1})
+	GL.ClearColor({0.13, 0.13, 0.13, 1})
 	GL.Clear(GL.EBufferType.ColorBuffer)
 
 	Engine.Rendering.UseShader(shader)
 	Engine.Rendering.SetMatrix44("gamelab_mat_mvp", ortho)
 	Engine.Rendering.SetVector2("gamelab_ui_position", {0, 0})
 	--Engine.Rendering.SetTexture("gamelab_main_tex", tex)
-	--Engine.Rendering.DrawUIQuad({0, 0, 10, 20})
-	_G["default_font"]:GetCharacters("你好世界！Hello,World! Project Window Properties", 12)
+	--Engine.Rendering.DrawUIQuad({0, 0, 200, 200})
+	_G["default_font"]:GetCharacters("你好世界！Hello,World! Project Window Properties", 12)	
+	--Engine.Rendering.DrawUI9Slicing(1, {25, 25}, {25, 25}, {80, 80}, {200, 200} )
 	Engine.Rendering.ResetUniformState()
 end
 
diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua
index 0aae504..535136b 100644
--- a/Data/Scripts/EditorApplication.lua
+++ b/Data/Scripts/EditorApplication.lua
@@ -113,7 +113,7 @@ local fsh = [[
 
 BeforeMainLoop()
 
-local font = Engine.GUI.Font.New("./Resources/Font/simsun.ttc", {512, 512}, 5, 5)
+local font = Engine.GUI.Font.New("./Resources/Font/msyh.ttc", {512, 512}, 5, 5)
 _G["default_font"] =  font 
 
 while true do