diff options
| -rw-r--r-- | client/player/marker/interact_marker.gdshader | 12 | ||||
| -rw-r--r-- | client/player/marker/marker.gd | 2 | ||||
| -rw-r--r-- | client/player/marker/marker.tscn | 1 |
3 files changed, 3 insertions, 12 deletions
diff --git a/client/player/marker/interact_marker.gdshader b/client/player/marker/interact_marker.gdshader index c5eddc53..1c910566 100644 --- a/client/player/marker/interact_marker.gdshader +++ b/client/player/marker/interact_marker.gdshader @@ -22,25 +22,17 @@ render_mode depth_test_disabled; uniform float max_width = .1; uniform float marker_length = .5; uniform float pulse_speed = 4.; -uniform bool interactive = false; uniform bool interacting = false; void fragment() { if (interacting) { ALBEDO = vec3(0., 0., 15.); - } else if (interactive) { - ALBEDO = vec3(15., 0., 0.); } else { - ALBEDO = vec3(.1, .1, .1); + ALBEDO = vec3(15., 0., 0.); } vec2 uv = abs(2. * UV.xy - 1.); float m_length = marker_length / max_width; - float anim; - if (interactive || interacting) { - anim = sin(TIME * pulse_speed) * .5 + 2.; - } else { - anim = .5; - } + float anim = sin(TIME * pulse_speed) * .5 + 2.; float alpha = step( 1. - max_width * anim, max(uv.x, uv.y)) * step(1. - max_width * m_length, min(uv.x, uv.y) diff --git a/client/player/marker/marker.gd b/client/player/marker/marker.gd index 07f6bfe8..a9ea6d0d 100644 --- a/client/player/marker/marker.gd +++ b/client/player/marker/marker.gd @@ -21,7 +21,7 @@ extends Node3D @onready var mat: ShaderMaterial = _cube.get_active_material(0) func set_interactive(val: bool): - mat.set_shader_parameter("interactive", val) + visible = val func set_interacting(val: bool): mat.set_shader_parameter("interacting", val) diff --git a/client/player/marker/marker.tscn b/client/player/marker/marker.tscn index f4dd61e8..8ff8a2a6 100644 --- a/client/player/marker/marker.tscn +++ b/client/player/marker/marker.tscn @@ -41,7 +41,6 @@ shader = ExtResource("2_dejwy") shader_parameter/max_width = 0.1 shader_parameter/marker_length = 0.5 shader_parameter/pulse_speed = 4.0 -shader_parameter/interactive = false shader_parameter/interacting = false [node name="Marker" type="Node3D"] |