aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar cel 🌸 <cel@blos.sm>2023-07-09 17:05:00 +0100
committerLibravatar cel 🌸 <cel@blos.sm>2023-07-09 17:05:00 +0100
commit041ce9927f269ce55cb5a5dfa1e3f9f668590fcf (patch)
tree94425707e7be1eb43d7589debd3b91fa63f81462
parent859563f6ad4370a7f5f96963d63f4d83eecad9a4 (diff)
parente789ce08fed7a1b1023c411a7661bac6c8b0fa30 (diff)
download2023-041ce9927f269ce55cb5a5dfa1e3f9f668590fcf.tar.gz
2023-041ce9927f269ce55cb5a5dfa1e3f9f668590fcf.tar.bz2
2023-041ce9927f269ce55cb5a5dfa1e3f9f668590fcf.zip
fix crash 2: electric boogaloocurve-smoothing
-rw-r--r--.gitignore3
-rw-r--r--Assets/road.png.import2
-rw-r--r--Levels/Level1.tscn23
-rw-r--r--Levels/Level2.tscn21
-rw-r--r--Levels/Level3.tscn21
-rw-r--r--Levels/Tut01.tscn9
-rw-r--r--Levels/Tut02.tscn9
-rw-r--r--Levels/Tut03.tscn9
-rw-r--r--Nodes/driving_test.tscn2
-rw-r--r--Nodes/ui.tscn2
-rw-r--r--Scripts/drawing.gd4
11 files changed, 95 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 4709183..df79fb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
# Godot 4+ specific ignores
.godot/
+
+.build/
+.export_presets.cfg
diff --git a/Assets/road.png.import b/Assets/road.png.import
index 59a81a8..52c0241 100644
--- a/Assets/road.png.import
+++ b/Assets/road.png.import
@@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-uid="uid://bcn7tgs6a4fm7"
+uid="uid://x8c4q8wv8u4o"
path="res://.godot/imported/road.png-c3c47e2cc8c90beae2ad5c8a3bb2c3ca.ctex"
metadata={
"vram_texture": false
diff --git a/Levels/Level1.tscn b/Levels/Level1.tscn
index cbe44c2..74ffae4 100644
--- a/Levels/Level1.tscn
+++ b/Levels/Level1.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=3 uid="uid://b7nxnsf8dirqk"]
+[gd_scene load_steps=15 format=3 uid="uid://b7nxnsf8dirqk"]
[ext_resource type="Script" path="res://Scripts/scene_control.gd" id="1_jvdy8"]
[ext_resource type="PackedScene" uid="uid://c8r6i3bu37ogu" path="res://Nodes/ui.tscn" id="2_2bp3f"]
@@ -8,7 +8,7 @@
[ext_resource type="Script" path="res://Scripts/drawing.gd" id="6_yls5q"]
[ext_resource type="Texture2D" uid="uid://dg3v488vx0oj6" path="res://Assets/checkpoint.png" id="7_e50r0"]
[ext_resource type="PackedScene" uid="uid://wkfai2lvnp7n" path="res://Nodes/checkpoint.tscn" id="8_mrrls"]
-[ext_resource type="Texture2D" uid="uid://bcn7tgs6a4fm7" path="res://Assets/road.png" id="8_yjlto"]
+[ext_resource type="Texture2D" uid="uid://x8c4q8wv8u4o" path="res://Assets/road.png" id="8_yjlto"]
[ext_resource type="Script" path="res://Scripts/Road.gd" id="9_3mco4"]
[ext_resource type="TileSet" uid="uid://cl8153posdeim" path="res://Assets/grass_tile_set.tres" id="9_m86ct"]
@@ -17,6 +17,10 @@ radius = 17.0
[sub_resource type="Curve2D" id="Curve2D_0exre"]
+[sub_resource type="LabelSettings" id="LabelSettings_ux08a"]
+outline_size = 3
+outline_color = Color(0, 0, 0, 1)
+
[node name="Level_test" type="Node2D"]
script = ExtResource("1_jvdy8")
silver_medal_time = 6.0
@@ -107,4 +111,19 @@ layer_1/tile_data = PackedInt32Array(2424836, 131072, 8, 2424837, 131072, 8, 242
build_mode = 1
polygon = PackedVector2Array(964, 570, 845, 570, 835, 586, 765, 585, 740, 616, 594, 618, 580, 602, 462, 601, 449, 617, 257, 618, 244, 601, 225, 602, 211, 586, 124, 585, 115, 599, 49, 602, 40, 595, 38, 573, 24, 561, 23, 538, 38, 535, 39, 509, 54, 501, 54, 364, 39, 351, 38, 318, 23, 304, 22, 284, 36, 278, 38, 173, 24, 163, 23, 123, 35, 118, 44, 105, 57, 101, 54, 58, 68, 54, 82, 54, 92, 39, 196, 38, 203, 53, 277, 53, 283, 68, 454, 70, 460, 56, 484, 54, 494, 38, 581, 38, 586, 51, 660, 53, 667, 69, 724, 70, 732, 55, 756, 54, 763, 39, 801, 37, 815, 55, 828, 39, 897, 37, 922, 68, 980, 71, 987, 84, 1075, 86, 1111, 122, 1113, 148, 1129, 155, 1130, 205, 1115, 220, 1115, 256, 1099, 268, 1097, 322, 1111, 331, 1113, 385, 1096, 396, 1098, 419, 1113, 427, 1115, 481, 1099, 491, 1099, 571, 1089, 585, 1069, 583, 1059, 600, 1011, 603, 996, 585, 978, 585)
+[node name="Control" type="Control" parent="."]
+layout_mode = 3
+anchors_preset = 0
+offset_left = 1014.0
+offset_top = 29.0
+offset_right = 1054.0
+offset_bottom = 69.0
+
+[node name="Label" type="Label" parent="Control"]
+layout_mode = 0
+offset_right = 63.0
+offset_bottom = 26.0
+text = "Level 01"
+label_settings = SubResource("LabelSettings_ux08a")
+
[connection signal="mouse_entered" from="FinishLine/Area2D" to="DrawNode" method="_end_drawing"]
diff --git a/Levels/Level2.tscn b/Levels/Level2.tscn
index 048ceb4..fd2e379 100644
--- a/Levels/Level2.tscn
+++ b/Levels/Level2.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=13 format=3 uid="uid://c4ufprgnkgelp"]
+[gd_scene load_steps=12 format=3 uid="uid://c4ufprgnkgelp"]
[ext_resource type="Script" path="res://Scripts/scene_control.gd" id="1_hjw4x"]
[ext_resource type="PackedScene" uid="uid://c8r6i3bu37ogu" path="res://Nodes/ui.tscn" id="2_koori"]
@@ -16,6 +16,10 @@ radius = 17.0
[sub_resource type="Curve2D" id="Curve2D_0exre"]
+[sub_resource type="LabelSettings" id="LabelSettings_yc6jr"]
+outline_size = 3
+outline_color = Color(0, 0, 0, 1)
+
[node name="Level_test2" type="Node2D"]
script = ExtResource("1_hjw4x")
gold_medal_time = 5.1
@@ -107,4 +111,19 @@ position = Vector2(-1, 7)
build_mode = 1
polygon = PackedVector2Array(521, 175, 528, 156, 611, 160, 620, 174, 642, 175, 651, 189, 695, 209, 694, 239, 710, 241, 710, 286, 727, 292, 729, 328, 710, 339, 717, 409, 696, 420, 697, 440, 682, 454, 677, 475, 658, 498, 606, 497, 597, 480, 576, 479, 567, 464, 547, 468, 535, 452, 517, 433, 474, 433, 472, 402, 455, 395, 456, 371, 441, 366, 440, 342, 424, 332, 429, 308, 441, 299, 443, 235, 463, 210, 478, 186, 504, 190)
+[node name="Control" type="Control" parent="."]
+layout_mode = 3
+anchors_preset = 0
+offset_left = 1010.0
+offset_top = 31.0
+offset_right = 1050.0
+offset_bottom = 71.0
+
+[node name="Label" type="Label" parent="Control"]
+layout_mode = 0
+offset_right = 63.0
+offset_bottom = 26.0
+text = "Level 02"
+label_settings = SubResource("LabelSettings_yc6jr")
+
[connection signal="mouse_entered" from="FinishLine/Area2D" to="DrawNode" method="_end_drawing"]
diff --git a/Levels/Level3.tscn b/Levels/Level3.tscn
index 0b9c987..73cdd37 100644
--- a/Levels/Level3.tscn
+++ b/Levels/Level3.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=13 format=3 uid="uid://ctw32x620maaj"]
+[gd_scene load_steps=12 format=3 uid="uid://ctw32x620maaj"]
[ext_resource type="Script" path="res://Scripts/scene_control.gd" id="1_iao1p"]
[ext_resource type="PackedScene" uid="uid://c8r6i3bu37ogu" path="res://Nodes/ui.tscn" id="2_rgpyj"]
@@ -16,6 +16,10 @@ radius = 17.0
[sub_resource type="Curve2D" id="Curve2D_0exre"]
+[sub_resource type="LabelSettings" id="LabelSettings_4hqyx"]
+outline_size = 3
+outline_color = Color(0, 0, 0, 1)
+
[node name="Level_test2" type="Node2D"]
script = ExtResource("1_iao1p")
gold_medal_time = 6.0
@@ -119,4 +123,19 @@ position = Vector2(-1, 7)
build_mode = 1
polygon = PackedVector2Array(618, 147, 618, 353, 659, 353, 669, 340, 683, 324, 698, 318, 698, 291, 717, 278, 713, 263, 730, 249, 730, 198, 701, 179, 694, 163, 670, 160, 656, 145)
+[node name="Control" type="Control" parent="."]
+layout_mode = 3
+anchors_preset = 0
+offset_left = 1014.0
+offset_top = 29.0
+offset_right = 1054.0
+offset_bottom = 69.0
+
+[node name="Label" type="Label" parent="Control"]
+layout_mode = 0
+offset_right = 63.0
+offset_bottom = 26.0
+text = "Level 03"
+label_settings = SubResource("LabelSettings_4hqyx")
+
[connection signal="mouse_entered" from="FinishLine/Area2D" to="DrawNode" method="_end_drawing"]
diff --git a/Levels/Tut01.tscn b/Levels/Tut01.tscn
index 1665673..ab2a1e1 100644
--- a/Levels/Tut01.tscn
+++ b/Levels/Tut01.tscn
@@ -91,6 +91,15 @@ offset_bottom = 466.0
text = "Click here to start drawing the road"
label_settings = SubResource("LabelSettings_sv8of")
+[node name="Label5" type="Label" parent="Control"]
+layout_mode = 0
+offset_left = 963.0
+offset_top = 24.0
+offset_right = 1237.0
+offset_bottom = 50.0
+text = "Tutorial 01"
+label_settings = SubResource("LabelSettings_sv8of")
+
[node name="Label4" type="RichTextLabel" parent="Control"]
layout_mode = 0
offset_left = 127.0
diff --git a/Levels/Tut02.tscn b/Levels/Tut02.tscn
index 1fbe1a9..6cfb2eb 100644
--- a/Levels/Tut02.tscn
+++ b/Levels/Tut02.tscn
@@ -88,6 +88,15 @@ offset_bottom = 236.0
text = "Sand is off limits and the car won't go there"
label_settings = SubResource("LabelSettings_sv8of")
+[node name="Label2" type="Label" parent="Control"]
+layout_mode = 0
+offset_left = 961.0
+offset_top = 21.0
+offset_right = 1296.0
+offset_bottom = 47.0
+text = "Tutorial 02"
+label_settings = SubResource("LabelSettings_sv8of")
+
[node name="TileMap" type="TileMap" parent="."]
z_index = -1
tile_set = ExtResource("8_a1rvy")
diff --git a/Levels/Tut03.tscn b/Levels/Tut03.tscn
index 8085194..8f45c64 100644
--- a/Levels/Tut03.tscn
+++ b/Levels/Tut03.tscn
@@ -89,6 +89,15 @@ offset_bottom = 145.0
text = "You need to include every checkpoint to make the race count."
label_settings = SubResource("LabelSettings_sv8of")
+[node name="Label2" type="Label" parent="Control"]
+layout_mode = 0
+offset_left = 943.0
+offset_top = 27.0
+offset_right = 1420.0
+offset_bottom = 53.0
+text = "Tutorial 03"
+label_settings = SubResource("LabelSettings_sv8of")
+
[node name="TileMap" type="TileMap" parent="."]
z_index = -1
tile_set = ExtResource("8_1mcey")
diff --git a/Nodes/driving_test.tscn b/Nodes/driving_test.tscn
index 86964c5..15e6af6 100644
--- a/Nodes/driving_test.tscn
+++ b/Nodes/driving_test.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=5 format=3 uid="uid://b205qlgjrpeqi"]
+[gd_scene load_steps=5 format=3 uid="uid://13ynwilqep0f"]
[ext_resource type="Script" path="res://Scripts/scene_control.gd" id="1_eopk0"]
[ext_resource type="PackedScene" uid="uid://cqglbcitm2wlb" path="res://Nodes/simple_wall.tscn" id="1_o5f4t"]
diff --git a/Nodes/ui.tscn b/Nodes/ui.tscn
index 877dcf0..fb68989 100644
--- a/Nodes/ui.tscn
+++ b/Nodes/ui.tscn
@@ -280,7 +280,7 @@ anchor_left = 0.3
anchor_top = 0.3
anchor_right = 0.5
anchor_bottom = 0.3
-offset_right = 10.0
+offset_right = -10.0
offset_bottom = 23.0
scale = Vector2(1, 1.02025)
text = "Final Time:"
diff --git a/Scripts/drawing.gd b/Scripts/drawing.gd
index 612ba60..e99d4a0 100644
--- a/Scripts/drawing.gd
+++ b/Scripts/drawing.gd
@@ -2,7 +2,7 @@ extends Node
var drawing = false
-@onready var line = $TrackLine
+@onready var line: Line2D = $TrackLine
@onready var path: Path2D = $TrackPath
func _ready():
@@ -18,8 +18,6 @@ func _end_drawing():
drawing = false
line.simplify()
line.draw_borders()
- for point in line.points:
- path.curve.add_point(point)
owner.set_driving(true)