From b1bbc998960fff2169dc5a992c47d08723472f9b Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sun, 14 Oct 2018 22:52:40 +0800
Subject: =?UTF-8?q?*=E7=9B=B4=E6=8E=A5=E6=B8=B2=E6=9F=93=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/vc++/jin.vcxproj                     |  10 +--
 build/vc++/jin.vcxproj.filters             |  14 ++--
 build/vc++/libjin/libjin.vcxproj           |  24 +++++--
 build/vc++/libjin/libjin.vcxproj.filters   | 108 ++++++++++++++++++++---------
 build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll | Bin 364544 -> 364544 bytes
 5 files changed, 109 insertions(+), 47 deletions(-)

(limited to 'build')

diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj
index 727385e..98c5d38 100644
--- a/build/vc++/jin.vcxproj
+++ b/build/vc++/jin.vcxproj
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalDependencies>opengl32.lib;glu32.lib;lua51.lib;SDL2main.lib;SDL2.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)libs\SDL2-2.0.5\lib\x86;$(SolutionDir)libs\LuaJIT-2.0.5\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
+      <SubSystem>Console</SubSystem>
       <EntryPointSymbol>
       </EntryPointSymbol>
     </Link>
@@ -124,7 +124,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>opengl32.lib;glu32.lib;lua51.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)libs\SDL2-2.0.5\lib\x86;$(SolutionDir)libs\LuaJIT-2.0.5\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
+      <SubSystem>Console</SubSystem>
       <EntryPointSymbol>
       </EntryPointSymbol>
     </Link>
@@ -153,8 +153,10 @@
     <ClCompile Include="..\..\src\lua\modules\filesystem\filesystem.cpp" />
     <ClCompile Include="..\..\src\lua\modules\graphics\bitmap.cpp" />
     <ClCompile Include="..\..\src\lua\modules\graphics\canvas.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\graphics\font.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\graphics\fontData.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\text.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\textureFont.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\ttf.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\ttfData.cpp" />
     <ClCompile Include="..\..\src\lua\modules\graphics\graphics.cpp" />
     <ClCompile Include="..\..\src\lua\modules\graphics\page.cpp" />
     <ClCompile Include="..\..\src\lua\modules\graphics\texture.cpp" />
diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters
index 9612793..18f4535 100644
--- a/build/vc++/jin.vcxproj.filters
+++ b/build/vc++/jin.vcxproj.filters
@@ -87,9 +87,6 @@
     <ClCompile Include="..\..\src\lua\modules\graphics\canvas.cpp">
       <Filter>src\modules\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\graphics\font.cpp">
-      <Filter>src\modules\graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\graphics\graphics.cpp">
       <Filter>src\modules\graphics</Filter>
     </ClCompile>
@@ -138,7 +135,16 @@
     <ClCompile Include="..\..\src\lua\modules\graphics\page.cpp">
       <Filter>src\modules\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\graphics\fontData.cpp">
+    <ClCompile Include="..\..\src\lua\modules\graphics\ttfData.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\ttf.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\text.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\textureFont.cpp">
       <Filter>src\modules\graphics</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj
index 10301e9..cafe7bd 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -145,6 +145,7 @@
     <ClInclude Include="..\..\..\src\libjin\Common\Array.hpp" />
     <ClInclude Include="..\..\..\src\libjin\Common\common.h" />
     <ClInclude Include="..\..\..\src\libjin\Common\Data.h" />
+    <ClInclude Include="..\..\..\src\libjin\Common\Exception.h" />
     <ClInclude Include="..\..\..\src\libjin\Common\Object.h" />
     <ClInclude Include="..\..\..\src\libjin\Common\Singleton.hpp" />
     <ClInclude Include="..\..\..\src\libjin\Common\StringMap.hpp" />
@@ -158,19 +159,25 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\Canvas.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Color.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Drawable.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\FontData.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Decoder.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Font.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Page.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Text.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\TextureFont.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\TTF.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Graphics.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Image.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Mesh.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\OpenGL.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Particles\Particle.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shader.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\base.shader.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\default.shader.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\font.shader.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\texture.shader.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shapes.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Sprite.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Texture.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Utf8.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Window.h" />
     <ClInclude Include="..\..\..\src\libjin\Input\Event.h" />
     <ClInclude Include="..\..\..\src\libjin\Input\Input.h" />
@@ -208,6 +215,7 @@
     <ClCompile Include="..\..\..\src\libjin\Audio\SDL\SDLAudio.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Audio\SDL\SDLSource.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Audio\Source.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Common\Exception.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Common\Object.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Common\utf8.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Filesystem\Filesystem.cpp" />
@@ -216,14 +224,18 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\Canvas.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Color.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Drawable.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Font.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Graphics\FontData.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\Decoder.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\Text.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\TextureFont.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\TTF.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Image.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Mesh.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\OpenGL.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Particles\Particle.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Shader.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Shapes.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Sprite.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Texture.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Utf8.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Window.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Input\Event.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Input\Joypad.cpp" />
diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters
index 17ff93c..3db3161 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -64,6 +64,12 @@
     <Filter Include="Source\Game">
       <UniqueIdentifier>{c002d452-c7a0-4161-a419-c10fd3d1c297}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source\Graphics\Font">
+      <UniqueIdentifier>{ce02dfa9-2afe-4295-b14f-c786d65456cd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source\Graphics\Particles">
+      <UniqueIdentifier>{be281e38-d048-40c5-a891-38703cfa9bfa}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\libjin\modules.h">
@@ -201,6 +207,45 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\font.shader.h">
       <Filter>Source\Graphics\Shaders</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Common\Data.h">
+      <Filter>Source\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Common\types.h">
+      <Filter>Source\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\ogl\OpenGL.h">
+      <Filter>Source\3rdparty\ogl2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\texture.shader.h">
+      <Filter>Source\Graphics\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Game\Game.h">
+      <Filter>Source\Game</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Common\Exception.h">
+      <Filter>Source\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Decoder.h">
+      <Filter>Source\Graphics\Font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Font.h">
+      <Filter>Source\Graphics\Font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Page.h">
+      <Filter>Source\Graphics\Font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\Text.h">
+      <Filter>Source\Graphics\Font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\TextureFont.h">
+      <Filter>Source\Graphics\Font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Font\TTF.h">
+      <Filter>Source\Graphics\Font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Particles\Particle.h">
+      <Filter>Source\Graphics\Particles</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\Bitmap.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
@@ -213,13 +258,10 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\Drawable.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Font.h">
-      <Filter>Source\Graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\FontData.h">
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Graphics.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Graphics.h">
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Image.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\Mesh.h">
@@ -234,30 +276,15 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shapes.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Texture.h">
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Sprite.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Window.h">
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Texture.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Common\Data.h">
-      <Filter>Source\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Common\types.h">
-      <Filter>Source\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\3rdparty\ogl\OpenGL.h">
-      <Filter>Source\3rdparty\ogl2d</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\texture.shader.h">
-      <Filter>Source\Graphics\Shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Utf8.h">
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Window.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Game\Game.h">
-      <Filter>Source\Game</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\src\libjin\README.md">
@@ -334,6 +361,27 @@
     <ClCompile Include="..\..\..\src\libjin\Time\Timer.cpp">
       <Filter>Source\Time</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Game\Game.cpp">
+      <Filter>Source\Game</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Common\Exception.cpp">
+      <Filter>Source\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\Decoder.cpp">
+      <Filter>Source\Graphics\Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\Text.cpp">
+      <Filter>Source\Graphics\Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\TextureFont.cpp">
+      <Filter>Source\Graphics\Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Font\TTF.cpp">
+      <Filter>Source\Graphics\Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Particles\Particle.cpp">
+      <Filter>Source\Graphics\Particles</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\Bitmap.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
@@ -346,10 +394,7 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\Drawable.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Font.cpp">
-      <Filter>Source\Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\FontData.cpp">
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Image.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\Mesh.cpp">
@@ -364,17 +409,14 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\Shapes.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Texture.cpp">
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Sprite.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Window.cpp">
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Texture.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Utf8.cpp">
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Window.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Game\Game.cpp">
-      <Filter>Source\Game</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll b/build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll
index 34a3016..df03f8d 100644
Binary files a/build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll and b/build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll differ
-- 
cgit v1.1-26-g67d0