From a4db0e0622a3764d090a8c2ecf8bd5b56442ccef Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Fri, 16 Nov 2018 21:29:52 +0800
Subject: =?UTF-8?q?*=E6=9B=B4=E6=96=B0=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/Jin.exe       | Bin 2499584 -> 2265600 bytes
 bin/SDL2.dll      | Bin 1279488 -> 1242112 bytes
 bin/game/main.lua |   8 +++++---
 bin/jin.exe       | Bin 2499584 -> 2265600 bytes
 4 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/Jin.exe b/bin/Jin.exe
index 0645634..7009d01 100644
Binary files a/bin/Jin.exe and b/bin/Jin.exe differ
diff --git a/bin/SDL2.dll b/bin/SDL2.dll
index dfc7d55..c381d42 100644
Binary files a/bin/SDL2.dll and b/bin/SDL2.dll differ
diff --git a/bin/game/main.lua b/bin/game/main.lua
index ce22f46..ca260d7 100644
--- a/bin/game/main.lua
+++ b/bin/game/main.lua
@@ -24,6 +24,8 @@ Vertex vert(Vertex v)
 #FRAGMENT_SHADER 
 Color frag(Color col, Texture tex, Vertex v)
 {
+	if(v.xy.x > 30)
+		return Color(1, 0, 0, 1);
     Color c = texel(tex, v.uv);
 	return c;
 }
@@ -40,7 +42,7 @@ local spr = nil
 local bitmap = nil
 function jin.core.onLoad()
 	bitmap = jin.graphics.newBitmap(128, 128, function(w, h, x, y)
-		return {255*math.sin(x/w),255 - 255*math.cos(y/w),0,255}
+		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)
@@ -69,8 +71,8 @@ function jin.core.onLoad()
         --timer:cancel(h)
     end, h)
 	jin.graphics.pushMatrix()
-	--jin.graphics.translate(100, 0)
-	jin.graphics.rotate(0.2)
+	jin.graphics.translate(10, 0)
+	--jin.graphics.rotate(0.2)
 end
 local stop = false
 
diff --git a/bin/jin.exe b/bin/jin.exe
index 0645634..7009d01 100644
Binary files a/bin/jin.exe and b/bin/jin.exe differ
-- 
cgit v1.1-26-g67d0