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.lua9
1 files changed, 3 insertions, 6 deletions
diff --git a/bin/game/main.lua b/bin/game/main.lua
index a6d19bf..b5723ad 100644
--- a/bin/game/main.lua
+++ b/bin/game/main.lua
@@ -175,11 +175,8 @@ function jin.core.onLoad()
#FRAGMENT_SHADER
Color frag(Color col, Texture tex, Vertex v)
{
- return texel(tex, v.uv);
-
float t = jin_Time.x;
- t = 0.02;
- float a = abs(sin(t)) * 3.14;
+ float a = abs(sin(t)) * 3.14;
vec2 p = vec2(0.5*cos(a) + 0.5, 0.5*sin(a) + 0.5);
vec2 dir = v.uv - p;
float d = .7 * length(dir);
@@ -350,11 +347,11 @@ function jin.core.onDraw()
jin.graphics.unuseShader()
jin.graphics.setColor(255, 255, 255, 255)
jin.graphics.useShader(jin.graphics.Shaders.Font)
- jin.graphics.print("Status\n----------------\n" .. jin.graphics.getStatsStr(), 450, 10)
+ jin.graphics.print("Stats\n----------------\n" .. jin.graphics.getStatsStr(), 450, 10)
jin.graphics.unuseShader()
jin.graphics.unbindCanvas(screen)
- jin.graphics.useShader(rgbsplit)
+ --jin.graphics.useShader(rgbsplit)
local mode = jin.graphics.getBlendMode()
jin.graphics.setBlendMode(jin.graphics.BlendMode.PREMULTIPLIEDALPHA)
jin.graphics.draw(screen, 0, 0)