From c9bb26a90f3445cc6ca0bdfcb8283361dc9e6174 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 8 Sep 2018 13:09:20 +0800
Subject: *update

---
 bin/Jin.exe                              | Bin 1416192 -> 1417728 bytes
 bin/jin.exe                              | Bin 1416192 -> 1417728 bytes
 bin/main.lua                             |  17 ++++++++++++-----
 build/vc++/jin.vcxproj                   |   4 +++-
 build/vc++/jin.vcxproj.filters           |  12 +++++++++---
 build/vc++/libjin/libjin.vcxproj.filters |   6 +++---
 6 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/bin/Jin.exe b/bin/Jin.exe
index 9651439..2650fea 100644
Binary files a/bin/Jin.exe and b/bin/Jin.exe differ
diff --git a/bin/jin.exe b/bin/jin.exe
index 9651439..2650fea 100644
Binary files a/bin/jin.exe and b/bin/jin.exe differ
diff --git a/bin/main.lua b/bin/main.lua
index 2ff6563..3f6847a 100644
--- a/bin/main.lua
+++ b/bin/main.lua
@@ -7,9 +7,16 @@ local sw, sh = jin.graphics.getSize()
 function jin.core.onLoad()
     local str = jin.filesystem.read("metaball.shader")
     shader = jin.graphics.newShader(str)
+	if shader == nil then 
+		print(jin.error)
+	end
     local w, h = 256, 240
 	local bitmap = jin.graphics.newBitmap(w, h, {255, 255, 0, 255})
 	local b = bitmap:clone()
+	local b2= jin.graphics.newBitmap("asdasd")
+	if b2 == nil then 
+		print(jin.error)
+	end
 	-- local bitmap2 = jin.graphics.newBitmap("img2.bmp")
     img = jin.graphics.newTexture(b)
     -- img2 = jin.graphics.newTexture(bitmap2)
@@ -40,12 +47,12 @@ local dt = 0
 function jin.core.onDraw()
     dt = dt + 0.1
     jin.graphics.bindCanvas(canvas)
-    jin.graphics.useShader(shader)
-    shader:sendNumber("iGlobalTime", dt )
-    shader:sendVec3("iResolution", sw, sh, 1)
-    shader:sendVec4("iMouse", mx, my, mx, my)
+    -- jin.graphics.useShader(shader)
+    -- shader:sendNumber("iGlobalTime", dt )
+    -- shader:sendVec3("iResolution", sw, sh, 1)
+    -- shader:sendVec4("iMouse", mx, my, mx, my)
     jin.graphics.draw(img, 0, 0, 1, 1)
-    jin.graphics.unuseShader()
+    -- jin.graphics.unuseShader()
     jin.graphics.unbindCanvas()
     jin.graphics.draw(canvas, 0, 0, 1, 1)
 end
\ No newline at end of file
diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj
index 35fb1fe..62b7572 100644
--- a/build/vc++/jin.vcxproj
+++ b/build/vc++/jin.vcxproj
@@ -93,7 +93,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>
@@ -168,8 +168,10 @@
     <ClCompile Include="..\..\src\main.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\src\luax.h" />
     <ClInclude Include="..\..\src\lua\common\common.h" />
     <ClInclude Include="..\..\src\lua\common\constant.h" />
+    <ClInclude Include="..\..\src\lua\common\error.h" />
     <ClInclude Include="..\..\src\lua\common\Proxy.h" />
     <ClInclude Include="..\..\src\lua\common\Reference.hpp" />
     <ClInclude Include="..\..\src\lua\libraries\luax\luax.h" />
diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters
index ec85e63..b4dc913 100644
--- a/build/vc++/jin.vcxproj.filters
+++ b/build/vc++/jin.vcxproj.filters
@@ -176,9 +176,6 @@
     <ClInclude Include="..\..\src\lua\modules\net\Buffer.h">
       <Filter>src\modules\net</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\lua\modules\luax.h">
-      <Filter>src\modules</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\lua\libraries\luax\luax.h">
       <Filter>src\libraries\luax</Filter>
     </ClInclude>
@@ -197,6 +194,15 @@
     <ClInclude Include="..\..\src\lua\modules\embed\boot.lua.h">
       <Filter>src\modules\embed</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\luax.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\common\error.h">
+      <Filter>src\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\luax.h">
+      <Filter>src\modules</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="jin.rc">
diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters
index efa4305..8cf8ffd 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -60,9 +60,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\src\libjin\jin.h">
-      <Filter>Source</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\modules.h">
       <Filter>Source</Filter>
     </ClInclude>
@@ -219,6 +216,9 @@
     <ClInclude Include="..\..\..\src\libjin\Math\Vector4.hpp">
       <Filter>Source\Math</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\jin.h">
+      <Filter>Source</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\src\libjin\README.md">
-- 
cgit v1.1-26-g67d0