diff --git a/3d_platforma/Level.tscn b/3d_platforma/Level.tscn index de14de0..58cf085 100644 --- a/3d_platforma/Level.tscn +++ b/3d_platforma/Level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=2] +[gd_scene load_steps=22 format=2] [ext_resource path="res://3d_platforma/Player.tscn" type="PackedScene" id=1] [ext_resource path="res://scripts/Library/Actions/Snare Admiral 2.wav" type="AudioStream" id=3] @@ -115,7 +115,7 @@ material = SubResource( 36 ) [node name="enviroment" type="Spatial" parent="."] [node name="Ring2" type="CSGPolygon" parent="enviroment"] -transform = Transform( 0.866025, 0.5, -2.18557e-08, 0, -4.37114e-08, -1, -0.5, 0.866025, -3.78552e-08, 0, -0.4, -21.4713 ) +transform = Transform( 0.866025, 0.5, -2.18557e-08, 0, -4.37114e-08, -1, -0.5, 0.866025, -3.78552e-08, -1, 3.6, -18.4713 ) polygon = PoolVector2Array( 9, -2, 9.4, -1, 10, -1, 10, -2 ) mode = 1 spin_degrees = 360.0 @@ -123,15 +123,7 @@ spin_sides = 16 material = SubResource( 38 ) [node name="Ring3" type="CSGPolygon" parent="enviroment"] -transform = Transform( 0.866025, 0.5, -2.18557e-08, 0, -4.37114e-08, -1, -0.5, 0.866025, -3.78552e-08, -10, 6.6, -33.4713 ) -polygon = PoolVector2Array( 13, -4, 14, -2, 15, -2, 15, -4 ) -mode = 1 -spin_degrees = 360.0 -spin_sides = 16 -material = SubResource( 38 ) - -[node name="Ring4" type="CSGPolygon" parent="enviroment"] -transform = Transform( 1.93185, -0.517638, 2.26267e-08, 0, -8.74228e-08, -2, 0.517638, 1.93185, -8.44439e-08, -11, -0.4, -62.4713 ) +transform = Transform( 0.866025, 0.5, -2.18557e-08, 0, -4.37114e-08, -1, -0.5, 0.866025, -3.78552e-08, -7, 6.6, -28.4713 ) polygon = PoolVector2Array( 13, -4, 14, -2, 15, -2, 15, -4 ) mode = 1 spin_degrees = 360.0 @@ -151,7 +143,7 @@ sides = 11 [node name="Ring" type="CSGPolygon" parent="platforms_slow"] transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0.7, -8.07128 ) use_collision = true -polygon = PoolVector2Array( 3, 0, 3.37031, 1.2588, 4.15364, 1.29316, 4, 0 ) +polygon = PoolVector2Array( 6.5, 0.1, 6.4, 1, 7, 1, 7, 0 ) mode = 1 spin_degrees = 360.0 spin_sides = 16 @@ -186,6 +178,27 @@ width = 2.2 height = 0.6 material = SubResource( 22 ) +[node name="slow_path4" type="CSGBox" parent="platforms_slow"] +transform = Transform( 0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, -4.3, 1.6, -18.5713 ) +use_collision = true +width = 2.2 +height = 0.6 +material = SubResource( 22 ) + +[node name="slow_path5" type="CSGBox" parent="platforms_slow"] +transform = Transform( 0.866026, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866026, -6.3, 2.6, -21.5713 ) +use_collision = true +width = 2.2 +height = 0.6 +material = SubResource( 22 ) + +[node name="slow_path6" type="CSGBox" parent="platforms_slow"] +transform = Transform( 0.965926, 0, 0.258819, 0, 1, 0, -0.258819, 0, 0.965926, -7.3, 3.6, -24.5713 ) +use_collision = true +width = 2.2 +height = 0.6 +material = SubResource( 22 ) + [node name="lift" type="Spatial" parent="platforms_slow"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8, -0.4, -16 ) visible = false @@ -228,13 +241,13 @@ script = ExtResource( 1 ) script = ExtResource( 1 ) [node name="TapeFast" parent="." instance=ExtResource( 9 )] -transform = Transform( 0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, -1.34058, 0, -1.25926 ) +transform = Transform( 0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, -1.34058, 6, -1.25926 ) [node name="TapeNormal" parent="." instance=ExtResource( 10 )] -transform = Transform( 0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0.518271, 0, -1.35086 ) +transform = Transform( 0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0.518271, 6, -1.35086 ) [node name="TapeSlow" parent="." instance=ExtResource( 11 )] -transform = Transform( 0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 2.24, 0, -1.3138 ) +transform = Transform( 0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, -0.06, 0.7, -6.3138 ) [node name="AudioStreamPlayer3DSlow" type="AudioStreamPlayer3D" parent="."] script = ExtResource( 12 ) diff --git a/project.godot b/project.godot index 4c4ea7a..d8ccedf 100644 --- a/project.godot +++ b/project.godot @@ -45,11 +45,6 @@ _global_script_classes=[ { "path": "res://scripts/Library/Actions/TriggerBase.gd" }, { "base": "TriggerBase", -"class": "TriggerOnCollision", -"language": "GDScript", -"path": "res://scripts/Library/Actions/TriggerOnCollision.gd" -}, { -"base": "TriggerBase", "class": "TriggerOnReady", "language": "GDScript", "path": "res://scripts/Library/Actions/TriggerOnReady.gd" @@ -62,7 +57,6 @@ _global_script_class_icons={ "SetNormalMusic": "", "SetSlowMusic": "", "TriggerBase": "", -"TriggerOnCollision": "", "TriggerOnReady": "" } @@ -133,4 +127,5 @@ common/enable_pause_aware_picking=true [rendering] +quality/driver/driver_name="GLES2" environment/default_environment="res://default_env.tres"