diff --git a/loading/background_load/background_load.gd b/loading/background_load/background_load.gd index 0368ae0e..7eef0239 100644 --- a/loading/background_load/background_load.gd +++ b/loading/background_load/background_load.gd @@ -1,66 +1,64 @@ extends Control +const SIMULATED_DELAY_SEC = 0.1 + var thread = null -onready var progress = $progress - -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 - - diff --git a/loading/background_load/background_load.tscn b/loading/background_load/background_load.tscn index fd215f09..6a0510d9 100644 --- a/loading/background_load/background_load.tscn +++ b/loading/background_load/background_load.tscn @@ -2,10 +2,10 @@ [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 diff --git a/loading/background_load/paintings.gd b/loading/background_load/paintings.gd index 4ce218db..74a59167 100644 --- a/loading/background_load/paintings.gd +++ b/loading/background_load/paintings.gd @@ -1,5 +1,5 @@ extends Node2D func _on_switch_pressed(): - $CanvasLayer/switch.hide() + $CanvasLayer/Switch.hide() background_load.load_scene("res://sculptures.tscn") diff --git a/loading/background_load/paintings.tscn b/loading/background_load/paintings.tscn index 73678153..82cf461e 100644 --- a/loading/background_load/paintings.tscn +++ b/loading/background_load/paintings.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"] diff --git a/loading/background_load/painting_babel.jpg b/loading/background_load/paintings/painting_babel.jpg similarity index 100% rename from loading/background_load/painting_babel.jpg rename to loading/background_load/paintings/painting_babel.jpg diff --git a/loading/background_load/painting_babel.jpg.import b/loading/background_load/paintings/painting_babel.jpg.import similarity index 68% rename from loading/background_load/painting_babel.jpg.import rename to loading/background_load/paintings/painting_babel.jpg.import index 16c1f601..46e6f077 100644 --- a/loading/background_load/painting_babel.jpg.import +++ b/loading/background_load/paintings/painting_babel.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/painting_babel.jpg-bb6b7c64c260f78ce43012bcac8a1c4e.stex" +path="res://.import/painting_babel.jpg-7d4afda4b0268025e231a7f9e793a18d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://painting_babel.jpg" -dest_files=[ "res://.import/painting_babel.jpg-bb6b7c64c260f78ce43012bcac8a1c4e.stex" ] +source_file="res://paintings/painting_babel.jpg" +dest_files=[ "res://.import/painting_babel.jpg-7d4afda4b0268025e231a7f9e793a18d.stex" ] [params] diff --git a/loading/background_load/painting_las_meninas.png b/loading/background_load/paintings/painting_las_meninas.png similarity index 100% rename from loading/background_load/painting_las_meninas.png rename to loading/background_load/paintings/painting_las_meninas.png diff --git a/loading/background_load/painting_las_meninas.png.import b/loading/background_load/paintings/painting_las_meninas.png.import similarity index 66% rename from loading/background_load/painting_las_meninas.png.import rename to loading/background_load/paintings/painting_las_meninas.png.import index b9ad9ae0..41b878dc 100644 --- a/loading/background_load/painting_las_meninas.png.import +++ b/loading/background_load/paintings/painting_las_meninas.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/painting_las_meninas.png-158bef53fe63c53626df2020827ea75b.stex" +path="res://.import/painting_las_meninas.png-980a9e4669b648b01417bfb871e282ee.stex" metadata={ "vram_texture": false } [deps] -source_file="res://painting_las_meninas.png" -dest_files=[ "res://.import/painting_las_meninas.png-158bef53fe63c53626df2020827ea75b.stex" ] +source_file="res://paintings/painting_las_meninas.png" +dest_files=[ "res://.import/painting_las_meninas.png-980a9e4669b648b01417bfb871e282ee.stex" ] [params] diff --git a/loading/background_load/painting_mona_lisa.jpg b/loading/background_load/paintings/painting_mona_lisa.jpg similarity index 100% rename from loading/background_load/painting_mona_lisa.jpg rename to loading/background_load/paintings/painting_mona_lisa.jpg diff --git a/loading/background_load/painting_mona_lisa.jpg.import b/loading/background_load/paintings/painting_mona_lisa.jpg.import similarity index 67% rename from loading/background_load/painting_mona_lisa.jpg.import rename to loading/background_load/paintings/painting_mona_lisa.jpg.import index acd7627d..34296df7 100644 --- a/loading/background_load/painting_mona_lisa.jpg.import +++ b/loading/background_load/paintings/painting_mona_lisa.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/painting_mona_lisa.jpg-cefdc64dfa49e9ee9566b078597cd552.stex" +path="res://.import/painting_mona_lisa.jpg-0d1e89a489f14142e264e1f238465e1c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://painting_mona_lisa.jpg" -dest_files=[ "res://.import/painting_mona_lisa.jpg-cefdc64dfa49e9ee9566b078597cd552.stex" ] +source_file="res://paintings/painting_mona_lisa.jpg" +dest_files=[ "res://.import/painting_mona_lisa.jpg-0d1e89a489f14142e264e1f238465e1c.stex" ] [params] diff --git a/loading/background_load/painting_old_guitarist.jpg b/loading/background_load/paintings/painting_old_guitarist.jpg similarity index 100% rename from loading/background_load/painting_old_guitarist.jpg rename to loading/background_load/paintings/painting_old_guitarist.jpg diff --git a/loading/background_load/painting_old_guitarist.jpg.import b/loading/background_load/paintings/painting_old_guitarist.jpg.import similarity index 66% rename from loading/background_load/painting_old_guitarist.jpg.import rename to loading/background_load/paintings/painting_old_guitarist.jpg.import index aa6bcdd0..fa436eb5 100644 --- a/loading/background_load/painting_old_guitarist.jpg.import +++ b/loading/background_load/paintings/painting_old_guitarist.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/painting_old_guitarist.jpg-f04ba627b38b0def60d96cb6c0bfa12b.stex" +path="res://.import/painting_old_guitarist.jpg-9b4236f27fd614bf0a429568255ea118.stex" metadata={ "vram_texture": false } [deps] -source_file="res://painting_old_guitarist.jpg" -dest_files=[ "res://.import/painting_old_guitarist.jpg-f04ba627b38b0def60d96cb6c0bfa12b.stex" ] +source_file="res://paintings/painting_old_guitarist.jpg" +dest_files=[ "res://.import/painting_old_guitarist.jpg-9b4236f27fd614bf0a429568255ea118.stex" ] [params] diff --git a/loading/background_load/painting_parasol.jpg b/loading/background_load/paintings/painting_parasol.jpg similarity index 100% rename from loading/background_load/painting_parasol.jpg rename to loading/background_load/paintings/painting_parasol.jpg diff --git a/loading/background_load/painting_parasol.jpg.import b/loading/background_load/paintings/painting_parasol.jpg.import similarity index 67% rename from loading/background_load/painting_parasol.jpg.import rename to loading/background_load/paintings/painting_parasol.jpg.import index 817ef72e..7eca0962 100644 --- a/loading/background_load/painting_parasol.jpg.import +++ b/loading/background_load/paintings/painting_parasol.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/painting_parasol.jpg-2864da595fcb4f0e842ba9c49097a056.stex" +path="res://.import/painting_parasol.jpg-58515a51999e7c2414ba8e02c335b3cf.stex" metadata={ "vram_texture": false } [deps] -source_file="res://painting_parasol.jpg" -dest_files=[ "res://.import/painting_parasol.jpg-2864da595fcb4f0e842ba9c49097a056.stex" ] +source_file="res://paintings/painting_parasol.jpg" +dest_files=[ "res://.import/painting_parasol.jpg-58515a51999e7c2414ba8e02c335b3cf.stex" ] [params] diff --git a/loading/background_load/painting_the_swing.jpg b/loading/background_load/paintings/painting_the_swing.jpg similarity index 100% rename from loading/background_load/painting_the_swing.jpg rename to loading/background_load/paintings/painting_the_swing.jpg diff --git a/loading/background_load/painting_the_swing.jpg.import b/loading/background_load/paintings/painting_the_swing.jpg.import similarity index 67% rename from loading/background_load/painting_the_swing.jpg.import rename to loading/background_load/paintings/painting_the_swing.jpg.import index 0e4080ce..7bea4c83 100644 --- a/loading/background_load/painting_the_swing.jpg.import +++ b/loading/background_load/paintings/painting_the_swing.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/painting_the_swing.jpg-1303041ac03cbc85efa4b07ce56efbc4.stex" +path="res://.import/painting_the_swing.jpg-c81abef8954f7fb30f742b957576d4d2.stex" metadata={ "vram_texture": false } [deps] -source_file="res://painting_the_swing.jpg" -dest_files=[ "res://.import/painting_the_swing.jpg-1303041ac03cbc85efa4b07ce56efbc4.stex" ] +source_file="res://paintings/painting_the_swing.jpg" +dest_files=[ "res://.import/painting_the_swing.jpg-c81abef8954f7fb30f742b957576d4d2.stex" ] [params] diff --git a/loading/background_load/sculptures.gd b/loading/background_load/sculptures.gd index e0c0e121..6274f646 100644 --- a/loading/background_load/sculptures.gd +++ b/loading/background_load/sculptures.gd @@ -1,5 +1,5 @@ extends Node2D func _on_switch_pressed(): - $CanvasLayer/switch.hide() + $CanvasLayer/Switch.hide() background_load.load_scene("res://paintings.tscn") diff --git a/loading/background_load/sculptures.tscn b/loading/background_load/sculptures.tscn index ceba0a30..8e16a960 100644 --- a/loading/background_load/sculptures.tscn +++ b/loading/background_load/sculptures.tscn @@ -1,19 +1,19 @@ [gd_scene load_steps=9 format=2] [ext_resource path="res://sculptures.gd" type="Script" id=1] -[ext_resource path="res://sculpture_fountain.jpg" type="Texture" id=2] -[ext_resource path="res://sculpture_four_parts_of_earth.jpg" type="Texture" id=3] -[ext_resource path="res://sculpture_david.jpg" type="Texture" id=4] -[ext_resource path="res://sculpture_lincoln.jpg" type="Texture" id=5] -[ext_resource path="res://sculpture_thinker.jpg" type="Texture" id=6] -[ext_resource path="res://sculpture_venus.png" type="Texture" id=7] +[ext_resource path="res://sculptures/sculpture_david.jpg" type="Texture" id=2] +[ext_resource path="res://sculptures/sculpture_fountain.jpg" type="Texture" id=3] +[ext_resource path="res://sculptures/sculpture_four_parts_of_earth.jpg" type="Texture" id=4] +[ext_resource path="res://sculptures/sculpture_lincoln.jpg" type="Texture" id=5] +[ext_resource path="res://sculptures/sculpture_thinker.jpg" type="Texture" id=6] +[ext_resource path="res://sculptures/sculpture_venus.png" type="Texture" id=7] [sub_resource type="Animation" id=1] resource_name = "colorcycle" length = 8.0 loop = true tracks/0/type = "value" -tracks/0/path = NodePath("sculpture_four_parts_of_earth:modulate") +tracks/0/path = NodePath("FourPartsOfEarth:modulate") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/imported = false @@ -25,7 +25,7 @@ tracks/0/keys = { "values": [ Color( 1, 1, 1, 1 ), Color( 0.827451, 0.25098, 0.25098, 1 ) ] } tracks/1/type = "value" -tracks/1/path = NodePath("sculpture_fountain:modulate") +tracks/1/path = NodePath("Fountain:modulate") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/imported = false @@ -37,7 +37,7 @@ tracks/1/keys = { "values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] } tracks/2/type = "value" -tracks/2/path = NodePath("sculpture_lincoln:modulate") +tracks/2/path = NodePath("Lincoln:modulate") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/imported = false @@ -49,7 +49,7 @@ tracks/2/keys = { "values": [ Color( 1, 1, 1, 1 ), Color( 0.32549, 0.407843, 0.862745, 1 ) ] } tracks/3/type = "value" -tracks/3/path = NodePath("sculpture_david:modulate") +tracks/3/path = NodePath("David:modulate") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/imported = false @@ -61,7 +61,7 @@ tracks/3/keys = { "values": [ Color( 1, 1, 1, 1 ), Color( 0.180392, 0.866667, 0.137255, 1 ) ] } tracks/4/type = "value" -tracks/4/path = NodePath("sculpture_thinker:modulate") +tracks/4/path = NodePath("Thinker:modulate") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/imported = false @@ -73,7 +73,7 @@ tracks/4/keys = { "values": [ Color( 1, 1, 1, 1 ), Color( 0.898039, 0, 1, 1 ) ] } tracks/5/type = "value" -tracks/5/path = NodePath("sculpture_venus:modulate") +tracks/5/path = NodePath("Venus:modulate") tracks/5/interp = 1 tracks/5/loop_wrap = true tracks/5/imported = false @@ -85,35 +85,35 @@ tracks/5/keys = { "values": [ Color( 1, 1, 1, 1 ), Color( 0, 0, 0, 1 ) ] } -[node name="Node2D" type="Node2D"] +[node name="Sculptures" type="Node2D"] script = ExtResource( 1 ) -[node name="sculpture_fountain" type="Sprite" parent="."] -position = Vector2( 152.971, 513.499 ) -scale = Vector2( 0.191615, 0.191615 ) -texture = ExtResource( 2 ) - -[node name="sculpture_four_parts_of_earth" type="Sprite" parent="."] -position = Vector2( 480.743, 588.027 ) -scale = Vector2( 0.198693, 0.198693 ) -texture = ExtResource( 3 ) - -[node name="sculpture_david" type="Sprite" parent="."] +[node name="David" type="Sprite" parent="."] position = Vector2( 567.784, 196.577 ) scale = Vector2( 0.447348, 0.447348 ) +texture = ExtResource( 2 ) + +[node name="Fountain" type="Sprite" parent="."] +position = Vector2( 152.971, 513.499 ) +scale = Vector2( 0.191615, 0.191615 ) +texture = ExtResource( 3 ) + +[node name="FourPartsOfEarth" type="Sprite" parent="."] +position = Vector2( 480.743, 588.027 ) +scale = Vector2( 0.198693, 0.198693 ) texture = ExtResource( 4 ) -[node name="sculpture_lincoln" type="Sprite" parent="."] +[node name="Lincoln" type="Sprite" parent="."] position = Vector2( 211.852, 203.688 ) scale = Vector2( 0.386179, 0.378971 ) texture = ExtResource( 5 ) -[node name="sculpture_thinker" type="Sprite" parent="."] +[node name="Thinker" type="Sprite" parent="."] position = Vector2( 854.336, 202.363 ) scale = Vector2( 0.182302, 0.182302 ) texture = ExtResource( 6 ) -[node name="sculpture_venus" type="Sprite" parent="."] +[node name="Venus" type="Sprite" parent="."] position = Vector2( 848.731, 495.153 ) scale = Vector2( 0.402249, 0.402249 ) texture = ExtResource( 7 ) @@ -128,7 +128,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 = 142.0 @@ -137,4 +137,4 @@ text = "Switch to Paintings" __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"] diff --git a/loading/background_load/sculpture_david.jpg b/loading/background_load/sculptures/sculpture_david.jpg similarity index 100% rename from loading/background_load/sculpture_david.jpg rename to loading/background_load/sculptures/sculpture_david.jpg diff --git a/loading/background_load/sculpture_david.jpg.import b/loading/background_load/sculptures/sculpture_david.jpg.import similarity index 67% rename from loading/background_load/sculpture_david.jpg.import rename to loading/background_load/sculptures/sculpture_david.jpg.import index d8b8c15f..c5496401 100644 --- a/loading/background_load/sculpture_david.jpg.import +++ b/loading/background_load/sculptures/sculpture_david.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/sculpture_david.jpg-48aeb7cb164d32e6f17209e6764b659c.stex" +path="res://.import/sculpture_david.jpg-a970dbaef2d14bf5b95bd6bc742cc5b7.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sculpture_david.jpg" -dest_files=[ "res://.import/sculpture_david.jpg-48aeb7cb164d32e6f17209e6764b659c.stex" ] +source_file="res://sculptures/sculpture_david.jpg" +dest_files=[ "res://.import/sculpture_david.jpg-a970dbaef2d14bf5b95bd6bc742cc5b7.stex" ] [params] diff --git a/loading/background_load/sculpture_fountain.jpg b/loading/background_load/sculptures/sculpture_fountain.jpg similarity index 100% rename from loading/background_load/sculpture_fountain.jpg rename to loading/background_load/sculptures/sculpture_fountain.jpg diff --git a/loading/background_load/sculpture_fountain.jpg.import b/loading/background_load/sculptures/sculpture_fountain.jpg.import similarity index 67% rename from loading/background_load/sculpture_fountain.jpg.import rename to loading/background_load/sculptures/sculpture_fountain.jpg.import index 4c9c582b..5d5e563b 100644 --- a/loading/background_load/sculpture_fountain.jpg.import +++ b/loading/background_load/sculptures/sculpture_fountain.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/sculpture_fountain.jpg-dac3819d7eb39b78d36e9f6504d09bc6.stex" +path="res://.import/sculpture_fountain.jpg-c97f66cd28cbdedd878a6bccaee9f8ab.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sculpture_fountain.jpg" -dest_files=[ "res://.import/sculpture_fountain.jpg-dac3819d7eb39b78d36e9f6504d09bc6.stex" ] +source_file="res://sculptures/sculpture_fountain.jpg" +dest_files=[ "res://.import/sculpture_fountain.jpg-c97f66cd28cbdedd878a6bccaee9f8ab.stex" ] [params] diff --git a/loading/background_load/sculpture_four_parts_of_earth.jpg b/loading/background_load/sculptures/sculpture_four_parts_of_earth.jpg similarity index 100% rename from loading/background_load/sculpture_four_parts_of_earth.jpg rename to loading/background_load/sculptures/sculpture_four_parts_of_earth.jpg diff --git a/loading/background_load/sculpture_four_parts_of_earth.jpg.import b/loading/background_load/sculptures/sculpture_four_parts_of_earth.jpg.import similarity index 64% rename from loading/background_load/sculpture_four_parts_of_earth.jpg.import rename to loading/background_load/sculptures/sculpture_four_parts_of_earth.jpg.import index c7676864..3ddd20a5 100644 --- a/loading/background_load/sculpture_four_parts_of_earth.jpg.import +++ b/loading/background_load/sculptures/sculpture_four_parts_of_earth.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/sculpture_four_parts_of_earth.jpg-6d7b17284103f155af8220c6e7c0afb3.stex" +path="res://.import/sculpture_four_parts_of_earth.jpg-3a91357b6e4b11dc5c9d6cf4e883ae09.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sculpture_four_parts_of_earth.jpg" -dest_files=[ "res://.import/sculpture_four_parts_of_earth.jpg-6d7b17284103f155af8220c6e7c0afb3.stex" ] +source_file="res://sculptures/sculpture_four_parts_of_earth.jpg" +dest_files=[ "res://.import/sculpture_four_parts_of_earth.jpg-3a91357b6e4b11dc5c9d6cf4e883ae09.stex" ] [params] diff --git a/loading/background_load/sculpture_lincoln.jpg b/loading/background_load/sculptures/sculpture_lincoln.jpg similarity index 100% rename from loading/background_load/sculpture_lincoln.jpg rename to loading/background_load/sculptures/sculpture_lincoln.jpg diff --git a/loading/background_load/sculpture_lincoln.jpg.import b/loading/background_load/sculptures/sculpture_lincoln.jpg.import similarity index 67% rename from loading/background_load/sculpture_lincoln.jpg.import rename to loading/background_load/sculptures/sculpture_lincoln.jpg.import index c7496bd7..34300488 100644 --- a/loading/background_load/sculpture_lincoln.jpg.import +++ b/loading/background_load/sculptures/sculpture_lincoln.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/sculpture_lincoln.jpg-2309a3ef73573c72052204394b916eef.stex" +path="res://.import/sculpture_lincoln.jpg-6788997c8779fe1e17e7199d4f455ddd.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sculpture_lincoln.jpg" -dest_files=[ "res://.import/sculpture_lincoln.jpg-2309a3ef73573c72052204394b916eef.stex" ] +source_file="res://sculptures/sculpture_lincoln.jpg" +dest_files=[ "res://.import/sculpture_lincoln.jpg-6788997c8779fe1e17e7199d4f455ddd.stex" ] [params] diff --git a/loading/background_load/sculpture_thinker.jpg b/loading/background_load/sculptures/sculpture_thinker.jpg similarity index 100% rename from loading/background_load/sculpture_thinker.jpg rename to loading/background_load/sculptures/sculpture_thinker.jpg diff --git a/loading/background_load/sculpture_thinker.jpg.import b/loading/background_load/sculptures/sculpture_thinker.jpg.import similarity index 67% rename from loading/background_load/sculpture_thinker.jpg.import rename to loading/background_load/sculptures/sculpture_thinker.jpg.import index d11cd226..dd0e722f 100644 --- a/loading/background_load/sculpture_thinker.jpg.import +++ b/loading/background_load/sculptures/sculpture_thinker.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/sculpture_thinker.jpg-d13623267c5f848cecaa2bb8bb609f24.stex" +path="res://.import/sculpture_thinker.jpg-09c1107239db80502d91eb2eed125d58.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sculpture_thinker.jpg" -dest_files=[ "res://.import/sculpture_thinker.jpg-d13623267c5f848cecaa2bb8bb609f24.stex" ] +source_file="res://sculptures/sculpture_thinker.jpg" +dest_files=[ "res://.import/sculpture_thinker.jpg-09c1107239db80502d91eb2eed125d58.stex" ] [params] diff --git a/loading/background_load/sculpture_venus.png b/loading/background_load/sculptures/sculpture_venus.png similarity index 100% rename from loading/background_load/sculpture_venus.png rename to loading/background_load/sculptures/sculpture_venus.png diff --git a/loading/background_load/sculpture_venus.png.import b/loading/background_load/sculptures/sculpture_venus.png.import similarity index 67% rename from loading/background_load/sculpture_venus.png.import rename to loading/background_load/sculptures/sculpture_venus.png.import index eff7ffed..3958bfe5 100644 --- a/loading/background_load/sculpture_venus.png.import +++ b/loading/background_load/sculptures/sculpture_venus.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/sculpture_venus.png-ce0240c8ebb6a0aae05e92456d21d8f3.stex" +path="res://.import/sculpture_venus.png-f25859b819e865591053766b700269eb.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sculpture_venus.png" -dest_files=[ "res://.import/sculpture_venus.png-ce0240c8ebb6a0aae05e92456d21d8f3.stex" ] +source_file="res://sculptures/sculpture_venus.png" +dest_files=[ "res://.import/sculpture_venus.png-f25859b819e865591053766b700269eb.stex" ] [params]