aboutsummaryrefslogtreecommitdiff
path: root/bin/game/main.lua
diff options
context:
space:
mode:
Diffstat (limited to 'bin/game/main.lua')
-rw-r--r--bin/game/main.lua20
1 files changed, 11 insertions, 9 deletions
diff --git a/bin/game/main.lua b/bin/game/main.lua
index 5986073..35c1695 100644
--- a/bin/game/main.lua
+++ b/bin/game/main.lua
@@ -25,7 +25,7 @@ Vertex vert(Vertex v)
Color frag(Color col, Texture tex, Vertex v)
{
Color c = texel(tex, v.uv);
- return c;
+ return c * col;
}
#END_FRAGMENT_SHADER
]]
@@ -42,22 +42,24 @@ function jin.core.onLoad()
shader_program = jin.graphics.newShader(shader)
shader_program2 = jin.graphics.newShader(shader2)
tex = jin.graphics.newTexture("1.png")
- spr = jin.graphics.newSprite()
+ local ssheet = jin.graphics.newSpriteSheet(tex)
+ spr = ssheet:newSprite(50, 50, 50, 50)
+ spr:setPosition(0, 50)
spr:setShader(shader_program2)
- spr:setGraphic(tex)
tex = nil
- spr:setScale(4, 4)
- spr:setOrigin(jin.graphics.SpriteOrigin.MIDDLELEFT)
- music = jin.audio.newSource("forest.ogg")
- music:setVolume(0.5)
- music:setLoop(true)
+ spr:setScale(2, 2)
+ spr:setColor(100, 0, 100, 255)
+ spr:setOrigin(jin.graphics.SpriteOrigin.BOTTOMCENTER)
+ -- music = jin.audio.newSource("forest.ogg")
+ -- music:setVolume(0.5)
+ -- music:setLoop(true)
--music:play()
jin.graphics.clear()
jin.graphics.showWindow()
timer = jin.time.newTimer()
local h = timer:every(0.5, function(sp)
local x, y = spr:getPosition()
- spr:setPosition(x + 1, y)
+ spr:move(1, 0)
end, spr)
timer:after(3, function(p)
--timer:cancel(h)