Browse Source

Move loading demos to their own folder

Aaron Franke 5 years ago
parent
commit
04d86775da
47 changed files with 13 additions and 17 deletions
  1. 0 0
      loading/autoload/global.gd
  2. 0 0
      loading/autoload/project.godot
  3. 0 0
      loading/autoload/scene_a.gd
  4. 4 5
      loading/autoload/scene_a.tscn
  5. 0 0
      loading/autoload/scene_b.gd
  6. 4 5
      loading/autoload/scene_b.tscn
  7. 0 0
      loading/background_load/background_load.gd
  8. 0 1
      loading/background_load/background_load.tscn
  9. 0 0
      loading/background_load/painting_babel.jpg
  10. 0 0
      loading/background_load/painting_babel.jpg.import
  11. 0 0
      loading/background_load/painting_las_meninas.png
  12. 0 0
      loading/background_load/painting_las_meninas.png.import
  13. 0 0
      loading/background_load/painting_mona_lisa.jpg
  14. 0 0
      loading/background_load/painting_mona_lisa.jpg.import
  15. 0 0
      loading/background_load/painting_old_guitarist.jpg
  16. 0 0
      loading/background_load/painting_old_guitarist.jpg.import
  17. 0 0
      loading/background_load/painting_parasol.jpg
  18. 0 0
      loading/background_load/painting_parasol.jpg.import
  19. 0 0
      loading/background_load/painting_the_swing.jpg
  20. 0 0
      loading/background_load/painting_the_swing.jpg.import
  21. 0 0
      loading/background_load/paintings.gd
  22. 0 0
      loading/background_load/paintings.tscn
  23. 0 0
      loading/background_load/project.godot
  24. 0 0
      loading/background_load/sculpture_david.jpg
  25. 0 0
      loading/background_load/sculpture_david.jpg.import
  26. 0 0
      loading/background_load/sculpture_fountain.jpg
  27. 0 0
      loading/background_load/sculpture_fountain.jpg.import
  28. 0 0
      loading/background_load/sculpture_four_parts_of_earth.jpg
  29. 0 0
      loading/background_load/sculpture_four_parts_of_earth.jpg.import
  30. 0 0
      loading/background_load/sculpture_lincoln.jpg
  31. 0 0
      loading/background_load/sculpture_lincoln.jpg.import
  32. 0 0
      loading/background_load/sculpture_thinker.jpg
  33. 0 0
      loading/background_load/sculpture_thinker.jpg.import
  34. 0 0
      loading/background_load/sculpture_venus.png
  35. 0 0
      loading/background_load/sculpture_venus.png.import
  36. 0 0
      loading/background_load/sculptures.gd
  37. 0 0
      loading/background_load/sculptures.tscn
  38. 0 0
      loading/scene_changer/project.godot
  39. 0 0
      loading/scene_changer/scene_a.gd
  40. 0 0
      loading/scene_changer/scene_a.tscn
  41. 0 0
      loading/scene_changer/scene_b.gd
  42. 0 0
      loading/scene_changer/scene_b.tscn
  43. 0 0
      loading/threads/mona.png
  44. 0 0
      loading/threads/mona.png.import
  45. 0 0
      loading/threads/project.godot
  46. 1 2
      loading/threads/thread.gd
  47. 4 4
      loading/threads/thread.tscn

+ 0 - 0
misc/autoload/global.gd → loading/autoload/global.gd


+ 0 - 0
misc/autoload/project.godot → loading/autoload/project.godot


+ 0 - 0
misc/autoload/scene_a.gd → loading/autoload/scene_a.gd


+ 4 - 5
misc/autoload/scene_a.tscn → 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"]

+ 0 - 0
misc/autoload/scene_b.gd → loading/autoload/scene_b.gd


+ 4 - 5
misc/autoload/scene_b.tscn → 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"]

+ 0 - 0
misc/background_load/background_load.gd → loading/background_load/background_load.gd


+ 0 - 1
misc/background_load/background_load.tscn → 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
-

+ 0 - 0
misc/background_load/painting_babel.jpg → loading/background_load/painting_babel.jpg


+ 0 - 0
misc/background_load/painting_babel.jpg.import → loading/background_load/painting_babel.jpg.import


+ 0 - 0
misc/background_load/painting_las_meninas.png → loading/background_load/painting_las_meninas.png


+ 0 - 0
misc/background_load/painting_las_meninas.png.import → loading/background_load/painting_las_meninas.png.import


+ 0 - 0
misc/background_load/painting_mona_lisa.jpg → loading/background_load/painting_mona_lisa.jpg


+ 0 - 0
misc/background_load/painting_mona_lisa.jpg.import → loading/background_load/painting_mona_lisa.jpg.import


+ 0 - 0
misc/background_load/painting_old_guitarist.jpg → loading/background_load/painting_old_guitarist.jpg


+ 0 - 0
misc/background_load/painting_old_guitarist.jpg.import → loading/background_load/painting_old_guitarist.jpg.import


+ 0 - 0
misc/background_load/painting_parasol.jpg → loading/background_load/painting_parasol.jpg


+ 0 - 0
misc/background_load/painting_parasol.jpg.import → loading/background_load/painting_parasol.jpg.import


+ 0 - 0
misc/background_load/painting_the_swing.jpg → loading/background_load/painting_the_swing.jpg


+ 0 - 0
misc/background_load/painting_the_swing.jpg.import → loading/background_load/painting_the_swing.jpg.import


+ 0 - 0
misc/background_load/paintings.gd → loading/background_load/paintings.gd


+ 0 - 0
misc/background_load/paintings.tscn → loading/background_load/paintings.tscn


+ 0 - 0
misc/background_load/project.godot → loading/background_load/project.godot


+ 0 - 0
misc/background_load/sculpture_david.jpg → loading/background_load/sculpture_david.jpg


+ 0 - 0
misc/background_load/sculpture_david.jpg.import → loading/background_load/sculpture_david.jpg.import


+ 0 - 0
misc/background_load/sculpture_fountain.jpg → loading/background_load/sculpture_fountain.jpg


+ 0 - 0
misc/background_load/sculpture_fountain.jpg.import → loading/background_load/sculpture_fountain.jpg.import


+ 0 - 0
misc/background_load/sculpture_four_parts_of_earth.jpg → loading/background_load/sculpture_four_parts_of_earth.jpg


+ 0 - 0
misc/background_load/sculpture_four_parts_of_earth.jpg.import → loading/background_load/sculpture_four_parts_of_earth.jpg.import


+ 0 - 0
misc/background_load/sculpture_lincoln.jpg → loading/background_load/sculpture_lincoln.jpg


+ 0 - 0
misc/background_load/sculpture_lincoln.jpg.import → loading/background_load/sculpture_lincoln.jpg.import


+ 0 - 0
misc/background_load/sculpture_thinker.jpg → loading/background_load/sculpture_thinker.jpg


+ 0 - 0
misc/background_load/sculpture_thinker.jpg.import → loading/background_load/sculpture_thinker.jpg.import


+ 0 - 0
misc/background_load/sculpture_venus.png → loading/background_load/sculpture_venus.png


+ 0 - 0
misc/background_load/sculpture_venus.png.import → loading/background_load/sculpture_venus.png.import


+ 0 - 0
misc/background_load/sculptures.gd → loading/background_load/sculptures.gd


+ 0 - 0
misc/background_load/sculptures.tscn → loading/background_load/sculptures.tscn


+ 0 - 0
misc/scene_changer/project.godot → loading/scene_changer/project.godot


+ 0 - 0
misc/scene_changer/scene_a.gd → loading/scene_changer/scene_a.gd


+ 0 - 0
misc/scene_changer/scene_a.tscn → loading/scene_changer/scene_a.tscn


+ 0 - 0
misc/scene_changer/scene_b.gd → loading/scene_changer/scene_b.gd


+ 0 - 0
misc/scene_changer/scene_b.tscn → loading/scene_changer/scene_b.tscn


+ 0 - 0
misc/threads/mona.png → loading/threads/mona.png


+ 0 - 0
misc/threads/mona.png.import → loading/threads/mona.png.import


+ 0 - 0
misc/threads/project.godot → loading/threads/project.godot


+ 1 - 2
misc/threads/thread.gd → 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():

+ 4 - 4
misc/threads/thread.tscn → 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"]