From b4bd76b8b02996767798b76cc65dee9ea27f1167 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Fri, 7 Dec 2018 08:46:17 +0800
Subject: *misc

---
 bin/ParticleSystem.exe | Bin 1053696 -> 0 bytes
 bin/SDL2.dll           | Bin 1279488 -> 1279488 bytes
 bin/game/config.lua    |   2 +-
 bin/game/main.lua      |  10 +++++-----
 bin/jin.exe            | Bin 1597440 -> 2056704 bytes
 bin/lua51.dll          | Bin 364544 -> 364544 bytes
 6 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 bin/ParticleSystem.exe

(limited to 'bin')

diff --git a/bin/ParticleSystem.exe b/bin/ParticleSystem.exe
deleted file mode 100644
index b3ffd73..0000000
Binary files a/bin/ParticleSystem.exe and /dev/null differ
diff --git a/bin/SDL2.dll b/bin/SDL2.dll
index 65f23c8..0b08ce2 100644
Binary files a/bin/SDL2.dll and b/bin/SDL2.dll differ
diff --git a/bin/game/config.lua b/bin/game/config.lua
index 095ee28..ba2e9df 100644
--- a/bin/game/config.lua
+++ b/bin/game/config.lua
@@ -1,6 +1,6 @@
 return 
 {
     title = "window form", 
-    icon = "splash.png",
+    --icon = "splash.png",
 	vsync = true
 }
\ No newline at end of file
diff --git a/bin/game/main.lua b/bin/game/main.lua
index 9070d2c..8ff5e68 100644
--- a/bin/game/main.lua
+++ b/bin/game/main.lua
@@ -61,9 +61,9 @@ local function createAnimation(path, count, r, c, w, h, loop, speed)
 end
 
 function jin.core.onLoad()
-	bitmap = jin.graphics.newBitmap(200, 200, function(w, h, x, y)
-		return {255*math.sin(x/w),255 - 255,255*math.cos(y/w),255}
-	end)
+	-- bitmap = jin.graphics.newBitmap(200, 200, function(w, h, x, y)
+		-- return {255*math.sin(x/w),255 - 255,255*math.cos(y/w),255}
+	-- end)
     shader_program = jin.graphics.newShader(shader)
     shader_program2 = jin.graphics.newShader(shader2)
 	local animation = createAnimation("anim2.png", 27, 3, 10, 200, 200, true, 50)
@@ -113,12 +113,12 @@ function jin.core.onDraw()
     --jin.graphics.draw(sprs[2], 150, 150, 1, 1, 0)
 	local x, y = jin.mouse.getPosition()
 	animator:render(x, y, 1, 1, 0)
-	jin.graphics.print(#sprs, 10, 10)
+	--jin.graphics.print(#sprs, 10, 10)
     jin.graphics.draw(spr, 100, 200, 1, 1, 0)
     --jin.graphics.useShader(shader_program2)
     --jin.graphics.draw(tex, 0, 0,0.2, 0.2)
     --jin.graphics.unuseShader()
     if stop then 
-        jin.graphics.print("Quit", 100, 300)
+        --jin.graphics.print("Quit", 100, 300)
     end 
 end
\ No newline at end of file
diff --git a/bin/jin.exe b/bin/jin.exe
index 92d3665..b2288e4 100644
Binary files a/bin/jin.exe and b/bin/jin.exe differ
diff --git a/bin/lua51.dll b/bin/lua51.dll
index a47ab15..5f7d120 100644
Binary files a/bin/lua51.dll and b/bin/lua51.dll differ
-- 
cgit v1.1-26-g67d0