+bitmap

4 files changed, 28 insertions, 12 deletions

diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj
index 9e99701..c229899 100644
--- a/build/vc++/jin.vcxproj
+++ b/build/vc++/jin.vcxproj
@@ -149,11 +149,12 @@
     <ClCompile Include="..\..\src\lua\modules\core\core.cpp" />
     <ClCompile Include="..\..\src\lua\modules\event\event.cpp" />
     <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\graphics.cpp" />
     <ClCompile Include="..\..\src\lua\modules\graphics\texture.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\graphics\jsl.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\shader.cpp" />
     <ClCompile Include="..\..\src\lua\modules\joypad\joypad.cpp" />
     <ClCompile Include="..\..\src\lua\modules\keyboard\keyboard.cpp" />
     <ClCompile Include="..\..\src\lua\modules\jin.cpp" />
diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters
index ef402f1..ec85e63 100644
--- a/build/vc++/jin.vcxproj.filters
+++ b/build/vc++/jin.vcxproj.filters
@@ -99,9 +99,6 @@
     <ClCompile Include="..\..\src\lua\modules\graphics\graphics.cpp">
       <Filter>src\modules\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\graphics\jsl.cpp">
-      <Filter>src\modules\graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\joypad\joypad.cpp">
       <Filter>src\modules\joypad</Filter>
     </ClCompile>
@@ -135,6 +132,12 @@
     <ClCompile Include="..\..\src\lua\modules\graphics\texture.cpp">
       <Filter>src\modules\graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\bitmap.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\shader.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 5c3c91c..5cea858 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -150,6 +150,7 @@
     <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\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" />
@@ -170,7 +171,7 @@
     <ClInclude Include="..\..\..\src\libjin\Math\Math.h" />
     <ClInclude Include="..\..\..\src\libjin\Math\Matrix.h" />
     <ClInclude Include="..\..\..\src\libjin\Math\Quad.h" />
-    <ClInclude Include="..\..\..\src\libjin\Math\Vector.h" />
+    <ClInclude Include="..\..\..\src\libjin\Math\Vector2.h" />
     <ClInclude Include="..\..\..\src\libjin\modules.h" />
     <ClInclude Include="..\..\..\src\libjin\Net\Net.h" />
     <ClInclude Include="..\..\..\src\libjin\Net\Socket.h" />
@@ -198,7 +199,9 @@
     <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\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" />
@@ -210,7 +213,7 @@
     <ClCompile Include="..\..\..\src\libjin\Input\Keyboard.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Input\Mouse.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Math\Matrix.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Math\Vector.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Math\Vector2.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Net\Net.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Net\Socket.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Thread\Thread.cpp" />
diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters
index 769b79a..0979c84 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -132,9 +132,6 @@
     <ClInclude Include="..\..\..\src\libjin\Math\Quad.h">
       <Filter>Source\Math</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Math\Vector.h">
-      <Filter>Source\Math</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Net\Net.h">
       <Filter>Source\Net</Filter>
     </ClInclude>
@@ -210,6 +207,12 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\base.shader.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Bitmap.h">
+      <Filter>Source\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Math\Vector2.h">
+      <Filter>Source\Math</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\src\libjin\README.md">
@@ -256,9 +259,6 @@
     <ClCompile Include="..\..\..\src\libjin\Math\Matrix.cpp">
       <Filter>Source\Math</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Math\Vector.cpp">
-      <Filter>Source\Math</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Net\Net.cpp">
       <Filter>Source\Net</Filter>
     </ClCompile>
@@ -313,5 +313,14 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\Shader.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Bitmap.cpp">
+      <Filter>Source\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Color.cpp">
+      <Filter>Source\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Math\Vector2.cpp">
+      <Filter>Source\Math</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file