diff --git a/misc/autoload/global.gd b/loading/autoload/global.gd similarity index 100% rename from misc/autoload/global.gd rename to loading/autoload/global.gd diff --git a/misc/autoload/project.godot b/loading/autoload/project.godot similarity index 100% rename from misc/autoload/project.godot rename to loading/autoload/project.godot diff --git a/misc/autoload/scene_a.gd b/loading/autoload/scene_a.gd similarity index 100% rename from misc/autoload/scene_a.gd rename to loading/autoload/scene_a.gd diff --git a/misc/autoload/scene_a.tscn b/loading/autoload/scene_a.tscn similarity index 72% rename from misc/autoload/scene_a.tscn rename to loading/autoload/scene_a.tscn index 1a60fa3e..429267af 100644 --- a/misc/autoload/scene_a.tscn +++ b/loading/autoload/scene_a.tscn @@ -2,14 +2,14 @@ [ext_resource path="res://scene_a.gd" type="Script" id=1] -[node name="scene_a" type="Panel"] +[node name="SceneA" type="Panel"] anchor_right = 1.0 anchor_bottom = 1.0 size_flags_horizontal = 2 size_flags_vertical = 2 script = ExtResource( 1 ) -[node name="label" type="Label" parent="."] +[node name="Label" type="Label" parent="."] margin_left = 64.0 margin_top = 48.0 margin_right = 104.0 @@ -17,7 +17,7 @@ margin_bottom = 62.0 size_flags_vertical = 0 text = "This is scene A." -[node name="goto_scene" type="Button" parent="."] +[node name="GoToSceneB" type="Button" parent="."] margin_left = 64.0 margin_top = 128.0 margin_right = 192.0 @@ -25,5 +25,4 @@ margin_bottom = 160.0 size_flags_horizontal = 2 size_flags_vertical = 2 text = "Go to Scene B" - -[connection signal="pressed" from="goto_scene" to="." method="_on_goto_scene_pressed"] +[connection signal="pressed" from="GoToSceneB" to="." method="_on_goto_scene_pressed"] diff --git a/misc/autoload/scene_b.gd b/loading/autoload/scene_b.gd similarity index 100% rename from misc/autoload/scene_b.gd rename to loading/autoload/scene_b.gd diff --git a/misc/autoload/scene_b.tscn b/loading/autoload/scene_b.tscn similarity index 72% rename from misc/autoload/scene_b.tscn rename to loading/autoload/scene_b.tscn index 6324a2af..3180523d 100644 --- a/misc/autoload/scene_b.tscn +++ b/loading/autoload/scene_b.tscn @@ -2,14 +2,14 @@ [ext_resource path="res://scene_b.gd" type="Script" id=1] -[node name="scene_b" type="Panel"] +[node name="SceneB" type="Panel"] anchor_right = 1.0 anchor_bottom = 1.0 size_flags_horizontal = 2 size_flags_vertical = 2 script = ExtResource( 1 ) -[node name="label" type="Label" parent="."] +[node name="Label" type="Label" parent="."] margin_left = 64.0 margin_top = 48.0 margin_right = 164.0 @@ -17,7 +17,7 @@ margin_bottom = 62.0 size_flags_vertical = 0 text = "This is scene B." -[node name="goto_scene" type="Button" parent="."] +[node name="GoToSceneA" type="Button" parent="."] margin_left = 64.0 margin_top = 128.0 margin_right = 192.0 @@ -25,5 +25,4 @@ margin_bottom = 160.0 size_flags_horizontal = 2 size_flags_vertical = 2 text = "Go to Scene A" - -[connection signal="pressed" from="goto_scene" to="." method="_on_goto_scene_pressed"] +[connection signal="pressed" from="GoToSceneA" to="." method="_on_goto_scene_pressed"] diff --git a/misc/background_load/background_load.gd b/loading/background_load/background_load.gd similarity index 100% rename from misc/background_load/background_load.gd rename to loading/background_load/background_load.gd diff --git a/misc/background_load/background_load.tscn b/loading/background_load/background_load.tscn similarity index 99% rename from misc/background_load/background_load.tscn rename to loading/background_load/background_load.tscn index 1681c904..fd215f09 100644 --- a/misc/background_load/background_load.tscn +++ b/loading/background_load/background_load.tscn @@ -12,4 +12,3 @@ margin_top = 8.0 margin_right = 207.0 margin_bottom = 22.0 step = 1.0 - diff --git a/misc/background_load/painting_babel.jpg b/loading/background_load/painting_babel.jpg similarity index 100% rename from misc/background_load/painting_babel.jpg rename to loading/background_load/painting_babel.jpg diff --git a/misc/background_load/painting_babel.jpg.import b/loading/background_load/painting_babel.jpg.import similarity index 100% rename from misc/background_load/painting_babel.jpg.import rename to loading/background_load/painting_babel.jpg.import diff --git a/misc/background_load/painting_las_meninas.png b/loading/background_load/painting_las_meninas.png similarity index 100% rename from misc/background_load/painting_las_meninas.png rename to loading/background_load/painting_las_meninas.png diff --git a/misc/background_load/painting_las_meninas.png.import b/loading/background_load/painting_las_meninas.png.import similarity index 100% rename from misc/background_load/painting_las_meninas.png.import rename to loading/background_load/painting_las_meninas.png.import diff --git a/misc/background_load/painting_mona_lisa.jpg b/loading/background_load/painting_mona_lisa.jpg similarity index 100% rename from misc/background_load/painting_mona_lisa.jpg rename to loading/background_load/painting_mona_lisa.jpg diff --git a/misc/background_load/painting_mona_lisa.jpg.import b/loading/background_load/painting_mona_lisa.jpg.import similarity index 100% rename from misc/background_load/painting_mona_lisa.jpg.import rename to loading/background_load/painting_mona_lisa.jpg.import diff --git a/misc/background_load/painting_old_guitarist.jpg b/loading/background_load/painting_old_guitarist.jpg similarity index 100% rename from misc/background_load/painting_old_guitarist.jpg rename to loading/background_load/painting_old_guitarist.jpg diff --git a/misc/background_load/painting_old_guitarist.jpg.import b/loading/background_load/painting_old_guitarist.jpg.import similarity index 100% rename from misc/background_load/painting_old_guitarist.jpg.import rename to loading/background_load/painting_old_guitarist.jpg.import diff --git a/misc/background_load/painting_parasol.jpg b/loading/background_load/painting_parasol.jpg similarity index 100% rename from misc/background_load/painting_parasol.jpg rename to loading/background_load/painting_parasol.jpg diff --git a/misc/background_load/painting_parasol.jpg.import b/loading/background_load/painting_parasol.jpg.import similarity index 100% rename from misc/background_load/painting_parasol.jpg.import rename to loading/background_load/painting_parasol.jpg.import diff --git a/misc/background_load/painting_the_swing.jpg b/loading/background_load/painting_the_swing.jpg similarity index 100% rename from misc/background_load/painting_the_swing.jpg rename to loading/background_load/painting_the_swing.jpg diff --git a/misc/background_load/painting_the_swing.jpg.import b/loading/background_load/painting_the_swing.jpg.import similarity index 100% rename from misc/background_load/painting_the_swing.jpg.import rename to loading/background_load/painting_the_swing.jpg.import diff --git a/misc/background_load/paintings.gd b/loading/background_load/paintings.gd similarity index 100% rename from misc/background_load/paintings.gd rename to loading/background_load/paintings.gd diff --git a/misc/background_load/paintings.tscn b/loading/background_load/paintings.tscn similarity index 100% rename from misc/background_load/paintings.tscn rename to loading/background_load/paintings.tscn diff --git a/misc/background_load/project.godot b/loading/background_load/project.godot similarity index 100% rename from misc/background_load/project.godot rename to loading/background_load/project.godot diff --git a/misc/background_load/sculpture_david.jpg b/loading/background_load/sculpture_david.jpg similarity index 100% rename from misc/background_load/sculpture_david.jpg rename to loading/background_load/sculpture_david.jpg diff --git a/misc/background_load/sculpture_david.jpg.import b/loading/background_load/sculpture_david.jpg.import similarity index 100% rename from misc/background_load/sculpture_david.jpg.import rename to loading/background_load/sculpture_david.jpg.import diff --git a/misc/background_load/sculpture_fountain.jpg b/loading/background_load/sculpture_fountain.jpg similarity index 100% rename from misc/background_load/sculpture_fountain.jpg rename to loading/background_load/sculpture_fountain.jpg diff --git a/misc/background_load/sculpture_fountain.jpg.import b/loading/background_load/sculpture_fountain.jpg.import similarity index 100% rename from misc/background_load/sculpture_fountain.jpg.import rename to loading/background_load/sculpture_fountain.jpg.import diff --git a/misc/background_load/sculpture_four_parts_of_earth.jpg b/loading/background_load/sculpture_four_parts_of_earth.jpg similarity index 100% rename from misc/background_load/sculpture_four_parts_of_earth.jpg rename to loading/background_load/sculpture_four_parts_of_earth.jpg diff --git a/misc/background_load/sculpture_four_parts_of_earth.jpg.import b/loading/background_load/sculpture_four_parts_of_earth.jpg.import similarity index 100% rename from misc/background_load/sculpture_four_parts_of_earth.jpg.import rename to loading/background_load/sculpture_four_parts_of_earth.jpg.import diff --git a/misc/background_load/sculpture_lincoln.jpg b/loading/background_load/sculpture_lincoln.jpg similarity index 100% rename from misc/background_load/sculpture_lincoln.jpg rename to loading/background_load/sculpture_lincoln.jpg diff --git a/misc/background_load/sculpture_lincoln.jpg.import b/loading/background_load/sculpture_lincoln.jpg.import similarity index 100% rename from misc/background_load/sculpture_lincoln.jpg.import rename to loading/background_load/sculpture_lincoln.jpg.import diff --git a/misc/background_load/sculpture_thinker.jpg b/loading/background_load/sculpture_thinker.jpg similarity index 100% rename from misc/background_load/sculpture_thinker.jpg rename to loading/background_load/sculpture_thinker.jpg diff --git a/misc/background_load/sculpture_thinker.jpg.import b/loading/background_load/sculpture_thinker.jpg.import similarity index 100% rename from misc/background_load/sculpture_thinker.jpg.import rename to loading/background_load/sculpture_thinker.jpg.import diff --git a/misc/background_load/sculpture_venus.png b/loading/background_load/sculpture_venus.png similarity index 100% rename from misc/background_load/sculpture_venus.png rename to loading/background_load/sculpture_venus.png diff --git a/misc/background_load/sculpture_venus.png.import b/loading/background_load/sculpture_venus.png.import similarity index 100% rename from misc/background_load/sculpture_venus.png.import rename to loading/background_load/sculpture_venus.png.import diff --git a/misc/background_load/sculptures.gd b/loading/background_load/sculptures.gd similarity index 100% rename from misc/background_load/sculptures.gd rename to loading/background_load/sculptures.gd diff --git a/misc/background_load/sculptures.tscn b/loading/background_load/sculptures.tscn similarity index 100% rename from misc/background_load/sculptures.tscn rename to loading/background_load/sculptures.tscn diff --git a/misc/scene_changer/project.godot b/loading/scene_changer/project.godot similarity index 100% rename from misc/scene_changer/project.godot rename to loading/scene_changer/project.godot diff --git a/misc/scene_changer/scene_a.gd b/loading/scene_changer/scene_a.gd similarity index 100% rename from misc/scene_changer/scene_a.gd rename to loading/scene_changer/scene_a.gd diff --git a/misc/scene_changer/scene_a.tscn b/loading/scene_changer/scene_a.tscn similarity index 100% rename from misc/scene_changer/scene_a.tscn rename to loading/scene_changer/scene_a.tscn diff --git a/misc/scene_changer/scene_b.gd b/loading/scene_changer/scene_b.gd similarity index 100% rename from misc/scene_changer/scene_b.gd rename to loading/scene_changer/scene_b.gd diff --git a/misc/scene_changer/scene_b.tscn b/loading/scene_changer/scene_b.tscn similarity index 100% rename from misc/scene_changer/scene_b.tscn rename to loading/scene_changer/scene_b.tscn diff --git a/misc/threads/mona.png b/loading/threads/mona.png similarity index 100% rename from misc/threads/mona.png rename to loading/threads/mona.png diff --git a/misc/threads/mona.png.import b/loading/threads/mona.png.import similarity index 100% rename from misc/threads/mona.png.import rename to loading/threads/mona.png.import diff --git a/misc/threads/project.godot b/loading/threads/project.godot similarity index 100% rename from misc/threads/project.godot rename to loading/threads/project.godot diff --git a/misc/threads/thread.gd b/loading/threads/thread.gd similarity index 91% rename from misc/threads/thread.gd rename to loading/threads/thread.gd index 3c8846c5..31f52113 100644 --- a/misc/threads/thread.gd +++ b/loading/threads/thread.gd @@ -1,6 +1,5 @@ extends Node2D -# Member variables var thread = Thread.new() # This function runs in a thread! @@ -18,7 +17,7 @@ func _bg_load_done(): # Wait for the thread to complete, get the returned value var tex = thread.wait_to_finish() # Set to the sprite - get_node("sprite").set_texture(tex) + get_node("Sprite").set_texture(tex) func _on_load_pressed(): diff --git a/misc/threads/thread.tscn b/loading/threads/thread.tscn similarity index 70% rename from misc/threads/thread.tscn rename to loading/threads/thread.tscn index f36c6df5..7746cb9c 100644 --- a/misc/threads/thread.tscn +++ b/loading/threads/thread.tscn @@ -2,10 +2,10 @@ [ext_resource path="res://thread.gd" type="Script" id=1] -[node name="node" type="Node2D"] +[node name="Thread" type="Node2D"] script = ExtResource( 1 ) -[node name="load" type="Button" parent="."] +[node name="Load" type="Button" parent="."] margin_left = 432.0 margin_top = 82.0 margin_right = 560.0 @@ -17,10 +17,10 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="sprite" type="Sprite" parent="."] +[node name="Sprite" type="Sprite" parent="."] position = Vector2( 494, 336 ) [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 512, 300 ) current = true -[connection signal="pressed" from="load" to="." method="_on_load_pressed"] +[connection signal="pressed" from="Load" to="." method="_on_load_pressed"]