Merge pull request #381 from aaronfranke/loading

Move loading demos to their own folder

Author: aaronfranke

misc/autoload/global.gd renamed to loading/autoload/global.gd

@@ -2,28 +2,27 @@
 
 [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
 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
 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"]

misc/autoload/project.godot renamed to loading/autoload/project.godot

@@ -2,28 +2,27 @@
 
 [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
 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
 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"]

misc/autoload/scene_a.gd renamed to loading/autoload/scene_a.gd

@@ -1,66 +1,64 @@
 extends Control
 
-var thread = null
+const SIMULATED_DELAY_SEC = 0.1
 
-onready var progress = $progress
+var thread = null
 
-var SIMULATED_DELAY_SEC = 1.0
+onready var progress = $Progress
 
 func _thread_load(path):
 	var ril = ResourceLoader.load_interactive(path)
 	assert(ril)
 	var total = ril.get_stage_count()
-	# Call deferred to configure max load steps
+	# Call deferred to configure max load steps.
 	progress.call_deferred("set_max", total)
-
+	
 	var res = null
-
+	
 	while true: #iterate until we have a resource
-		# Update progress bar, use call deferred, which routes to main thread
+		# Update progress bar, use call deferred, which routes to main thread.
 		progress.call_deferred("set_value", ril.get_stage())
-		# Simulate a delay
-		OS.delay_msec(SIMULATED_DELAY_SEC * 1000.0)
-		# Poll (does a load step)
+		# Simulate a delay.
+		OS.delay_msec(int(SIMULATED_DELAY_SEC * 1000.0))
+		# Poll (does a load step).
 		var err = ril.poll()
-		# if OK, then load another one. If EOF, it' s done. Otherwise there was an error.
+		# If OK, then load another one. If EOF, it' s done. Otherwise there was an error.
 		if err == ERR_FILE_EOF:
-			# Loading done, fetch resource
+			# Loading done, fetch resource.
 			res = ril.get_resource()
 			break
 		elif err != OK:
-			# Not OK, there was an error
+			# Not OK, there was an error.
 			print("There was an error loading")
 			break
-
-	# Send whathever we did (or not) get
+	
+	# Send whathever we did (or did not) get.
 	call_deferred("_thread_done", res)
 
+
 func _thread_done(resource):
 	assert(resource)
-
-	# Always wait for threads to finish, this is required on Windows
+	
+	# Always wait for threads to finish, this is required on Windows.
 	thread.wait_to_finish()
-
-	#Hide the progress bar
+	
+	# Hide the progress bar.
 	progress.hide()
-
-	# Instantiate new scene
+	
+	# Instantiate new scene.
 	var new_scene = resource.instance()
-	# Free current scene
+	# Free current scene.
 	get_tree().current_scene.free()
 	get_tree().current_scene = null
-	# Add new one to root
+	# Add new one to root.
 	get_tree().root.add_child(new_scene)
-	# Set as current scene
+	# Set as current scene.
 	get_tree().current_scene = new_scene
-
+	
 	progress.visible = false
 
 func load_scene(path):
-
 	thread = Thread.new()
 	thread.start( self, "_thread_load", path)
-	raise() # show on top
+	raise() # Show on top.
 	progress.visible = true
-
-

misc/autoload/scene_a.tscn renamed to loading/autoload/scene_a.tscn

@@ -2,14 +2,13 @@
 
 [ext_resource path="res://background_load.gd" type="Script" id=1]
 
-[node name="bgload" type="Control"]
+[node name="BackgroundLoad" type="Control"]
 script = ExtResource( 1 )
 
-[node name="progress" type="ProgressBar" parent="."]
+[node name="Progress" type="ProgressBar" parent="."]
 visible = false
 margin_left = 7.0
 margin_top = 8.0
 margin_right = 207.0
 margin_bottom = 22.0
 step = 1.0
-

misc/autoload/scene_b.gd renamed to loading/autoload/scene_b.gd

@@ -1,5 +1,5 @@
 extends Node2D
 
 func _on_switch_pressed():
-	$CanvasLayer/switch.hide()
+	$CanvasLayer/Switch.hide()
 	background_load.load_scene("res://sculptures.tscn")

misc/autoload/scene_b.tscn renamed to loading/autoload/scene_b.tscn

@@ -1,19 +1,19 @@
 [gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://paintings.gd" type="Script" id=1]
-[ext_resource path="res://painting_parasol.jpg" type="Texture" id=2]
-[ext_resource path="res://painting_babel.jpg" type="Texture" id=3]
-[ext_resource path="res://painting_mona_lisa.jpg" type="Texture" id=4]
-[ext_resource path="res://painting_las_meninas.png" type="Texture" id=5]
-[ext_resource path="res://painting_old_guitarist.jpg" type="Texture" id=6]
-[ext_resource path="res://painting_the_swing.jpg" type="Texture" id=7]
+[ext_resource path="res://paintings/painting_babel.jpg" type="Texture" id=2]
+[ext_resource path="res://paintings/painting_las_meninas.png" type="Texture" id=3]
+[ext_resource path="res://paintings/painting_mona_lisa.jpg" type="Texture" id=4]
+[ext_resource path="res://paintings/painting_old_guitarist.jpg" type="Texture" id=5]
+[ext_resource path="res://paintings/painting_parasol.jpg" type="Texture" id=6]
+[ext_resource path="res://paintings/painting_the_swing.jpg" type="Texture" id=7]
 
 [sub_resource type="Animation" id=1]
 resource_name = "move_around"
 length = 4.0
 loop = true
 tracks/0/type = "value"
-tracks/0/path = NodePath("painting_mona_lisa:position")
+tracks/0/path = NodePath("MonaLisa:position")
 tracks/0/interp = 2
 tracks/0/loop_wrap = true
 tracks/0/imported = false
@@ -25,7 +25,7 @@ tracks/0/keys = {
 "values": [ Vector2( 117.659, 173.793 ), Vector2( 164.387, 206.955 ) ]
 }
 tracks/1/type = "value"
-tracks/1/path = NodePath("painting_mona_lisa:rotation_degrees")
+tracks/1/path = NodePath("MonaLisa:rotation_degrees")
 tracks/1/interp = 2
 tracks/1/loop_wrap = true
 tracks/1/imported = false
@@ -37,7 +37,7 @@ tracks/1/keys = {
 "values": [ 0.0, 0.0 ]
 }
 tracks/2/type = "value"
-tracks/2/path = NodePath("painting_parasol:position")
+tracks/2/path = NodePath("Parasol:position")
 tracks/2/interp = 2
 tracks/2/loop_wrap = true
 tracks/2/imported = false
@@ -49,7 +49,7 @@ tracks/2/keys = {
 "values": [ Vector2( 451.448, 256.916 ), Vector2( 483.102, 317.21 ) ]
 }
 tracks/3/type = "value"
-tracks/3/path = NodePath("painting_parasol:rotation_degrees")
+tracks/3/path = NodePath("Parasol:rotation_degrees")
 tracks/3/interp = 2
 tracks/3/loop_wrap = true
 tracks/3/imported = false
@@ -61,7 +61,7 @@ tracks/3/keys = {
 "values": [ 0.0, 0.0 ]
 }
 tracks/4/type = "value"
-tracks/4/path = NodePath("painting_the_swing:position")
+tracks/4/path = NodePath("TheSwing:position")
 tracks/4/interp = 2
 tracks/4/loop_wrap = true
 tracks/4/imported = false
@@ -73,7 +73,7 @@ tracks/4/keys = {
 "values": [ Vector2( 715.927, 181.745 ), Vector2( 661.663, 205.863 ) ]
 }
 tracks/5/type = "value"
-tracks/5/path = NodePath("painting_the_swing:rotation_degrees")
+tracks/5/path = NodePath("TheSwing:rotation_degrees")
 tracks/5/interp = 2
 tracks/5/loop_wrap = true
 tracks/5/imported = false
@@ -85,7 +85,7 @@ tracks/5/keys = {
 "values": [ 0.0, 0.0 ]
 }
 tracks/6/type = "value"
-tracks/6/path = NodePath("painting_old_guitarist:position")
+tracks/6/path = NodePath("OldGuitarist:position")
 tracks/6/interp = 2
 tracks/6/loop_wrap = true
 tracks/6/imported = false
@@ -97,7 +97,7 @@ tracks/6/keys = {
 "values": [ Vector2( 886.982, 185.641 ), Vector2( 901.179, 210.693 ) ]
 }
 tracks/7/type = "value"
-tracks/7/path = NodePath("painting_old_guitarist:rotation_degrees")
+tracks/7/path = NodePath("OldGuitarist:rotation_degrees")
 tracks/7/interp = 2
 tracks/7/loop_wrap = true
 tracks/7/imported = false
@@ -109,7 +109,7 @@ tracks/7/keys = {
 "values": [ 0.0, 15.0 ]
 }
 tracks/8/type = "value"
-tracks/8/path = NodePath("painting_babel:position")
+tracks/8/path = NodePath("Babel:position")
 tracks/8/interp = 2
 tracks/8/loop_wrap = true
 tracks/8/imported = false
@@ -121,7 +121,7 @@ tracks/8/keys = {
 "values": [ Vector2( 155.796, 468.287 ), Vector2( 194.21, 444.904 ) ]
 }
 tracks/9/type = "value"
-tracks/9/path = NodePath("painting_babel:rotation_degrees")
+tracks/9/path = NodePath("Babel:rotation_degrees")
 tracks/9/interp = 2
 tracks/9/loop_wrap = true
 tracks/9/imported = false
@@ -133,7 +133,7 @@ tracks/9/keys = {
 "values": [ 0.0, 0.0 ]
 }
 tracks/10/type = "value"
-tracks/10/path = NodePath("painting_las_meninas:position")
+tracks/10/path = NodePath("LasMeninas:position")
 tracks/10/interp = 2
 tracks/10/loop_wrap = true
 tracks/10/imported = false
@@ -145,7 +145,7 @@ tracks/10/keys = {
 "values": [ Vector2( 861.734, 494.059 ), Vector2( 840.022, 470.677 ) ]
 }
 tracks/11/type = "value"
-tracks/11/path = NodePath("painting_las_meninas:rotation_degrees")
+tracks/11/path = NodePath("LasMeninas:rotation_degrees")
 tracks/11/interp = 2
 tracks/11/loop_wrap = true
 tracks/11/imported = false
@@ -157,35 +157,35 @@ tracks/11/keys = {
 "values": [ 0.0, 0.0 ]
 }
 
-[node name="Node2D" type="Node2D"]
+[node name="Paintings" type="Node2D"]
 script = ExtResource( 1 )
 
-[node name="painting_parasol" type="Sprite" parent="."]
-position = Vector2( 451.448, 256.916 )
-scale = Vector2( 0.557998, 0.557998 )
-texture = ExtResource( 2 )
-
-[node name="painting_babel" type="Sprite" parent="."]
+[node name="Babel" type="Sprite" parent="."]
 position = Vector2( 155.796, 468.287 )
 scale = Vector2( 0.29005, 0.29005 )
+texture = ExtResource( 2 )
+
+[node name="LasMeninas" type="Sprite" parent="."]
+position = Vector2( 861.734, 494.059 )
+scale = Vector2( 0.348146, 0.348146 )
 texture = ExtResource( 3 )
 
-[node name="painting_mona_lisa" type="Sprite" parent="."]
+[node name="MonaLisa" type="Sprite" parent="."]
 position = Vector2( 117.659, 173.793 )
 scale = Vector2( 0.696799, 0.696799 )
 texture = ExtResource( 4 )
 
-[node name="painting_las_meninas" type="Sprite" parent="."]
-position = Vector2( 861.734, 494.059 )
-scale = Vector2( 0.348146, 0.348146 )
-texture = ExtResource( 5 )
-
-[node name="painting_old_guitarist" type="Sprite" parent="."]
+[node name="OldGuitarist" type="Sprite" parent="."]
 position = Vector2( 886.982, 185.641 )
 scale = Vector2( 0.344706, 0.328421 )
+texture = ExtResource( 5 )
+
+[node name="Parasol" type="Sprite" parent="."]
+position = Vector2( 451.448, 256.916 )
+scale = Vector2( 0.557998, 0.557998 )
 texture = ExtResource( 6 )
 
-[node name="painting_the_swing" type="Sprite" parent="."]
+[node name="TheSwing" type="Sprite" parent="."]
 position = Vector2( 715.927, 181.745 )
 scale = Vector2( 0.286677, 0.286677 )
 texture = ExtResource( 7 )
@@ -200,7 +200,7 @@ current = true
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 
-[node name="switch" type="Button" parent="CanvasLayer"]
+[node name="Switch" type="Button" parent="CanvasLayer"]
 margin_left = 10.0
 margin_top = 10.0
 margin_right = 156.0
@@ -209,4 +209,4 @@ text = "Switch to Sculptures"
 __meta__ = {
 "_edit_use_anchors_": false
 }
-[connection signal="pressed" from="CanvasLayer/switch" to="." method="_on_switch_pressed"]
+[connection signal="pressed" from="CanvasLayer/Switch" to="." method="_on_switch_pressed"]