aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/map/tiles/button/button.gd3
-rw-r--r--client/player/marker/interact_marker.gdshader6
2 files changed, 3 insertions, 6 deletions
diff --git a/client/map/tiles/button/button.gd b/client/map/tiles/button/button.gd
index b806f58f..16359d23 100644
--- a/client/map/tiles/button/button.gd
+++ b/client/map/tiles/button/button.gd
@@ -16,9 +16,6 @@
class_name Button_
extends Tile
-#static func interact_target() -> Vector3:
-# return Vector3(0, 0.25, 0)
-
var button: ButtonModel = load("res://map/tiles/button/button.tscn").instantiate()
func _init(ctx: TileFactory.TileCC):
diff --git a/client/player/marker/interact_marker.gdshader b/client/player/marker/interact_marker.gdshader
index a85147ca..c3bc498b 100644
--- a/client/player/marker/interact_marker.gdshader
+++ b/client/player/marker/interact_marker.gdshader
@@ -16,7 +16,7 @@
*/
shader_type spatial;
-render_mode depth_test_disabled;
+render_mode depth_test_disabled, unshaded;
uniform float max_width = .1;
uniform float marker_length = .5;
@@ -25,9 +25,9 @@ uniform bool interacting = false;
void fragment() {
if (interacting) {
- ALBEDO = vec3(0., 0., 15.);
+ ALBEDO = vec3(0., 0., 5.);
} else {
- ALBEDO = vec3(15., 0., 0.);
+ ALBEDO = vec3(5., 0., 0.);
}
vec2 uv = abs(2. * UV.xy - 1.);
float m_length = marker_length / max_width;