From 222fde443b86a981e6dd19e1c69634e76b3c4b1e Mon Sep 17 00:00:00 2001 From: Zac Date: Mon, 11 Feb 2019 19:47:05 -0500 Subject: [PATCH] moved nodes around in car/game scene updated project settings --- _scenes/Game.tscn | 2 ++ _scenes/car.tscn | 42 +++++++++++++++++++++++------------------- _scenes/rain.tscn | 2 +- project.godot | 5 +++++ 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/_scenes/Game.tscn b/_scenes/Game.tscn index cd6d4f9..fe2838a 100644 --- a/_scenes/Game.tscn +++ b/_scenes/Game.tscn @@ -69,6 +69,8 @@ transform = Transform2D( 1, 0, 0, 1, 0, 0 ) [node name="background" type="Node2D" parent="." index="1"] +editor/display_folded = true + [node name="outside" type="ColorRect" parent="background" index="0"] show_behind_parent = true diff --git a/_scenes/car.tscn b/_scenes/car.tscn index c9120bd..f1788df 100644 --- a/_scenes/car.tscn +++ b/_scenes/car.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://scripts/game.gd" type="Script" id=1] +[ext_resource path="res://scripts/windshield.gd" type="Script" id=1] [ext_resource path="res://textures/light.png" type="Texture" id=2] [ext_resource path="res://scripts/wiper.gd" type="Script" id=3] [ext_resource path="res://textures/windshield.png" type="Texture" id=4] @@ -103,13 +103,13 @@ shadow_filter = 0 shadow_filter_smooth = 0.0 shadow_item_cull_mask = 1 -[node name="inside" type="Node2D" parent="." index="1"] - -[node name="wipers" type="Node2D" parent="inside" index="0"] +[node name="wipers" type="Node2D" parent="outside" index="1"] +editor/display_folded = true position = Vector2( -70, 0 ) +scale = Vector2( 1, 1 ) -[node name="wiper" type="Node2D" parent="inside/wipers" index="0"] +[node name="wiper" type="Node2D" parent="outside/wipers" index="0"] editor/display_folded = true position = Vector2( 625.978, 431 ) @@ -121,7 +121,7 @@ __meta__ = { } dead_zones = 200 -[node name="StaticBody2D" type="StaticBody2D" parent="inside/wipers/wiper" index="0"] +[node name="StaticBody2D" type="StaticBody2D" parent="outside/wipers/wiper" index="0"] editor/display_folded = true position = Vector2( 0, -134.828 ) @@ -134,12 +134,12 @@ friction = 1.0 bounce = 0.0 _sections_unfolded = [ "Collision", "Transform" ] -[node name="CollisionShape2D" type="CollisionShape2D" parent="inside/wipers/wiper/StaticBody2D" index="0"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="outside/wipers/wiper/StaticBody2D" index="0"] position = Vector2( -9.15527e-05, -23.881 ) shape = SubResource( 1 ) -[node name="ColorRect" type="ColorRect" parent="inside/wipers/wiper/StaticBody2D" index="1"] +[node name="ColorRect" type="ColorRect" parent="outside/wipers/wiper/StaticBody2D" index="1"] anchor_left = 0.0 anchor_top = 0.0 @@ -158,7 +158,7 @@ size_flags_vertical = 1 color = Color( 0, 0, 0, 1 ) _sections_unfolded = [ "Rect" ] -[node name="wiper_sound" type="AudioStreamPlayer" parent="inside/wipers/wiper" index="1"] +[node name="wiper_sound" type="AudioStreamPlayer" parent="outside/wipers/wiper" index="1"] stream = null volume_db = 0.0 @@ -167,7 +167,7 @@ autoplay = false mix_target = 0 bus = "Wipers" -[node name="wiper2" type="Node2D" parent="inside/wipers" index="1"] +[node name="wiper2" type="Node2D" parent="outside/wipers" index="1"] editor/display_folded = true position = Vector2( 286.773, 431 ) @@ -179,7 +179,7 @@ __meta__ = { } dead_zones = 200 -[node name="StaticBody2D" type="StaticBody2D" parent="inside/wipers/wiper2" index="0"] +[node name="StaticBody2D" type="StaticBody2D" parent="outside/wipers/wiper2" index="0"] editor/display_folded = true position = Vector2( 0, -134.828 ) @@ -192,12 +192,12 @@ friction = 1.0 bounce = 0.0 _sections_unfolded = [ "Collision", "Transform" ] -[node name="CollisionShape2D" type="CollisionShape2D" parent="inside/wipers/wiper2/StaticBody2D" index="0"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="outside/wipers/wiper2/StaticBody2D" index="0"] position = Vector2( -9.15527e-05, -23.881 ) shape = SubResource( 1 ) -[node name="ColorRect" type="ColorRect" parent="inside/wipers/wiper2/StaticBody2D" index="1"] +[node name="ColorRect" type="ColorRect" parent="outside/wipers/wiper2/StaticBody2D" index="1"] anchor_left = 0.0 anchor_top = 0.0 @@ -216,7 +216,7 @@ size_flags_vertical = 1 color = Color( 0, 0, 0, 1 ) _sections_unfolded = [ "Rect" ] -[node name="wiper_sound" type="AudioStreamPlayer" parent="inside/wipers/wiper2" index="1"] +[node name="wiper_sound" type="AudioStreamPlayer" parent="outside/wipers/wiper2" index="1"] stream = null volume_db = 0.0 @@ -225,8 +225,9 @@ autoplay = false mix_target = 0 bus = "Wipers" -[node name="rain_area" type="Area2D" parent="inside" index="1"] +[node name="rain_area" type="Area2D" parent="outside" index="2"] +editor/display_folded = true position = Vector2( 514, 264 ) scale = Vector2( 16.125, 5.8125 ) input_pickable = false @@ -240,13 +241,16 @@ collision_layer = 4 collision_mask = 2 audio_bus_override = false audio_bus_name = "Master" +_sections_unfolded = [ "Collision" ] -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="inside/rain_area" index="0"] +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="outside/rain_area" index="0"] build_mode = 0 polygon = PoolVector2Array( -23.1938, 30.2796, -28.155, -31.6559, 26.4186, -31.6559, 22.6977, 30.2796 ) -[node name="windshield" type="TextureRect" parent="inside" index="2"] +[node name="inside" type="Node2D" parent="." index="1"] + +[node name="windshield" type="TextureRect" parent="inside" index="0"] material = SubResource( 3 ) anchor_left = 0.0 @@ -267,8 +271,8 @@ expand = true stretch_mode = 0 _sections_unfolded = [ "Material" ] -[connection signal="body_entered" from="inside/rain_area" to="." method="_on_rain_area_body_entered"] +[connection signal="body_entered" from="outside/rain_area" to="." method="_on_rain_area_body_entered"] -[connection signal="body_exited" from="inside/rain_area" to="." method="_on_rain_area_body_exited"] +[connection signal="body_exited" from="outside/rain_area" to="." method="_on_rain_area_body_exited"] diff --git a/_scenes/rain.tscn b/_scenes/rain.tscn index ff3ab74..3736470 100644 --- a/_scenes/rain.tscn +++ b/_scenes/rain.tscn @@ -31,7 +31,7 @@ linear_damp = -1.0 angular_velocity = 0.0 angular_damp = -1.0 script = ExtResource( 1 ) -_sections_unfolded = [ "Collision", "Transform" ] +_sections_unfolded = [ "Collision" ] [node name="Sprite" type="Sprite" parent="." index="0"] diff --git a/project.godot b/project.godot index 025afc3..b3a8d34 100644 --- a/project.godot +++ b/project.godot @@ -18,6 +18,11 @@ config/icon="res://icon.png" GameState="*res://scripts/globals/variables.gd" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="keep" + [input] wipe=[ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)