*update

4 files changed, 113 insertions, 47 deletions

diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj
index 41626e1..727385e 100644
--- a/build/vc++/jin.vcxproj
+++ b/build/vc++/jin.vcxproj
@@ -154,7 +154,9 @@
     <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\graphics.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\page.cpp" />
     <ClCompile Include="..\..\src\lua\modules\graphics\texture.cpp" />
     <ClCompile Include="..\..\src\lua\modules\graphics\shader.cpp" />
     <ClCompile Include="..\..\src\lua\modules\joypad\joypad.cpp" />
diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters
index b44ba99..9612793 100644
--- a/build/vc++/jin.vcxproj.filters
+++ b/build/vc++/jin.vcxproj.filters
@@ -135,6 +135,12 @@
     <ClCompile Include="..\..\src\lua\main.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\page.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\fontData.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">
diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj
index dc0ed9b..10301e9 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -131,6 +131,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\libjin\3rdparty\GLee\GLee.h" />
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\ogl\OpenGL.h" />
     <ClInclude Include="..\..\..\src\libjin\3rdparty\smount\dirent.h" />
     <ClInclude Include="..\..\..\src\libjin\3rdparty\smount\smount.h" />
     <ClInclude Include="..\..\..\src\libjin\3rdparty\stb\stb_image.h" />
@@ -143,25 +144,33 @@
     <ClInclude Include="..\..\..\src\libjin\Audio\Source.h" />
     <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\Object.h" />
     <ClInclude Include="..\..\..\src\libjin\Common\Singleton.hpp" />
     <ClInclude Include="..\..\..\src\libjin\Common\StringMap.hpp" />
     <ClInclude Include="..\..\..\src\libjin\Common\Subsystem.hpp" />
+    <ClInclude Include="..\..\..\src\libjin\Common\types.h" />
     <ClInclude Include="..\..\..\src\libjin\Common\utf8.h" />
-    <ClInclude Include="..\..\..\src\libjin\Core\Core.h" />
-    <ClInclude Include="..\..\..\src\libjin\Core\Game.h" />
     <ClInclude Include="..\..\..\src\libjin\Filesystem\Buffer.h" />
     <ClInclude Include="..\..\..\src\libjin\Filesystem\Filesystem.h" />
+    <ClInclude Include="..\..\..\src\libjin\Game\Game.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Bitmap.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Canvas.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Color.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\base.shader.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Drawable.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Font.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shapes.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\FontData.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Graphics.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Mesh.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\OpenGL.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\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" />
@@ -201,16 +210,20 @@
     <ClCompile Include="..\..\..\src\libjin\Audio\Source.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Common\Object.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Common\utf8.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Core\Game.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Filesystem\Filesystem.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Game\Game.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Bitmap.cpp" />
     <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\Shapes.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\FontData.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Mesh.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\OpenGL.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Shader.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Shapes.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 b96ecf5..17ff93c 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -31,9 +31,6 @@
     <Filter Include="Source\Common">
       <UniqueIdentifier>{908f94da-1fc4-42db-abe9-8c8e17051f9d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source\Core">
-      <UniqueIdentifier>{c002d452-c7a0-4161-a419-c10fd3d1c297}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source\Filesystem">
       <UniqueIdentifier>{3a98cf95-d45a-4a0e-b3fe-65b5accdb75f}</UniqueIdentifier>
     </Filter>
@@ -58,6 +55,15 @@
     <Filter Include="Source\Utils">
       <UniqueIdentifier>{6259760f-501a-4b52-b9a1-4abb4d788a99}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source\Graphics\Shaders">
+      <UniqueIdentifier>{bed786b4-6d8a-4c8d-b04f-67eb0f7435b8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source\3rdparty\ogl2d">
+      <UniqueIdentifier>{c582e534-7e96-484c-ae1b-a9e7962ab6c2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source\Game">
+      <UniqueIdentifier>{c002d452-c7a0-4161-a419-c10fd3d1c297}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\libjin\modules.h">
@@ -90,12 +96,6 @@
     <ClInclude Include="..\..\..\src\libjin\Common\utf8.h">
       <Filter>Source\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Core\Core.h">
-      <Filter>Source\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Core\Game.h">
-      <Filter>Source\Core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Filesystem\Buffer.h">
       <Filter>Source\Filesystem</Filter>
     </ClInclude>
@@ -171,6 +171,39 @@
     <ClInclude Include="..\..\..\src\libjin\3rdparty\smount\smount.h">
       <Filter>Source\3rdparty\smount</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Time\Timer.h">
+      <Filter>Source\Time</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Math\Vector2.hpp">
+      <Filter>Source\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Math\Vector3.hpp">
+      <Filter>Source\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Math\Vector4.hpp">
+      <Filter>Source\Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\jin.h">
+      <Filter>Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Common\Array.hpp">
+      <Filter>Source\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Common\common.h">
+      <Filter>Source\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\base.shader.h">
+      <Filter>Source\Graphics\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\default.shader.h">
+      <Filter>Source\Graphics\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\font.shader.h">
+      <Filter>Source\Graphics\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Bitmap.h">
+      <Filter>Source\Graphics</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\Canvas.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
@@ -183,47 +216,47 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\Font.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Graphics.h">
+    <ClInclude Include="..\..\..\src\libjin\Graphics\FontData.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Texture.h">
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Graphics.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Window.h">
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Mesh.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shapes.h">
+    <ClInclude Include="..\..\..\src\libjin\Graphics\OpenGL.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Time\Timer.h">
-      <Filter>Source\Time</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shader.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\base.shader.h">
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shapes.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Bitmap.h">
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Texture.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Math\Vector2.hpp">
-      <Filter>Source\Math</Filter>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Window.h">
+      <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Math\Vector3.hpp">
-      <Filter>Source\Math</Filter>
+    <ClInclude Include="..\..\..\src\libjin\Common\Data.h">
+      <Filter>Source\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Math\Vector4.hpp">
-      <Filter>Source\Math</Filter>
+    <ClInclude Include="..\..\..\src\libjin\Common\types.h">
+      <Filter>Source\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\jin.h">
-      <Filter>Source</Filter>
+    <ClInclude Include="..\..\..\src\libjin\3rdparty\ogl\OpenGL.h">
+      <Filter>Source\3rdparty\ogl2d</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Common\Array.hpp">
-      <Filter>Source\Common</Filter>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\texture.shader.h">
+      <Filter>Source\Graphics\Shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Common\common.h">
-      <Filter>Source\Common</Filter>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Utf8.h">
+      <Filter>Source\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Game\Game.h">
+      <Filter>Source\Game</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -250,9 +283,6 @@
     <ClCompile Include="..\..\..\src\libjin\Common\utf8.cpp">
       <Filter>Source\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Core\Game.cpp">
-      <Filter>Source\Core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Filesystem\Filesystem.cpp">
       <Filter>Source\Filesystem</Filter>
     </ClCompile>
@@ -301,35 +331,50 @@
     <ClCompile Include="..\..\..\src\libjin\3rdparty\smount\smount.c">
       <Filter>Source\3rdparty\smount</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Time\Timer.cpp">
+      <Filter>Source\Time</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Bitmap.cpp">
+      <Filter>Source\Graphics</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\Canvas.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Color.cpp">
+      <Filter>Source\Graphics</Filter>
+    </ClCompile>
     <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\Texture.cpp">
+    <ClCompile Include="..\..\..\src\libjin\Graphics\FontData.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Window.cpp">
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Mesh.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Shapes.cpp">
+    <ClCompile Include="..\..\..\src\libjin\Graphics\OpenGL.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Time\Timer.cpp">
-      <Filter>Source\Time</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\Shader.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Bitmap.cpp">
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Shapes.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Color.cpp">
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Texture.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Window.cpp">
+      <Filter>Source\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Utf8.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