*misc

2 files changed, 10 insertions, 18 deletions

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">