*misc

17 files changed, 16 insertions, 24 deletions

diff --git a/Data/Resources/Font/consola.ttf b/Data/Resources/Font/consola.ttf
new file mode 100644
index 0000000..e881ca4
--- /dev/null
+++ b/Data/Resources/Font/consola.ttf
diff --git a/Data/Resources/Font/consolab.ttf b/Data/Resources/Font/consolab.ttf
new file mode 100644
index 0000000..77f5d60
--- /dev/null
+++ b/Data/Resources/Font/consolab.ttf
diff --git a/Data/Resources/Font/consolai.ttf b/Data/Resources/Font/consolai.ttf
new file mode 100644
index 0000000..2de4de8
--- /dev/null
+++ b/Data/Resources/Font/consolai.ttf
diff --git a/Data/Resources/Font/consolaz.ttf b/Data/Resources/Font/consolaz.ttf
new file mode 100644
index 0000000..d9df211
--- /dev/null
+++ b/Data/Resources/Font/consolaz.ttf
diff --git a/Data/Resources/Font/msyhbd.ttc b/Data/Resources/Font/msyhbd.ttc
new file mode 100644
index 0000000..7949a5f
--- /dev/null
+++ b/Data/Resources/Font/msyhbd.ttc
diff --git a/Data/Resources/Shaders/Editor-Text.glsl b/Data/Resources/Shaders/Editor-Text.glsl
index c58bd48..34412e3 100644
--- a/Data/Resources/Shaders/Editor-Text.glsl
+++ b/Data/Resources/Shaders/Editor-Text.glsl
@@ -36,7 +36,7 @@ out vec4 FragColor;
 void main()
 {
 	//vec2 uv = vec2(uv.x, 1 - uv.y);
-    vec4 sampled = vec4(1,1,1,texture(gamelab_main_tex, uv).r);
+    vec4 sampled = vec4(0.8,0.8,0.8,texture(gamelab_main_tex, uv).r);
 	sampled *= color;
  //   vec4 sampled = vec4(1,1,1,1);
 	FragColor = sampled;
diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua
index 535136b..103dcdf 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/msyh.ttc", {512, 512}, 5, 5)
+local font = Engine.GUI.Font.New("./Resources/Font/consola.ttf", {512, 512}, 5, 5)
 _G["default_font"] =  font 
 
 while true do
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj
index 8cf22cc..83df147 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj
@@ -202,7 +202,8 @@
     <ClCompile Include="..\..\..\Runtime\GUI\Font.cpp" />

     <ClCompile Include="..\..\..\Runtime\GUI\TextMesh.cpp" />

     <ClCompile Include="..\..\..\Runtime\GUI\TextMeshGenerator.cpp" />

-    <ClCompile Include="..\..\..\Runtime\GUI\utf8_decode.cpp" />

+    <ClCompile Include="..\..\..\Runtime\GUI\UIQuad.cpp" />

+    <ClCompile Include="..\..\..\Runtime\GUI\utf8.cpp" />

     <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindCFunctions.cpp" />

     <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.cpp" />

     <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindEnum.cpp" />

@@ -220,7 +221,6 @@
     <ClCompile Include="..\..\..\Runtime\Math\Vector4.cpp" />

     <ClCompile Include="..\..\..\Runtime\Profiling\FrameStats.cpp" />

     <ClCompile Include="..\..\..\Runtime\Rendering\Quad.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Rendering\UIQuad.cpp" />

     <ClCompile Include="..\..\..\Runtime\Scripting\Common\Common.bind.cpp" />

     <ClCompile Include="..\..\..\Runtime\Scripting\Common\DataBuffer.bind.cpp" />

     <ClCompile Include="..\..\..\Runtime\Scripting\Debug\Debug.bind.cpp" />

@@ -242,7 +242,6 @@
     <ClCompile Include="..\..\..\Runtime\Threading\Thread.cpp" />

     <ClCompile Include="..\..\..\Runtime\Threading\WorkThread.cpp" />

     <ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\Editor\EditorApplication.h" />

@@ -292,6 +291,7 @@
     <ClInclude Include="..\..\..\Runtime\GUI\Font.h" />

     <ClInclude Include="..\..\..\Runtime\GUI\TextMesh.h" />

     <ClInclude Include="..\..\..\Runtime\GUI\TextMeshGenerator.h" />

+    <ClInclude Include="..\..\..\Runtime\GUI\UIQuad.h" />

     <ClInclude Include="..\..\..\Runtime\GUI\utf8.h" />

     <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBind.h" />

     <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindCFunctions.h" />

@@ -325,7 +325,6 @@
     <ClInclude Include="..\..\..\Runtime\Profiling\Profiler.h" />

     <ClInclude Include="..\..\..\Runtime\Rendering\DynamicMesh.h" />

     <ClInclude Include="..\..\..\Runtime\Rendering\Quad.h" />

-    <ClInclude Include="..\..\..\Runtime\Rendering\UIQuad.h" />

     <ClInclude Include="..\..\..\Runtime\Threading\Job.h" />

     <ClInclude Include="..\..\..\Runtime\Threading\JobSystem.h" />

     <ClInclude Include="..\..\..\Runtime\Threading\Mutex.h" />

@@ -342,7 +341,6 @@
     <ClInclude Include="..\..\..\Runtime\Utilities\StaticInitiator.h" />

     <ClInclude Include="..\..\..\Runtime\Utilities\Type.h" />

     <ClInclude Include="..\..\..\Runtime\Utilities\UIDGenerator.h" />

-    <ClInclude Include="..\..\..\Runtime\Utilities\Utf8.h" />

     <ClInclude Include="..\..\..\Runtime\Utilities\UtilMacros.h" />

   </ItemGroup>

   <ItemGroup>

diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
index 5d2fb1c..e2b1c24 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
@@ -132,9 +132,6 @@
     <ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp">

       <Filter>Runtime\Utilities</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp">

-      <Filter>Runtime\Utilities</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\Editor\GUI\WinUtils.cpp">

       <Filter>Editor\GUI</Filter>

     </ClCompile>

@@ -384,9 +381,6 @@
     <ClCompile Include="..\..\..\Runtime\Rendering\Quad.cpp">

       <Filter>Runtime\Rendering</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Rendering\UIQuad.cpp">

-      <Filter>Runtime\Rendering</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\Runtime\Graphics\RenderCommands.cpp">

       <Filter>Runtime\Graphics</Filter>

     </ClCompile>

@@ -408,7 +402,10 @@
     <ClCompile Include="..\..\..\Runtime\GUI\TextMeshGenerator.cpp">

       <Filter>Runtime\GUI</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\GUI\utf8_decode.cpp">

+    <ClCompile Include="..\..\..\Runtime\GUI\utf8.cpp">

+      <Filter>Runtime\GUI</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\Runtime\GUI\UIQuad.cpp">

       <Filter>Runtime\GUI</Filter>

     </ClCompile>

   </ItemGroup>

@@ -455,9 +452,6 @@
     <ClInclude Include="..\..\..\Runtime\Utilities\UIDGenerator.h">

       <Filter>Runtime\Utilities</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Utilities\Utf8.h">

-      <Filter>Runtime\Utilities</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\..\Runtime\Utilities\UtilMacros.h">

       <Filter>Runtime\Utilities</Filter>

     </ClInclude>

@@ -680,9 +674,6 @@
     <ClInclude Include="..\..\..\Runtime\Rendering\Quad.h">

       <Filter>Runtime\Rendering</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Rendering\UIQuad.h">

-      <Filter>Runtime\Rendering</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\..\Runtime\Rendering\DynamicMesh.h">

       <Filter>Runtime\Rendering</Filter>

     </ClInclude>

@@ -710,6 +701,9 @@
     <ClInclude Include="..\..\..\Runtime\Utilities\IIncrementalTask.h">

       <Filter>Runtime\Utilities</Filter>

     </ClInclude>

+    <ClInclude Include="..\..\..\Runtime\GUI\UIQuad.h">

+      <Filter>Runtime\GUI</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <None Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.inc">

diff --git a/Runtime/GUI/TextMesh.cpp b/Runtime/GUI/TextMesh.cpp
index de9a195..2f66170 100644
--- a/Runtime/GUI/TextMesh.cpp
+++ b/Runtime/GUI/TextMesh.cpp
@@ -50,6 +50,8 @@ InitializeStaticVariables([]() {
 	s_SizePerText = sizeof(TextMeshVBOLayout) * 4;
 });
 
+// 一段文字里面的网格可能会来自不同的atlas，在生成TextMesh时做好合批
+
 TextMesh::TextMesh(const UnicodeString& str, Font* font,int pixelSize, ETextAnchor anchor, ETextAlignment alignment)
 {
 	m_Font = font;
diff --git a/Runtime/GUI/TextMesh.h b/Runtime/GUI/TextMesh.h
index c091a78..c5f05a2 100644
--- a/Runtime/GUI/TextMesh.h
+++ b/Runtime/GUI/TextMesh.h
@@ -34,8 +34,6 @@ namespace TextHelper
 	TextMeshHash GetTextMeshHash();

 }

 
-// 一段文字里面的网格可能会来自不同的atlas，在生成TextMesh时做好合批
-
 class TextMesh
 {
 public:
diff --git a/Runtime/Rendering/UIQuad.cpp b/Runtime/GUI/UIQuad.cpp
index 089d0e1..089d0e1 100644
--- a/Runtime/Rendering/UIQuad.cpp
+++ b/Runtime/GUI/UIQuad.cpp
diff --git a/Runtime/Rendering/UIQuad.h b/Runtime/GUI/UIQuad.h
index f6d3a98..bcd95a0 100644
--- a/Runtime/Rendering/UIQuad.h
+++ b/Runtime/GUI/UIQuad.h
@@ -1,5 +1,5 @@
 #pragma once 
-#include "DynamicMesh.h"
+#include "../Rendering/DynamicMesh.h"
 #include "../Utilities/StaticInitiator.h"
 
 class UIQuad : public DynamicMesh
diff --git a/Runtime/GUI/utf8_decode.cpp b/Runtime/GUI/utf8.cpp
index 8a3a086..8a3a086 100644
--- a/Runtime/GUI/utf8_decode.cpp
+++ b/Runtime/GUI/utf8.cpp
diff --git a/Runtime/Scripting/Rendering/Rendering.bind.cpp b/Runtime/Scripting/Rendering/Rendering.bind.cpp
index f4777b7..0b00fa3 100644
--- a/Runtime/Scripting/Rendering/Rendering.bind.cpp
+++ b/Runtime/Scripting/Rendering/Rendering.bind.cpp
@@ -2,7 +2,7 @@
 #include "Runtime/Graphics/Texture.h"
 #include "Runtime/Graphics/ImageData.h"
 #include "Runtime/Graphics/GfxDevice.h"
-#include "Runtime/Rendering/UIQuad.h"
+#include "Runtime/GUI/UIQuad.h"
 
 // Rendering.DrawUIQuad({})
 static int DrawUIQuad(lua_State* L)
diff --git a/Runtime/Utilities/Utf8.cpp b/Runtime/Utilities/Utf8.cpp
deleted file mode 100644
index e69de29..0000000
--- a/Runtime/Utilities/Utf8.cpp
+++ /dev/null
diff --git a/Runtime/Utilities/Utf8.h b/Runtime/Utilities/Utf8.h
deleted file mode 100644
index e69de29..0000000
--- a/Runtime/Utilities/Utf8.h
+++ /dev/null