From cc177f7bebc8e330d08c39c0ccbae3217dadd7a2 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Thu, 27 Feb 2025 02:12:49 -0500 Subject: [PATCH] scene manager system --- assets/mesh_libraries/w1/w1_walls.meshlib | Bin 5968 -> 5967 bytes .../models/tiles/w1_walls/grey_block.material | Bin 370 -> 384 bytes autoloads/scene_manager.gd | 30 ++++++++++++++ autoloads/scene_manager.tscn | 37 ++++++++++++++++++ objects/canny_cat.tscn | 2 +- project.godot | 8 +++- 6 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 autoloads/scene_manager.gd create mode 100644 autoloads/scene_manager.tscn diff --git a/assets/mesh_libraries/w1/w1_walls.meshlib b/assets/mesh_libraries/w1/w1_walls.meshlib index 96a852f430095b948bb0756b8095e190bffe03b0..8f6b891d7837ae76380f4ebf447a50e2ec843f68 100644 GIT binary patch delta 608 zcmV-m0-ycRF3&CzQd2`i0ssI201yBGHIo1UNs$pQfBhi<*6NK%5U(a304iAkP@y6q zRROy~K5PU4pn@QvdU-TU2-(|*Y_hX|lb~#bjR$}(`q^Ip>^0DS;|0NRxm%ZbI?AGNrfHyeG!T_b2sa>E!VWvn)1FKd&n|3QvBlQh@E z8^@j8e{eK$O|h7{xy81bICiq;O`G(8$h%6eg)G@vZZiAcmXmYNz6i(j(_YcVD7eX%ST5@`W; zfeL}*LsdCtmSQp0SFVM`uo0Y;a41Wj_)%o_<-^{bl+hwHu1HrSb*V3T;0%9DSRAtf?5G#)I ze?aigD0s_c$r*+dM`7THaaK!FJA>+vvk?r)m^j6@6K0|Gx}m67p~X{RzFh3+c-8`IPI3sXMkSG!6# zycF`1$3N#d$U83bl7n32BL{HNH9m6DK}pZJ=b@AC>CoB3=FQo|DRP ut->%=by7-5@qY+Rs&CAJ&`1Bg^O5JGgYM}Z^w2?}i$1z&bWgK=0@DI!Qd2`i0ssI201yBGHIo1UN|6yRe+41{)+&xi5U(a304iAkP@y6q zRROy~K5PU4pn@QvdU2>`iNblb~#bjR$}(`q^Ip>ohrBsiJKnW39BqzNW|qdzu4i%I|0e$jTpS9h zcmX4YgQu>%*p%6DU--}QU-bX;AM^(j6lee~%!x?EHI|wh5Q|^425T`T?|rc>7ZPa! zb^(S!@qtr0WtL(w)mO7HrSgl{XW^zZTbNone>cX`vRoLP%6U6WjsKnNx~}WGuCFJm zZ|8A*J0}|G+Gd7cXaC&unP94u zO7=}ND2zI`WYShe=o43nI`3Hh$$z4l>@(YM@Y*Lj;S3s;d zf9QSRooV@OsU3*n#6j#sVby9WYG=SkRU5&8jEPfhJ7E?|=Qfaf6+c-8`IPI3sXMkSG!60l49{-%S|LLdF}&PSe$4!Wmv&_f4>F8b)A(LDjPd;-%HlE5b% diff --git a/assets/models/tiles/w1_walls/grey_block.material b/assets/models/tiles/w1_walls/grey_block.material index cd8e04b31bb37cd66de69f4a6ee9d1e34fa0eda3..2585b56fab5c1e4f39ff51769eb2faa088c4bf44 100644 GIT binary patch literal 384 zcmV-`0e}8dQ$s@n000005C8y?0ssJL0RR9fwJ-f(kpcAz0Jf1lGjMCt0sOBba7l!! zs@M$#z*WtxC7T>%6GB7Xnj}*4Pvkq$ZMZywRdi3IE{u-H{c5XID*!A2E&!KKjqc&* z3_iiM2mzvJT|^rvA(QerP8DMpYWgZfAT-z4;+V|3^(89Fe-MQ#`@Gs zP7E8~{|DZk7`~8R{|zpB6}yTtWTh^JtCbhRH4dk^Sd5(NSUwq2%MR47pLSl21Ux9);cR7P=X=G%sNv_4HnA#*w%dAi*SI~-T5~MBn@j2 zlc0dO4xm61=s@)nteCe@3+0Ed_@Y2rc!=nH4y+--i~|O5gtJg)+Tu10W2N`dIjA6w e(kOkF;;7JGC6qjJFA{)PHnL$5HvlYBQ$s`b1+$O< literal 370 zcmV-&0ge7rQ$s@n000005C8yU0ssJ70RR9fwJ-f(V*!N<0M-yXG+MKQN6{DR>Y&Gol$Qz-x`04xBEuhC`n z9BQ=HW8MGIe*=UF9`Sg5aNK2E?X*~Bxw-sT_)qYE@?YQ&E_-?zZQo|Cwo184p~Lxq z!I_i7_UQEg;Gb^$+ETd6riH7NQ^Ix9DE#n>%0+-P4TV!7bNf2HxRp8An&8U+fH&1P z(yiK~jgKkDWy4!JlX=LgFcg-H<-Y{_2Owx70U)t+*+B@`da+aXB#Hl$>wZeH5Xdv?l zR=``Zh4MvL@S@->JV10lC;Sj##-W41 void: + var tree = get_tree() + # capture main scene + if tree.current_scene != self: + change_scene(tree.current_scene) + tree.current_scene = self + + +func change_scene(new_scene: Node) -> void: + # avoid infinite recursion :P + if current_scene == new_scene: + return + # remove current scene + if current_scene: + scene_parent.remove_child(current_scene) + current_scene.queue_free() + # add new scene + if new_scene.is_inside_tree(): + new_scene.get_parent().remove_child.call_deferred(new_scene) + scene_parent.add_child.call_deferred(new_scene) + current_scene = new_scene diff --git a/autoloads/scene_manager.tscn b/autoloads/scene_manager.tscn new file mode 100644 index 0000000..fb7b332 --- /dev/null +++ b/autoloads/scene_manager.tscn @@ -0,0 +1,37 @@ +[gd_scene load_steps=2 format=3 uid="uid://dxrvocxjk8vs3"] + +[ext_resource type="Script" path="res://autoloads/scene_manager.gd" id="1_d112a"] + +[node name="SceneManager" type="Node" node_paths=PackedStringArray("scene_parent")] +script = ExtResource("1_d112a") +scene_parent = NodePath("HBoxContainer/MainView/SubViewportContainer/SubViewport") + +[node name="HBoxContainer" type="HBoxContainer" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="SideBar" type="Control" parent="HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="MainView" type="Control" parent="HBoxContainer"] +custom_minimum_size = Vector2(288, 216) +layout_mode = 2 +size_flags_horizontal = 10 + +[node name="SubViewportContainer" type="SubViewportContainer" parent="HBoxContainer/MainView"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="SubViewport" type="SubViewport" parent="HBoxContainer/MainView/SubViewportContainer"] +handle_input_locally = false +audio_listener_enable_3d = true +size = Vector2i(288, 216) +render_target_update_mode = 4 diff --git a/objects/canny_cat.tscn b/objects/canny_cat.tscn index b843a88..019bfee 100644 --- a/objects/canny_cat.tscn +++ b/objects/canny_cat.tscn @@ -213,9 +213,9 @@ delay_in_seconds = "0.0" [connection signal="charge_canceled" from="." to="Sounds/ChargeCancel" method="play"] [connection signal="shot" from="." to="Sounds/Shoot" method="play"] [connection signal="state_physics_processing" from="StateChart/Root/Idle" to="." method="_apply_gravity"] -[connection signal="state_physics_processing" from="StateChart/Root/Moving" to="." method="_apply_gravity"] [connection signal="state_physics_processing" from="StateChart/Root/Moving" to="." method="_bounce_on_walls"] [connection signal="state_physics_processing" from="StateChart/Root/Moving" to="." method="_slow_to_stop"] +[connection signal="state_physics_processing" from="StateChart/Root/Moving" to="." method="_apply_gravity"] [connection signal="state_entered" from="StateChart/Root/Charging" to="." method="_start_charge"] [connection signal="state_entered" from="StateChart/Root/Charging" to="Sounds/ChargeStart" method="play"] [connection signal="state_exited" from="StateChart/Root/Charging" to="." method="_end_charge"] diff --git a/project.godot b/project.godot index c55e805..6fdb7e4 100644 --- a/project.godot +++ b/project.godot @@ -15,10 +15,14 @@ run/main_scene="res://test_scene.tscn" config/features=PackedStringArray("4.3", "GL Compatibility") config/icon="res://icon.svg" +[autoload] + +SceneManager="*res://autoloads/scene_manager.tscn" + [display] -window/size/viewport_width=320 -window/size/viewport_height=240 +window/size/viewport_width=384 +window/size/viewport_height=216 window/stretch/mode="viewport" [editor_plugins]