diff --git a/Scenes/bug_marker.tscn b/Scenes/bug_marker.tscn index 8bf2c02..676b3dc 100644 --- a/Scenes/bug_marker.tscn +++ b/Scenes/bug_marker.tscn @@ -32,8 +32,9 @@ mesh = SubResource("QuadMesh_dd1nc") [node name="Info" type="Area3D" parent="Billboard" groups=["BugMarkerInfo"]] collision_layer = 4294967295 -collision_mask = 4294967295 +collision_mask = 0 monitoring = false +monitorable = false [node name="CollisionShape3D" type="CollisionShape3D" parent="Billboard/Info"] shape = SubResource("SphereShape3D_t2p88") diff --git a/Scenes/bugbot_player.gd b/Scenes/bugbot_player.gd index 99267f8..a15f0a7 100644 --- a/Scenes/bugbot_player.gd +++ b/Scenes/bugbot_player.gd @@ -292,6 +292,12 @@ func __raycast_to_world(): __laser_beam.visible = false func __place_marker(_position:Vector3, _normal:Vector3): + if __raycast_collision: + var collider : Area3D = __raycast_collision["collider"] as Area3D + if collider and collider.is_in_group("BugMarkerInfo"): + print("Hit a guy!") + return + var marker : BugMarker = (load(bug_marker) as PackedScene).instantiate() as BugMarker get_tree().get_root().add_child(marker) marker.global_position = _position @@ -300,9 +306,8 @@ func __place_marker(_position:Vector3, _normal:Vector3): func __place_dummy_marker(): - if __bug_marker_dummy: - if __raycast_collision: - __bug_marker_dummy.set_rotation_to_normal(__raycast_collision["normal"]) - __bug_marker_dummy.visible = true - else: - __bug_marker_dummy.visible = false + if __raycast_collision: + __bug_marker_dummy.set_rotation_to_normal(__raycast_collision["normal"]) + __bug_marker_dummy.visible = true + else: + __bug_marker_dummy.visible = false