From 090b303a88b493eca0bde51b5a454043c893b0d8 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 6 Oct 2018 08:07:35 +0800 Subject: *update --- bin/Jin.exe | Bin 498176 -> 479744 bytes bin/jin.exe | Bin 498176 -> 479744 bytes bin/main.lua | 3 +-- bin/metaball.shader | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/Jin.exe b/bin/Jin.exe index ba89bf2..7c364e0 100644 Binary files a/bin/Jin.exe and b/bin/Jin.exe differ diff --git a/bin/jin.exe b/bin/jin.exe index ba89bf2..7c364e0 100644 Binary files a/bin/jin.exe and b/bin/jin.exe differ diff --git a/bin/main.lua b/bin/main.lua index f4e586a..2a9ee22 100644 --- a/bin/main.lua +++ b/bin/main.lua @@ -5,7 +5,6 @@ local img2 local canvas local sw, sh = jin.graphics.getSize() local page -local fontdata local font function jin.core.onLoad() @@ -20,7 +19,7 @@ function jin.core.onLoad() img = jin.graphics.newTexture(bitmap2) canvas = jin.graphics.newCanvas(200, 100) - fontdata = jin.graphics.newFontData("font.ttf") + local fontdata = jin.graphics.newFontData("font.ttf") font = fontdata:newFont(15) local str = jin.filesystem.read("text.txt") page = font:typeset(str, 17, 0) diff --git a/bin/metaball.shader b/bin/metaball.shader index 7d3b759..67be889 100644 --- a/bin/metaball.shader +++ b/bin/metaball.shader @@ -21,4 +21,4 @@ Color frag(Color col, Texture tex, Vertex v) return c; } -#END_FRAGMENT_SHADER \ No newline at end of file +#END_FRAGMENT_SHADER -- cgit v1.1-26-g67d0