Minimap viewport loops from x=0 to x=1

1 files changed, 22 insertions, 27 deletions

diff --git a/game/src/GameSession/MapControlPanel.tscn b/game/src/GameSession/MapControlPanel.tscn
index daf0c96..b76af10 100644
--- a/game/src/GameSession/MapControlPanel.tscn
+++ b/game/src/GameSession/MapControlPanel.tscn
@@ -11,55 +11,50 @@ action = &"ui_cancel"
 [sub_resource type="Shortcut" id="Shortcut_fc1tk"]
 events = [SubResource("InputEventAction_5nck3")]
 
-[node name="PanelContainer" type="PanelContainer" node_paths=PackedStringArray("_mapmodes_grid", "_minimap")]
+[node name="MapControlPanel" type="PanelContainer" node_paths=PackedStringArray("_mapmodes_grid")]
 editor_description = "SS-103"
 mouse_filter = 1
 script = ExtResource("1_ign64")
-_mapmodes_grid = NodePath("VBoxContainer/HBoxContainer/VBoxContainer/MapmodesGrid")
-_minimap = NodePath("VBoxContainer/Minimap")
+_mapmodes_grid = NodePath("HBoxContainer/VBoxContainer/MapmodesGrid")
 
-[node name="VBoxContainer" type="VBoxContainer" parent="."]
-layout_mode = 2
-
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="."]
 layout_mode = 2
 alignment = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer"]
 layout_mode = 2
 
-[node name="MapmodesGrid" type="GridContainer" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
+[node name="MapmodesGrid" type="GridContainer" parent="HBoxContainer/VBoxContainer"]
 layout_mode = 2
 columns = 11
 
-[node name="AuxiliaryPanel" type="VBoxContainer" parent="VBoxContainer/HBoxContainer"]
-editor_description = "UI-761"
-layout_mode = 2
-
-[node name="GameSessionMenuButton" type="Button" parent="VBoxContainer/HBoxContainer/AuxiliaryPanel"]
-editor_description = "UI-9"
-layout_mode = 2
-shortcut = SubResource("Shortcut_fc1tk")
-text = "ESC"
-
-[node name="Minimap" type="PanelContainer" parent="VBoxContainer"]
+[node name="Minimap" type="PanelContainer" parent="HBoxContainer/VBoxContainer"]
 layout_mode = 2
 mouse_filter = 1
 
-[node name="TextureRect" type="TextureRect" parent="VBoxContainer/Minimap"]
+[node name="TextureRect" type="TextureRect" parent="HBoxContainer/VBoxContainer/Minimap"]
 layout_mode = 2
 texture = ExtResource("2_r613r")
 
-[node name="RectangularCamera" type="Control" parent="VBoxContainer/Minimap" node_paths=PackedStringArray("_background")]
+[node name="ViewportQuad" type="Control" parent="HBoxContainer/VBoxContainer/Minimap"]
 layout_mode = 2
 mouse_filter = 2
 script = ExtResource("3_s4dml")
-_background = NodePath("../TextureRect")
 
-[node name="Frame" type="NinePatchRect" parent="VBoxContainer/Minimap"]
+[node name="Frame" type="NinePatchRect" parent="HBoxContainer/VBoxContainer/Minimap"]
 layout_mode = 2
 texture = ExtResource("4_f1exl")
 
-[connection signal="pressed" from="VBoxContainer/HBoxContainer/AuxiliaryPanel/GameSessionMenuButton" to="." method="_on_game_session_menu_button_pressed"]
-[connection signal="mouse_entered" from="VBoxContainer/Minimap" to="." method="_on_minimap_mouse_entered"]
-[connection signal="mouse_exited" from="VBoxContainer/Minimap" to="." method="_on_minimap_mouse_exited"]
+[node name="AuxiliaryPanel" type="VBoxContainer" parent="HBoxContainer"]
+editor_description = "UI-761"
+layout_mode = 2
+
+[node name="GameSessionMenuButton" type="Button" parent="HBoxContainer/AuxiliaryPanel"]
+editor_description = "UI-9"
+layout_mode = 2
+shortcut = SubResource("Shortcut_fc1tk")
+text = "ESC"
+
+[connection signal="map_view_camera_changed" from="." to="HBoxContainer/VBoxContainer/Minimap/ViewportQuad" method="_on_map_view_camera_changed"]
+[connection signal="minimap_clicked" from="HBoxContainer/VBoxContainer/Minimap/ViewportQuad" to="." method="_on_minimap_clicked"]
+[connection signal="pressed" from="HBoxContainer/AuxiliaryPanel/GameSessionMenuButton" to="." method="_on_game_session_menu_button_pressed"]