*TextGenerator

4 files changed, 9 insertions, 2 deletions

diff --git a/Data/Editor.exe b/Data/Editor.exe
new file mode 100644
index 0000000..e59406e
--- /dev/null
+++ b/Data/Editor.exe
diff --git a/Data/Resources/Font/Deng.ttf b/Data/Resources/Font/Deng.ttf
new file mode 100644
index 0000000..7438a2a
--- /dev/null
+++ b/Data/Resources/Font/Deng.ttf
diff --git a/Data/Scripts/Editor/AssetBrowser.lua b/Data/Scripts/Editor/AssetBrowser.lua
index a36cda2..68f0483 100644
--- a/Data/Scripts/Editor/AssetBrowser.lua
+++ b/Data/Scripts/Editor/AssetBrowser.lua
@@ -42,7 +42,11 @@ out vec4 FragColor;
 

 void main()

 {

-	FragColor = texture(uiTex, uv);

+    vec4 sampled = vec4(texture(uiTex, uv).r, 0, 0, 1.0);

+    FragColor = sampled;

+//	FragColor = texture(uiTex, uv);

+//	FragColor.rgb = vec3(1,0,0);

+//	FragColor.a = 1;

 }

 FSH_END

 

@@ -52,6 +56,7 @@ local tex
 

 AssetBrowser.OnGUI = function(self)

 

+

 	if tex == nil then 

 		tex = Engine.Resource.LoadTexture("./Resources/Images/brickwall.jpg")

 	end

@@ -76,7 +81,7 @@ AssetBrowser.OnGUI = function(self)
 

 	Engine.Rendering.UseShader(shader)

 	Engine.Rendering.SetMatrix44("mvp", ortho)

-	Engine.Rendering.SetTexture("tex", tex)

+	Engine.Rendering.SetTexture("uiTex", tex)

 	Engine.Rendering.DrawUIQuad({10, 30, 300, 300})

 

 	Engine.Rendering.ResetUniformState()

diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua
index 75749df..e9dbc32 100644
--- a/Data/Scripts/EditorApplication.lua
+++ b/Data/Scripts/EditorApplication.lua
@@ -111,6 +111,8 @@ local fsh = [[
 	}
 ]]
 
+BeforeMainLoop()
+	
 while true do
 
 	app:OnStep()