From d94f4a50e1e967c5d225720002c439107124bc13 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sun, 14 Oct 2018 09:47:53 +0800
Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/.vs/libjin/v14/.suo           | Bin 142848 -> 142848 bytes
 build/Debug/05Font.exe              | Bin 1091072 -> 1222144 bytes
 build/libjin.sln                    |  20 ++++++-------
 build/libjin/libjin.vcxproj         |  24 ++++++++++------
 build/libjin/libjin.vcxproj.filters |  54 ++++++++++++++++++++++++++++--------
 5 files changed, 68 insertions(+), 30 deletions(-)

(limited to 'build')

diff --git a/build/.vs/libjin/v14/.suo b/build/.vs/libjin/v14/.suo
index fd9eecb..9c02e56 100644
Binary files a/build/.vs/libjin/v14/.suo and b/build/.vs/libjin/v14/.suo differ
diff --git a/build/Debug/05Font.exe b/build/Debug/05Font.exe
index 7b9484a..c04ef8c 100644
Binary files a/build/Debug/05Font.exe and b/build/Debug/05Font.exe differ
diff --git a/build/libjin.sln b/build/libjin.sln
index 59694f9..65cdd39 100644
--- a/build/libjin.sln
+++ b/build/libjin.sln
@@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{D4
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05Font", "05Font\05Font.vcxproj", "{D1953718-E728-4A86-9CCF-8BEC1F5C5F97}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "06TextureFont", "06TextureFont\06TextureFont.vcxproj", "{A81B426C-A6C7-4861-92A9-A087872D2C53}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "06TextureFont", "06TextureFont\06TextureFont.vcxproj", "{9BE6EA25-E171-405D-86CA-AC13A7F387D1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -75,14 +75,14 @@ Global
 		{D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Release|x64.Build.0 = Release|x64
 		{D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Release|x86.ActiveCfg = Release|Win32
 		{D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Release|x86.Build.0 = Release|Win32
-		{A81B426C-A6C7-4861-92A9-A087872D2C53}.Debug|x64.ActiveCfg = Debug|x64
-		{A81B426C-A6C7-4861-92A9-A087872D2C53}.Debug|x64.Build.0 = Debug|x64
-		{A81B426C-A6C7-4861-92A9-A087872D2C53}.Debug|x86.ActiveCfg = Debug|Win32
-		{A81B426C-A6C7-4861-92A9-A087872D2C53}.Debug|x86.Build.0 = Debug|Win32
-		{A81B426C-A6C7-4861-92A9-A087872D2C53}.Release|x64.ActiveCfg = Release|x64
-		{A81B426C-A6C7-4861-92A9-A087872D2C53}.Release|x64.Build.0 = Release|x64
-		{A81B426C-A6C7-4861-92A9-A087872D2C53}.Release|x86.ActiveCfg = Release|Win32
-		{A81B426C-A6C7-4861-92A9-A087872D2C53}.Release|x86.Build.0 = Release|Win32
+		{9BE6EA25-E171-405D-86CA-AC13A7F387D1}.Debug|x64.ActiveCfg = Debug|x64
+		{9BE6EA25-E171-405D-86CA-AC13A7F387D1}.Debug|x64.Build.0 = Debug|x64
+		{9BE6EA25-E171-405D-86CA-AC13A7F387D1}.Debug|x86.ActiveCfg = Debug|Win32
+		{9BE6EA25-E171-405D-86CA-AC13A7F387D1}.Debug|x86.Build.0 = Debug|Win32
+		{9BE6EA25-E171-405D-86CA-AC13A7F387D1}.Release|x64.ActiveCfg = Release|x64
+		{9BE6EA25-E171-405D-86CA-AC13A7F387D1}.Release|x64.Build.0 = Release|x64
+		{9BE6EA25-E171-405D-86CA-AC13A7F387D1}.Release|x86.ActiveCfg = Release|Win32
+		{9BE6EA25-E171-405D-86CA-AC13A7F387D1}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -93,7 +93,7 @@ Global
 		{0E49D105-2032-4825-9FA1-54B1B94E3655} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD}
 		{85071432-24B6-46D4-98D8-DAA63183093C} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD}
 		{D1953718-E728-4A86-9CCF-8BEC1F5C5F97} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD}
-		{A81B426C-A6C7-4861-92A9-A087872D2C53} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD}
+		{9BE6EA25-E171-405D-86CA-AC13A7F387D1} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {310E7948-2690-4896-9579-19E6AC4D405B}
diff --git a/build/libjin/libjin.vcxproj b/build/libjin/libjin.vcxproj
index f787ea4..58b1371 100644
--- a/build/libjin/libjin.vcxproj
+++ b/build/libjin/libjin.vcxproj
@@ -36,14 +36,18 @@
     <ClCompile Include="..\..\libjin\Graphics\Canvas.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\Color.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\Drawable.cpp" />
-    <ClCompile Include="..\..\libjin\Graphics\TexFont.cpp" />
-    <ClCompile Include="..\..\libjin\Graphics\TTF.cpp" />
+    <ClCompile Include="..\..\libjin\Graphics\Font\Decoder.cpp" />
+    <ClCompile Include="..\..\libjin\Graphics\Font\TexFont.cpp" />
+    <ClCompile Include="..\..\libjin\Graphics\Font\Text.cpp" />
+    <ClCompile Include="..\..\libjin\Graphics\Font\TTF.cpp" />
+    <ClCompile Include="..\..\libjin\Graphics\Image.cpp" />
+    <ClCompile Include="..\..\libjin\Graphics\Particles\Particle.cpp" />
+    <ClCompile Include="..\..\libjin\Graphics\Sprite.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\Mesh.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\OpenGL.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\Shader.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\Shapes.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\Texture.cpp" />
-    <ClCompile Include="..\..\libjin\Graphics\Unicode.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\Window.cpp" />
     <ClCompile Include="..\..\libjin\Input\Event.cpp" />
     <ClCompile Include="..\..\libjin\Input\Joypad.cpp" />
@@ -87,12 +91,18 @@
     <ClInclude Include="..\..\libjin\Graphics\Canvas.h" />
     <ClInclude Include="..\..\libjin\Graphics\Color.h" />
     <ClInclude Include="..\..\libjin\Graphics\Drawable.h" />
-    <ClInclude Include="..\..\libjin\Graphics\TTF.h" />
-    <ClInclude Include="..\..\libjin\Graphics\Font.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Font\Decoder.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Font\Font.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Font\Page.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Font\TexFont.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Font\Text.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Font\TTF.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Image.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Particles\Particle.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Sprite.h" />
     <ClInclude Include="..\..\libjin\Graphics\Graphics.h" />
     <ClInclude Include="..\..\libjin\Graphics\Mesh.h" />
     <ClInclude Include="..\..\libjin\Graphics\OpenGL.h" />
-    <ClInclude Include="..\..\libjin\Graphics\Page.h" />
     <ClInclude Include="..\..\libjin\Graphics\Shader.h" />
     <ClInclude Include="..\..\libjin\Graphics\Shaders\base.shader.h" />
     <ClInclude Include="..\..\libjin\Graphics\Shaders\default.shader.h" />
@@ -100,8 +110,6 @@
     <ClInclude Include="..\..\libjin\Graphics\Shaders\texture.shader.h" />
     <ClInclude Include="..\..\libjin\Graphics\Shapes.h" />
     <ClInclude Include="..\..\libjin\Graphics\Texture.h" />
-    <ClInclude Include="..\..\libjin\Graphics\TexFont.h" />
-    <ClInclude Include="..\..\libjin\Graphics\Unicode.h" />
     <ClInclude Include="..\..\libjin\Graphics\Window.h" />
     <ClInclude Include="..\..\libjin\Input\Event.h" />
     <ClInclude Include="..\..\libjin\Input\Input.h" />
diff --git a/build/libjin/libjin.vcxproj.filters b/build/libjin/libjin.vcxproj.filters
index 02b4364..f194817 100644
--- a/build/libjin/libjin.vcxproj.filters
+++ b/build/libjin/libjin.vcxproj.filters
@@ -61,6 +61,12 @@
     <Filter Include="Graphics\Shaders">
       <UniqueIdentifier>{35881367-9a40-4391-9cc2-26d2ee869b8a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Graphics\Font">
+      <UniqueIdentifier>{dfda69e2-693e-4ab1-945f-478c251cc67a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Graphics\Particles">
+      <UniqueIdentifier>{4c70f035-3e66-4de8-8d0f-95919d42863c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libjin\3rdparty\GLee\GLee.c">
@@ -165,14 +171,26 @@
     <ClCompile Include="..\..\libjin\Graphics\OpenGL.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libjin\Graphics\TTF.cpp">
+    <ClCompile Include="..\..\libjin\Graphics\Image.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libjin\Graphics\TexFont.cpp">
+    <ClCompile Include="..\..\libjin\Graphics\Sprite.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libjin\Graphics\Unicode.cpp">
-      <Filter>Graphics</Filter>
+    <ClCompile Include="..\..\libjin\Graphics\Font\TexFont.cpp">
+      <Filter>Graphics\Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libjin\Graphics\Font\TTF.cpp">
+      <Filter>Graphics\Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libjin\Graphics\Particles\Particle.cpp">
+      <Filter>Graphics\Particles</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libjin\Graphics\Font\Decoder.cpp">
+      <Filter>Graphics\Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libjin\Graphics\Font\Text.cpp">
+      <Filter>Graphics\Font</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -358,20 +376,32 @@
     <ClInclude Include="..\..\libjin\Graphics\Shaders\texture.shader.h">
       <Filter>Graphics\Shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Graphics\Page.h">
+    <ClInclude Include="..\..\libjin\Graphics\Image.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Graphics\TTF.h">
+    <ClInclude Include="..\..\libjin\Graphics\Sprite.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Graphics\Font.h">
-      <Filter>Graphics</Filter>
+    <ClInclude Include="..\..\libjin\Graphics\Font\Font.h">
+      <Filter>Graphics\Font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Graphics\TexFont.h">
-      <Filter>Graphics</Filter>
+    <ClInclude Include="..\..\libjin\Graphics\Font\Page.h">
+      <Filter>Graphics\Font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Graphics\Unicode.h">
-      <Filter>Graphics</Filter>
+    <ClInclude Include="..\..\libjin\Graphics\Font\TexFont.h">
+      <Filter>Graphics\Font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libjin\Graphics\Font\TTF.h">
+      <Filter>Graphics\Font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libjin\Graphics\Particles\Particle.h">
+      <Filter>Graphics\Particles</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libjin\Graphics\Font\Decoder.h">
+      <Filter>Graphics\Font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libjin\Graphics\Font\Text.h">
+      <Filter>Graphics\Font</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-- 
cgit v1.1-26-g67d0