diff options
Diffstat (limited to 'bin/main.lua')
| -rw-r--r-- | bin/main.lua | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/bin/main.lua b/bin/main.lua index eeec09e..f4e586a 100644 --- a/bin/main.lua +++ b/bin/main.lua @@ -4,17 +4,27 @@ local img local img2 local canvas local sw, sh = jin.graphics.getSize() +local page +local fontdata +local font + function jin.core.onLoad() local str = jin.filesystem.read("metaball.shader") shader = jin.graphics.newShader(str) local w, h = 256, 240 - local bitmap = jin.graphics.newBitmap(w, h, {255, 255, 0, 255}) + local bitmap = jin.graphics.newBitmap(w, h, {255, 0, 255, 255}) local b = bitmap:clone() bitmap = nil - -- local bitmap2 = jin.graphics.newBitmap("img2.bmp") - img = jin.graphics.newTexture(b) - -- img2 = jin.graphics.newTexture(bitmap2) - canvas = jin.graphics.newCanvas(200, 200) + local bitmap2 = jin.graphics.newBitmap("img2.bmp") + img2 = jin.graphics.newTexture(b) + img = jin.graphics.newTexture(bitmap2) + canvas = jin.graphics.newCanvas(200, 100) + + fontdata = jin.graphics.newFontData("font.ttf") + font = fontdata:newFont(15) + local str = jin.filesystem.read("text.txt") + page = font:typeset(str, 17, 0) + fontdata = nil end -- extern vec3 iResolution; -- extern number iGlobalTime; @@ -40,13 +50,11 @@ end 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.draw(img, 0, 0, 1, 1) - jin.graphics.unuseShader() - jin.graphics.unbindCanvas() - jin.graphics.draw(canvas, 0, 0, 2, 2) + --jin.graphics.useShader(shader) + -- jin.graphics.unuseShader() + jin.graphics.useShader(shader) + shader:sendNumber("dt", dt) + --jin.graphics.draw(canvas, 0, 0, 2, 2) + font:print(page, 0, 0) + -- jin.graphics.unuseShader() end
\ No newline at end of file |