aboutsummaryrefslogtreecommitdiff
path: root/bin/main.lua
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-09-08 13:09:20 +0800
committerchai <chaifix@163.com>2018-09-08 13:09:20 +0800
commitc9bb26a90f3445cc6ca0bdfcb8283361dc9e6174 (patch)
treefc3bd5dcca20fa9d40a09b1c43bbd3831245e620 /bin/main.lua
parent4798e70dcbbedb55de8e9f8e321e8fad7b9783f6 (diff)
*update
Diffstat (limited to 'bin/main.lua')
-rw-r--r--bin/main.lua17
1 files changed, 12 insertions, 5 deletions
diff --git a/bin/main.lua b/bin/main.lua
index 2ff6563..3f6847a 100644
--- a/bin/main.lua
+++ b/bin/main.lua
@@ -7,9 +7,16 @@ 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
-- local bitmap2 = jin.graphics.newBitmap("img2.bmp")
img = jin.graphics.newTexture(b)
-- img2 = jin.graphics.newTexture(bitmap2)
@@ -40,12 +47,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