add toggle to hide NPCs

Author: severin-lemaignan

Game.gd

@@ -73,6 +73,8 @@ func _ready():
 
 	$CanvasLayer/GameModeSelection.visible = false
 	var _err = $CanvasLayer/UI/Settings.connect("on_toggle_laser", self, "toggle_robots_lasers")
+	_err = $CanvasLayer/UI/Settings.connect("on_toggle_npcs", self, "toggle_npcs")
+	toggle_npcs($CanvasLayer/UI/Settings.NPCsBtn.pressed)
 
 	set_physics_process(false)
 
@@ -327,6 +329,9 @@ func compute_visible_humans(robot):
 	return robot.players_in_fov
 
 func is_object_visible(object, camera):
+	if not object.visible:
+		return null
+		
 	var target = object.global_transform.origin
 	if is_point_in_frustum(target, camera):
 		var space_state = get_world().direct_space_state
@@ -508,6 +513,11 @@ func toggle_robots_lasers(state):
 	for robot in $Robots.get_children():
 		robot.get_node("LaserScanner").visible = state
 
+func toggle_npcs(state):
+	for npc_path in $NPCPath.get_children():
+		npc_path.get_child(0).get_child(0).visible = state
+		npc_path.get_child(0).get_child(0).face.visible = state
+
 remote func pre_configure_game():
 
 	var selfPeerID = "myself" # used in STANDALONE mode

Game.tscn

@@ -180,7 +180,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.808762, 0, -0.378852 )
 curve = SubResource( 2 )
 
 [node name="NPC1" parent="NPCPath/NPCPath1" instance=ExtResource( 7 )]
-transform = Transform( 0.330899, 0, 0.943662, 0, 1, 0, -0.943667, 0, 0.330898, -5.06129, 1.52588e-05, 4.86618 )
+transform = Transform( 0.330899, 0, 0.943661, 0, 1, 0, -0.943667, 0, 0.330897, -5.06129, 1.52588e-05, 4.86618 )
 skin = ExtResource( 9 )
 npc_name = "Anna"
 
@@ -189,7 +189,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -11.427, 0, -1.33055 )
 curve = SubResource( 3 )
 
 [node name="NPC2" parent="NPCPath/NPCPath2" instance=ExtResource( 7 )]
-transform = Transform( 0.990202, 0, 0.139646, 0, 1, 0, -0.139646, 0, 0.990198, 4.22644, 0, 0.860942 )
+transform = Transform( 0.990202, 0, 0.139645, 0, 1, 0, -0.139646, 0, 0.990197, 4.22644, 0, 0.860942 )
 skin = ExtResource( 8 )
 npc_name = "Nicky"
 

Settings.gd

@@ -1,9 +1,13 @@
 extends ColorRect
 
 signal on_toggle_laser
+signal on_toggle_npcs
+
+onready var NPCsBtn = $CenterContainer/VBoxContainer/HBoxContainer3/NPCsEnabled
 
 # used when pressing 'cancel'
 var original_state_laser
+var original_state_npcs
 
 func _ready():
 	visible = false
@@ -13,10 +17,13 @@ func _ready():
 	_err = $CenterContainer/VBoxContainer/HBoxContainer2/ok.connect("pressed", self, "on_ok")
 	_err = $CenterContainer/VBoxContainer/HBoxContainer2/cancel.connect("pressed", self, "on_cancel")
 	_err = $CenterContainer/VBoxContainer/HBoxContainer/LaserEnabled.connect("toggled", self, "on_toggle_laser")
+	_err = NPCsBtn.connect("toggled", self, "on_toggle_npcs")
+
 
 func show(msg = null):
 
 	original_state_laser = $CenterContainer/VBoxContainer/HBoxContainer/LaserEnabled.pressed
+	original_state_npcs = NPCsBtn.pressed
 
 	if msg:
 		$CenterContainer/VBoxContainer/Label.text = msg
@@ -31,6 +38,10 @@ func on_toggle_laser(state):
 
 	emit_signal("on_toggle_laser", state)
 
+func on_toggle_npcs(state):
+
+	emit_signal("on_toggle_npcs", state)
+
 func on_ok():
 
 	$Tween.remove_all()
@@ -45,6 +56,8 @@ func on_cancel():
 
 	$CenterContainer/VBoxContainer/HBoxContainer/LaserEnabled.pressed = original_state_laser
 	on_toggle_laser(original_state_laser)
+	NPCsBtn.pressed = original_state_npcs
+	on_toggle_npcs(original_state_npcs)
 
 	$Tween.remove_all()
 	$Tween.interpolate_property(self, "modulate:a", null, 0.0, 0.5, Tween.TRANS_QUART, Tween.EASE_IN)

Settings.tscn

@@ -31,42 +31,42 @@ __meta__ = {
 
 [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
 margin_left = 344.0
-margin_top = 128.0
+margin_top = 92.0
 margin_right = 679.0
-margin_bottom = 471.0
+margin_bottom = 508.0
 custom_constants/separation = 20
 
 [node name="Settings" type="Label" parent="CenterContainer/VBoxContainer"]
 margin_right = 335.0
-margin_bottom = 17.0
+margin_bottom = 20.0
 theme = ExtResource( 1 )
 text = "Settings"
 align = 1
 
 [node name="Control3" type="Control" parent="CenterContainer/VBoxContainer"]
-margin_top = 37.0
+margin_top = 40.0
 margin_right = 335.0
-margin_bottom = 87.0
+margin_bottom = 90.0
 rect_min_size = Vector2( 50, 50 )
 size_flags_horizontal = 3
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
-margin_top = 107.0
+margin_top = 110.0
 margin_right = 335.0
-margin_bottom = 157.0
+margin_bottom = 160.0
 
 [node name="Label" type="Label" parent="CenterContainer/VBoxContainer/HBoxContainer"]
-margin_top = 16.0
-margin_right = 75.0
-margin_bottom = 33.0
+margin_top = 15.0
+margin_right = 96.0
+margin_bottom = 35.0
 theme = ExtResource( 1 )
 text = "Laser visible"
 
 [node name="Control" type="Control" parent="CenterContainer/VBoxContainer/HBoxContainer"]
-margin_left = 79.0
+margin_left = 100.0
 margin_right = 281.0
 margin_bottom = 50.0
 rect_min_size = Vector2( 50, 50 )
@@ -82,17 +82,46 @@ texture_normal = ExtResource( 10 )
 texture_pressed = ExtResource( 11 )
 expand = true
 
+[node name="HBoxContainer3" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
+margin_top = 180.0
+margin_right = 335.0
+margin_bottom = 230.0
+
+[node name="Label" type="Label" parent="CenterContainer/VBoxContainer/HBoxContainer3"]
+margin_top = 15.0
+margin_right = 98.0
+margin_bottom = 35.0
+theme = ExtResource( 1 )
+text = "Enable NPCs"
+
+[node name="Control" type="Control" parent="CenterContainer/VBoxContainer/HBoxContainer3"]
+margin_left = 102.0
+margin_right = 281.0
+margin_bottom = 50.0
+rect_min_size = Vector2( 50, 50 )
+size_flags_horizontal = 3
+
+[node name="NPCsEnabled" type="TextureButton" parent="CenterContainer/VBoxContainer/HBoxContainer3"]
+margin_left = 285.0
+margin_right = 335.0
+margin_bottom = 50.0
+rect_min_size = Vector2( 50, 50 )
+toggle_mode = true
+texture_normal = ExtResource( 10 )
+texture_pressed = ExtResource( 11 )
+expand = true
+
 [node name="Control2" type="Control" parent="CenterContainer/VBoxContainer"]
-margin_top = 177.0
+margin_top = 250.0
 margin_right = 335.0
-margin_bottom = 227.0
+margin_bottom = 300.0
 rect_min_size = Vector2( 50, 50 )
 size_flags_horizontal = 3
 
 [node name="HBoxContainer2" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
-margin_top = 247.0
+margin_top = 320.0
 margin_right = 335.0
-margin_bottom = 343.0
+margin_bottom = 416.0
 alignment = 1
 __meta__ = {
 "_edit_use_anchors_": false
@@ -155,10 +184,10 @@ __meta__ = {
 }
 
 [node name="VBoxContainer" type="VBoxContainer" parent="ModalMessage/CenterContainer"]
-margin_left = 414.0
-margin_top = 245.0
-margin_right = 609.0
-margin_bottom = 354.0
+margin_left = 385.0
+margin_top = 244.0
+margin_right = 639.0
+margin_bottom = 356.0
 custom_constants/separation = 20
 
 [node name="Label" type="Label" parent="ModalMessage/CenterContainer/VBoxContainer"]