tonytins/citylimits-next
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor to use mediator pattern with EventBus

Browse source
This commit is contained in:
Antti Hakkarainen 2023-02-17 21:07:11 +02:00
parent a4136c937f
commit 0cf64a4bc9
15 changed files with 212 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scenes/Camera.tscn Normal file
View file

@ -0,0 +1,7 @@
[gd_scene load_steps=2 format=3 uid="uid://bwki262totuo4"]
[ext_resource type="Script" path="res://scripts/Camera.gd" id="1_ttsl2"]
[node name="Camera" type="Camera2D"]
position = Vector2(1288, 720)
script = ExtResource("1_ttsl2")

6
scenes/Camera_zoom_2d.tscn
View file

@ -1,6 +0,0 @@
[gd_scene load_steps=2 format=3 uid="uid://2we3txfr812u"]
[ext_resource type="Script" path="res://scripts/CameraZoom2D.gd" id="1_ttsl2"]
[node name="CameraZoom2D" type="Camera2D"]
script = ExtResource("1_ttsl2")

94
scenes/Main.tscn
View file

@ -1,61 +1,63 @@
[gd_scene load_steps=12 format=3 uid="uid://b1bahdquscsym"]
[gd_scene load_steps=14 format=3 uid="uid://c5deq5s55q0ii"]
[ext_resource type="Script" path="res://scripts/Main.gd" id="1_ysxum"]
[ext_resource type="Script" path="res://scripts/EventBus.gd" id="2_0j1ud"]
[ext_resource type="Script" path="res://scripts/ChunkHandler.gd" id="2_6cequ"]
[ext_resource type="PackedScene" uid="uid://dq7jmiqon170p" path="res://scenes/MainMenu.tscn" id="2_wfpe2"]
[ext_resource type="Script" path="res://scripts/Control.gd" id="3_1t1c8"]
[ext_resource type="Script" path="res://scripts/Camera.gd" id="3_15x8g"]
[ext_resource type="Script" path="res://scripts/Game.gd" id="4_4tr6y"]
[ext_resource type="PackedScene" uid="uid://2we3txfr812u" path="res://scenes/Camera_zoom_2d.tscn" id="4_rx82t"]
[ext_resource type="Script" path="res://scripts/Simulation.gd" id="5_0dxab"]
[ext_resource type="Script" path="res://scripts/EntityPlacer.gd" id="5_8jju5"]
[ext_resource type="Script" path="res://scripts/Minimap.gd" id="5_rg28x"]
[ext_resource type="Script" path="res://scripts/CameraMarker.gd" id="7_6krn1"]
[ext_resource type="Script" path="res://scripts/MapBackground.gd" id="8_ron2j"]
[ext_resource type="Script" path="res://scripts/UILayer.gd" id="9_ebec0"]
[node name="Main" type="Node2D"]
[node name="Main" type="Node"]
script = ExtResource("1_ysxum")
[node name="EventBus" type="Node" parent="."]
process_mode = 3
script = ExtResource("2_0j1ud")
[node name="MainMenu" parent="EventBus" instance=ExtResource("2_wfpe2")]
process_mode = 2
[node name="Camera" type="Camera2D" parent="EventBus"]
process_mode = 1
position = Vector2(1280, 720)
ignore_rotation = false
script = ExtResource("3_15x8g")
[node name="Game" type="Node2D" parent="EventBus"]
process_mode = 1
visible = false
script = ExtResource("4_4tr6y")
[node name="Simulation" type="Node" parent="EventBus/Game"]
script = ExtResource("5_0dxab")
[node name="ChunkHandler" type="Node2D" parent="EventBus/Game"]
script = ExtResource("2_6cequ")
[node name="CameraZoom2D" parent="EventBus/Game" instance=ExtResource("4_rx82t")]
position = Vector2(1272, 720)
ignore_rotation = false
limit_left = 0
limit_top = 0
limit_right = 65536
limit_bottom = 65536
limit_smoothed = true
rotation_smoothing_enabled = true
editor_draw_limits = true
[node name="MapBackground" type="Sprite2D" parent="EventBus/Game"]
z_index = -1
centered = false
script = ExtResource("8_ron2j")
[node name="UILayer" type="CanvasLayer" parent="EventBus/Game"]
visible = false
[node name="MainMenu" parent="EventBus" instance=ExtResource("2_wfpe2")]
[node name="EntityPlacer" type="Control" parent="EventBus/Game/UILayer"]
[node name="UILayer" type="CanvasLayer" parent="EventBus"]
process_mode = 1
visible = false
script = ExtResource("9_ebec0")
[node name="EntityPlacer" type="Control" parent="EventBus/UILayer"]
layout_mode = 3
anchors_preset = 0
offset_right = 40.0
offset_bottom = 40.0
script = ExtResource("5_8jju5")
[node name="Control" type="Control" parent="EventBus/Game/UILayer"]
[node name="Control" type="Control" parent="EventBus/UILayer"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
@ -66,7 +68,7 @@ mouse_filter = 1
script = ExtResource("3_1t1c8")
metadata/_edit_use_anchors_ = true
[node name="ConstructionPanel" type="Panel" parent="EventBus/Game/UILayer/Control"]
[node name="ConstructionPanel" type="Panel" parent="EventBus/UILayer/Control"]
custom_minimum_size = Vector2(500, 100)
layout_mode = 1
anchors_preset = 5
@ -77,42 +79,42 @@ offset_right = 250.0
offset_bottom = 100.0
grow_horizontal = 2
[node name="button_residental" type="Button" parent="EventBus/Game/UILayer/Control/ConstructionPanel"]
[node name="button_residental" type="Button" parent="EventBus/UILayer/Control/ConstructionPanel"]
layout_mode = 0
offset_right = 8.0
offset_bottom = 8.0
[node name="button_commercial" type="Button" parent="EventBus/Game/UILayer/Control/ConstructionPanel"]
[node name="button_commercial" type="Button" parent="EventBus/UILayer/Control/ConstructionPanel"]
layout_mode = 0
offset_right = 8.0
offset_bottom = 8.0
[node name="button_industrial" type="Button" parent="EventBus/Game/UILayer/Control/ConstructionPanel"]
[node name="button_industrial" type="Button" parent="EventBus/UILayer/Control/ConstructionPanel"]
layout_mode = 0
offset_right = 8.0
offset_bottom = 8.0
[node name="button_roads" type="Button" parent="EventBus/Game/UILayer/Control/ConstructionPanel"]
[node name="button_roads" type="Button" parent="EventBus/UILayer/Control/ConstructionPanel"]
layout_mode = 0
offset_right = 8.0
offset_bottom = 8.0
[node name="button_demolish" type="Button" parent="EventBus/Game/UILayer/Control/ConstructionPanel"]
[node name="button_demolish" type="Button" parent="EventBus/UILayer/Control/ConstructionPanel"]
layout_mode = 0
offset_right = 8.0
offset_bottom = 8.0
[node name="button_services" type="Button" parent="EventBus/Game/UILayer/Control/ConstructionPanel"]
[node name="button_services" type="Button" parent="EventBus/UILayer/Control/ConstructionPanel"]
layout_mode = 0
offset_right = 8.0
offset_bottom = 8.0
[node name="button_social" type="Button" parent="EventBus/Game/UILayer/Control/ConstructionPanel"]
[node name="button_social" type="Button" parent="EventBus/UILayer/Control/ConstructionPanel"]
layout_mode = 0
offset_right = 8.0
offset_bottom = 8.0
[node name="DebugContainer" type="GridContainer" parent="EventBus/Game/UILayer/Control"]
[node name="DebugContainer" type="GridContainer" parent="EventBus/UILayer/Control"]
layout_mode = 1
anchors_preset = 1
anchor_left = 1.0
@ -122,10 +124,10 @@ offset_top = 24.0
offset_bottom = 424.0
grow_horizontal = 0
[node name="DebugInfo" type="Label" parent="EventBus/Game/UILayer/Control/DebugContainer"]
[node name="DebugInfo" type="Label" parent="EventBus/UILayer/Control/DebugContainer"]
layout_mode = 2
[node name="Minimap" type="Panel" parent="EventBus/Game/UILayer/Control"]
[node name="Minimap" type="Panel" parent="EventBus/UILayer/Control"]
clip_contents = true
custom_minimum_size = Vector2(512, 512)
layout_mode = 1
@ -141,27 +143,25 @@ grow_vertical = 0
mouse_filter = 1
script = ExtResource("5_rg28x")
[node name="CameraMarker" type="Sprite2D" parent="EventBus/Game/UILayer/Control/Minimap"]
[node name="CameraMarker" type="Sprite2D" parent="EventBus/UILayer/Control/Minimap"]
z_index = 10
position = Vector2(-32, 0)
centered = false
script = ExtResource("7_6krn1")
[node name="MinimapSprite" type="Sprite2D" parent="EventBus/Game/UILayer/Control/Minimap"]
[node name="MinimapSprite" type="Sprite2D" parent="EventBus/UILayer/Control/Minimap"]
texture_repeat = 1
centered = false
[connection signal="chunk_stats" from="EventBus/Game/ChunkHandler" to="EventBus/Game/UILayer/Control" method="_on_chunk_handler_chunk_stats"]
[connection signal="camera_rotation_changed" from="EventBus/Game/CameraZoom2D" to="EventBus/Game/UILayer/Control/Minimap/CameraMarker" method="_on_camera_zoom_2d_camera_rotation_changed"]
[connection signal="camera_zoom_changed" from="EventBus/Game/CameraZoom2D" to="EventBus/Game/UILayer/Control/Minimap/CameraMarker" method="_on_camera_zoom_2d_camera_zoom_changed"]
[connection signal="pressed" from="EventBus/Game/UILayer/Control/ConstructionPanel/button_residental" to="EventBus/Game/UILayer/Control" method="_on_button_residental_pressed"]
[connection signal="pressed" from="EventBus/Game/UILayer/Control/ConstructionPanel/button_commercial" to="EventBus/Game/UILayer/Control" method="_on_button_commercial_pressed"]
[connection signal="pressed" from="EventBus/Game/UILayer/Control/ConstructionPanel/button_industrial" to="EventBus/Game/UILayer/Control" method="_on_button_industrial_pressed"]
[connection signal="pressed" from="EventBus/Game/UILayer/Control/ConstructionPanel/button_roads" to="EventBus/Game/UILayer/Control" method="_on_button_roads_pressed"]
[connection signal="pressed" from="EventBus/Game/UILayer/Control/ConstructionPanel/button_demolish" to="EventBus/Game/UILayer/Control" method="_on_button_demolish_pressed"]
[connection signal="pressed" from="EventBus/Game/UILayer/Control/ConstructionPanel/button_services" to="EventBus/Game/UILayer/Control" method="_on_button_services_pressed"]
[connection signal="pressed" from="EventBus/Game/UILayer/Control/ConstructionPanel/button_social" to="EventBus/Game/UILayer/Control" method="_on_button_social_pressed"]
[connection signal="mouse_entered" from="EventBus/Game/UILayer/Control/Minimap" to="EventBus/Game/UILayer/Control/Minimap" method="_on_mouse_entered"]
[connection signal="mouse_exited" from="EventBus/Game/UILayer/Control/Minimap" to="EventBus/Game/UILayer/Control/Minimap" method="_on_mouse_exited"]
[connection signal="set_camera_position" from="EventBus/Game/UILayer/Control/Minimap" to="EventBus" method="set_camera_position"]
[connection signal="set_map_background_texture" from="EventBus/Game/UILayer/Control/Minimap" to="EventBus/Game" method="_on_minimap_set_map_background_texture"]
[connection signal="chunk_stats" from="EventBus/Game/ChunkHandler" to="EventBus/UILayer/Control" method="_on_chunk_handler_chunk_stats"]
[connection signal="pressed" from="EventBus/UILayer/Control/ConstructionPanel/button_residental" to="EventBus/UILayer/Control" method="_on_button_residental_pressed"]
[connection signal="pressed" from="EventBus/UILayer/Control/ConstructionPanel/button_commercial" to="EventBus/UILayer/Control" method="_on_button_commercial_pressed"]
[connection signal="pressed" from="EventBus/UILayer/Control/ConstructionPanel/button_industrial" to="EventBus/UILayer/Control" method="_on_button_industrial_pressed"]
[connection signal="pressed" from="EventBus/UILayer/Control/ConstructionPanel/button_roads" to="EventBus/UILayer/Control" method="_on_button_roads_pressed"]
[connection signal="pressed" from="EventBus/UILayer/Control/ConstructionPanel/button_demolish" to="EventBus/UILayer/Control" method="_on_button_demolish_pressed"]
[connection signal="pressed" from="EventBus/UILayer/Control/ConstructionPanel/button_services" to="EventBus/UILayer/Control" method="_on_button_services_pressed"]
[connection signal="pressed" from="EventBus/UILayer/Control/ConstructionPanel/button_social" to="EventBus/UILayer/Control" method="_on_button_social_pressed"]
[connection signal="mouse_entered" from="EventBus/UILayer/Control/Minimap" to="EventBus/UILayer/Control/Minimap" method="_on_mouse_entered"]
[connection signal="mouse_exited" from="EventBus/UILayer/Control/Minimap" to="EventBus/UILayer/Control/Minimap" method="_on_mouse_exited"]
[connection signal="set_camera_position" from="EventBus/UILayer/Control/Minimap" to="EventBus" method="set_camera_position"]
[connection signal="set_map_background_texture" from="EventBus/UILayer/Control/Minimap" to="EventBus/Game" method="_on_minimap_set_map_background_texture"]

4
scenes/MainMenu.tscn
View file

@ -23,7 +23,6 @@ offset_bottom = 1155.0
size_flags_horizontal = 4
size_flags_vertical = 4
theme_override_constants/v_separation = 32
metadata/_edit_use_anchors_ = true
[node name="Menu_NewGame" type="Button" parent="MainMenuBar"]
layout_mode = 2
@ -65,8 +64,9 @@ alignment = 0
[node name="MenuBackground" type="Sprite2D" parent="."]
z_index = -1
position = Vector2(1320, 736)
scale = Vector2(0.67, 0.667)
texture = ExtResource("2_7rmv5")
centered = false
[node name="MenuLogo" type="Sprite2D" parent="."]
position = Vector2(856, 592)