diff options
Diffstat (limited to 'bin/main.lua')
| -rw-r--r-- | bin/main.lua | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/bin/main.lua b/bin/main.lua index 3f6847a..a8663f6 100644 --- a/bin/main.lua +++ b/bin/main.lua @@ -7,16 +7,10 @@ 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 + bitmap = nil -- local bitmap2 = jin.graphics.newBitmap("img2.bmp") img = jin.graphics.newTexture(b) -- img2 = jin.graphics.newTexture(bitmap2) @@ -47,12 +41,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 |