*update

4 files changed, 43 insertions, 16 deletions

diff --git a/build/.vs/libjin/v14/.suo b/build/.vs/libjin/v14/.suo
index b85a41a..db34b56 100644
--- a/build/.vs/libjin/v14/.suo
+++ b/build/.vs/libjin/v14/.suo
diff --git a/build/libjin.sln b/build/libjin.sln
index e0eaf6d..89d9ab5 100644
--- a/build/libjin.sln
+++ b/build/libjin.sln
@@ -15,6 +15,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04Network", "04Network\04Ne
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{D401F737-EEF5-4EA3-8CEA-A15523AE68AD}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05Font", "05Font\05Font.vcxproj", "{82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -63,6 +65,14 @@ Global
 		{85071432-24B6-46D4-98D8-DAA63183093C}.Release|x64.Build.0 = Release|x64
 		{85071432-24B6-46D4-98D8-DAA63183093C}.Release|x86.ActiveCfg = Release|Win32
 		{85071432-24B6-46D4-98D8-DAA63183093C}.Release|x86.Build.0 = Release|Win32
+		{82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Debug|x64.ActiveCfg = Debug|x64
+		{82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Debug|x64.Build.0 = Debug|x64
+		{82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Debug|x86.ActiveCfg = Debug|Win32
+		{82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Debug|x86.Build.0 = Debug|Win32
+		{82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Release|x64.ActiveCfg = Release|x64
+		{82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Release|x64.Build.0 = Release|x64
+		{82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Release|x86.ActiveCfg = Release|Win32
+		{82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -72,5 +82,6 @@ Global
 		{A2D75980-B0AC-498C-B507-4727B4A38E83} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD}
 		{0E49D105-2032-4825-9FA1-54B1B94E3655} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD}
 		{85071432-24B6-46D4-98D8-DAA63183093C} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD}
+		{82AA8AA6-C309-4797-8CA8-D0CADCA8D4E0} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD}
 	EndGlobalSection
 EndGlobal
diff --git a/build/libjin/libjin.vcxproj b/build/libjin/libjin.vcxproj
index 1e91426..a00e954 100644
--- a/build/libjin/libjin.vcxproj
+++ b/build/libjin/libjin.vcxproj
@@ -34,11 +34,13 @@
     <ClCompile Include="..\..\libjin\Common\utf8.cpp" />
     <ClCompile Include="..\..\libjin\Core\Game.cpp" />
     <ClCompile Include="..\..\libjin\Filesystem\Filesystem.cpp" />
+    <ClCompile Include="..\..\libjin\Graphics\Bitmap.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\Canvas.cpp" />
+    <ClCompile Include="..\..\libjin\Graphics\Color.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\Drawable.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\Font.cpp" />
-    <ClCompile Include="..\..\libjin\Graphics\Geometry.cpp" />
-    <ClCompile Include="..\..\libjin\Graphics\JSL.cpp" />
+    <ClCompile Include="..\..\libjin\Graphics\Shader.cpp" />
+    <ClCompile Include="..\..\libjin\Graphics\Shapes.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\Texture.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\Window.cpp" />
     <ClCompile Include="..\..\libjin\Input\Event.cpp" />
@@ -85,13 +87,15 @@
     <ClInclude Include="..\..\libjin\Debug\Log.h" />
     <ClInclude Include="..\..\libjin\Filesystem\Buffer.h" />
     <ClInclude Include="..\..\libjin\Filesystem\Filesystem.h" />
+    <ClInclude Include="..\..\libjin\Graphics\base.shader.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Bitmap.h" />
     <ClInclude Include="..\..\libjin\Graphics\Canvas.h" />
     <ClInclude Include="..\..\libjin\Graphics\Color.h" />
     <ClInclude Include="..\..\libjin\Graphics\Drawable.h" />
     <ClInclude Include="..\..\libjin\Graphics\Font.h" />
-    <ClInclude Include="..\..\libjin\Graphics\Geometry.h" />
     <ClInclude Include="..\..\libjin\Graphics\Graphics.h" />
-    <ClInclude Include="..\..\libjin\Graphics\JSL.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Shader.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Shapes.h" />
     <ClInclude Include="..\..\libjin\Graphics\Texture.h" />
     <ClInclude Include="..\..\libjin\Graphics\Window.h" />
     <ClInclude Include="..\..\libjin\Input\Event.h" />
diff --git a/build/libjin/libjin.vcxproj.filters b/build/libjin/libjin.vcxproj.filters
index edc9a94..c24d727 100644
--- a/build/libjin/libjin.vcxproj.filters
+++ b/build/libjin/libjin.vcxproj.filters
@@ -153,12 +153,6 @@
     <ClCompile Include="..\..\libjin\Graphics\Font.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libjin\Graphics\Geometry.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libjin\Graphics\JSL.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\libjin\Graphics\Texture.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
@@ -219,6 +213,18 @@
     <ClCompile Include="..\..\libjin\Net\Socket.cpp">
       <Filter>Net</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libjin\Graphics\Bitmap.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libjin\Graphics\Color.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libjin\Graphics\Shader.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libjin\Graphics\Shapes.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\libjin\3rdparty\GLee\GLee.h">
@@ -296,15 +302,9 @@
     <ClInclude Include="..\..\libjin\Graphics\Font.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Graphics\Geometry.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\libjin\Graphics\Graphics.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Graphics\JSL.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\libjin\Graphics\Texture.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -418,6 +418,18 @@
     <ClInclude Include="..\..\libjin\Net\Socket.h">
       <Filter>Net</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\libjin\Graphics\base.shader.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libjin\Graphics\Bitmap.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libjin\Graphics\Shader.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libjin\Graphics\Shapes.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\libjin\README.md" />