diff options
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/game/main.lua | 7 | ||||
| -rw-r--r-- | bin/jin.exe | bin | 576512 -> 576512 bytes |
2 files changed, 5 insertions, 2 deletions
diff --git a/bin/game/main.lua b/bin/game/main.lua index 2dc358e..bba760e 100644 --- a/bin/game/main.lua +++ b/bin/game/main.lua @@ -186,7 +186,6 @@ function jin.core.onLoad() vec4 c1 = texel(tex, v.uv - value / jin_RenderTargetSize.x); vec4 c2 = texel(tex, v.uv); vec4 c3 = texel(tex, v.uv + value / jin_RenderTargetSize.y); - return vec4(c1.r, c2.g, c3.b, c1.a + c2.a + c3.b); } #END_FRAGMENT_SHADER @@ -322,7 +321,9 @@ function jin.core.onDraw() --jin.graphics.draw(sprs[2], 150, 150, 1, 1, 0) local x, y = jin.mouse.getPosition() animator:render(350, 150, 1, 1, 0) + jin.graphics.useShader(jin.graphics.Shaders.Font) jin.graphics.print("* Particle system test\n* Animation test.", 10, 10) + jin.graphics.unuseShader() jin.graphics.draw(spr, 100, 200, 1, 1, 0) jin.graphics.useShader(jin.graphics.Shaders.Mesh) jin.graphics.draw(mesh, 200, 100) @@ -337,8 +338,10 @@ function jin.core.onDraw() jin.graphics.rect(jin.graphics.RenderMode.FILL, 440, 0, 140, 120) jin.graphics.unuseShader() jin.graphics.setColor(255, 255, 255, 255) + jin.graphics.useShader(jin.graphics.Shaders.Font) jin.graphics.print(jin.graphics.getStatsStr(), 450, 10) - jin.graphics.unbindCanvas(screen) + jin.graphics.unuseShader() + jin.graphics.unbindCanvas(screen) jin.graphics.useShader(rgbsplit) jin.graphics.draw(screen, 0, 0) diff --git a/bin/jin.exe b/bin/jin.exe Binary files differindex c9ca1dc..581d1d5 100644 --- a/bin/jin.exe +++ b/bin/jin.exe |