diff options
| author | Alexander M Pickering <alex@cogarr.net> | 2025-01-26 15:21:55 -0600 |
|---|---|---|
| committer | Alexander M Pickering <alex@cogarr.net> | 2025-01-26 15:21:55 -0600 |
| commit | f7a6cb3573957ae617bf88a05f72cb22bb912abd (patch) | |
| tree | 9bd8dabfcbd5808a74d995c93dc6f3f611da13f8 /src/shaders | |
| parent | 5846a4fea8d6a993466a792977128d21a18587bc (diff) | |
| download | ggj25-f7a6cb3573957ae617bf88a05f72cb22bb912abd.tar.gz ggj25-f7a6cb3573957ae617bf88a05f72cb22bb912abd.tar.bz2 ggj25-f7a6cb3573957ae617bf88a05f72cb22bb912abd.zip | |
Revert "final commit"
This reverts commit c39ff632b46c179709101c5b50a061ebd723689f.
Diffstat (limited to 'src/shaders')
| -rw-r--r-- | src/shaders/land.frag | 16 | ||||
| -rw-r--r-- | src/shaders/stars.lua | 2 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/shaders/land.frag b/src/shaders/land.frag index 54ca24d..1eb8d93 100644 --- a/src/shaders/land.frag +++ b/src/shaders/land.frag @@ -19,7 +19,6 @@ uniform float time; //used for noise uniform sampler2D atlas; uniform float nlamps; uniform float water; -//uniform sampler2D bubbles; varying vec2 worldxy; varying vec2 norm; @@ -79,21 +78,8 @@ void main() { float rng = random(vec2(coord.x, coord.y) + vec2(color, time)); color -= (pow(rng / 1.3, 10. * color)) * streamer; // add noise to water - if(water > 1.){ + if(water > 1.) color += (noise(coord.xy + vec2(time, time)) - 0.0) * 0.1; - } - if(water > 2.){ - color -= noise(coord.xy + vec2(time,time)) * 0.3; - } - /* - for(int i = 1; i < 1024; i++){ - vec4 bubble = texture2D(bubbles,vec2(i,0)); - /* - if(distance(bubble.xy, coord.xy) < 10.){ - color = 1.; - } - */ - //} /* */ if(color > 1.) gl_FragColor = highlight * normal.a; diff --git a/src/shaders/stars.lua b/src/shaders/stars.lua index 95938b4..3e4138e 100644 --- a/src/shaders/stars.lua +++ b/src/shaders/stars.lua @@ -68,7 +68,7 @@ node:action(function(self) self("bind").world_y = world.world_y local lamps = world.level.lamps_on_screen() for i,v in pairs(lamps) do - --print("Setting lamp", i, "to", v) + print("Setting lamp", i, "to", v) self("bind")["lamp" .. tostring(i)] = v end end) |