aboutsummaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-09-29 18:22:51 +0200
committermetamuffin <metamuffin@disroot.org>2025-09-29 18:23:02 +0200
commit272e2472fedf97d64a69dda7ffa10bedeca7576c (patch)
tree7961817ca5b79399a54360c8481f624a4b39ad70 /client
parent9956c45322ed1326ccd487993e9b4f6658663c4c (diff)
downloadhurrycurry-272e2472fedf97d64a69dda7ffa10bedeca7576c.tar
hurrycurry-272e2472fedf97d64a69dda7ffa10bedeca7576c.tar.bz2
hurrycurry-272e2472fedf97d64a69dda7ffa10bedeca7576c.tar.zst
floor shader color uniforms
Diffstat (limited to 'client')
-rw-r--r--client/map/tiles/floor.gdshader5
-rw-r--r--client/map/tiles/floor_material.tres3
2 files changed, 5 insertions, 3 deletions
diff --git a/client/map/tiles/floor.gdshader b/client/map/tiles/floor.gdshader
index b2270847..a1567189 100644
--- a/client/map/tiles/floor.gdshader
+++ b/client/map/tiles/floor.gdshader
@@ -18,7 +18,8 @@
shader_type spatial;
uniform float eps = .01;
-uniform vec3 color : source_color;
+uniform vec3 color_a : source_color;
+uniform vec3 color_b : source_color;
void fragment() {
vec2 uv = UV;
@@ -28,5 +29,5 @@ void fragment() {
uv.y = smoothstep(0.5 - eps, 0.5 + eps, uv.y) * smoothstep(1. + eps, 1. - eps, uv.y)
+ smoothstep(0. + eps, 0. - eps, uv.y);
uv = uv * 2. - 1.;
- ALBEDO = max(vec3(uv.x * uv.y), color);
+ ALBEDO = mix(color_a, color_b, clamp(uv.x * uv.y, 0., 1.));
}
diff --git a/client/map/tiles/floor_material.tres b/client/map/tiles/floor_material.tres
index a1a78b46..d0d4ad4f 100644
--- a/client/map/tiles/floor_material.tres
+++ b/client/map/tiles/floor_material.tres
@@ -6,4 +6,5 @@
render_priority = 0
shader = ExtResource("1_7ju4h")
shader_parameter/eps = 0.01
-shader_parameter/color = Color(0.384314, 0.4, 0.419608, 1)
+shader_parameter/color_a = Color(0.47504258, 0.47504288, 0.47504282, 1)
+shader_parameter/color_b = Color(0.95029587, 0.95029587, 0.95029587, 1)