small racing game im working on
-rw-r--r--assets/cars/cruella/cruella.blend.import2
-rw-r--r--assets/cars/kenney_sedan/sedan.tscn42
-rw-r--r--assets/textures/checkpoint.png.import2
-rw-r--r--assets/textures/finish.png.import2
-rw-r--r--assets/textures/road.png.import2
-rw-r--r--assets/textures/start.png.import2
-rw-r--r--assets/textures/support.png.import2
-rw-r--r--classes/car.gd2
-rw-r--r--scenes/skid_particles.tscn13
-rw-r--r--ui/assets/flag.png.import2
-rw-r--r--ui/assets/ghost.png.import2
-rw-r--r--ui/assets/line.png.import2
-rw-r--r--ui/assets/player_indicator.png.import2
-rw-r--r--ui/hud.tscn19
14 files changed, 33 insertions, 63 deletions
diff --git a/assets/cars/cruella/cruella.blend.import b/assets/cars/cruella/cruella.blend.import
index 0da1947..f0454b8 100644
--- a/assets/cars/cruella/cruella.blend.import
+++ b/assets/cars/cruella/cruella.blend.import
@@ -26,8 +26,10 @@ skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
+animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
+gltf/embedded_image_handling=1
blender/nodes/visible=1
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
diff --git a/assets/cars/kenney_sedan/sedan.tscn b/assets/cars/kenney_sedan/sedan.tscn
index 0274359..999f129 100644
--- a/assets/cars/kenney_sedan/sedan.tscn
+++ b/assets/cars/kenney_sedan/sedan.tscn
@@ -1,10 +1,9 @@
-[gd_scene load_steps=36 format=3 uid="uid://c157wew5y33bo"]
+[gd_scene load_steps=35 format=3 uid="uid://c157wew5y33bo"]
[ext_resource type="Script" path="res://classes/car.gd" id="1_pdccm"]
[ext_resource type="Script" path="res://assets/cars/engine.gd" id="2_rxib8"]
-[ext_resource type="Material" uid="uid://b0t01t5nxdfdp" path="res://assets/cars/skid.tres" id="2_yev8o"]
[ext_resource type="Curve" uid="uid://f1go1j7raaq1" path="res://assets/cars/sounds/idle_db.tres" id="3_gwsff"]
-[ext_resource type="SphereMesh" uid="uid://cd2plk55q0xr7" path="res://assets/cars/sphere.tres" id="3_wncel"]
+[ext_resource type="PackedScene" uid="uid://c5kk8cn8ipuy1" path="res://scenes/skid_particles.tscn" id="4_axi2x"]
[ext_resource type="Curve" uid="uid://bq1r63t410ork" path="res://assets/cars/sounds/low_db.tres" id="4_rdkge"]
[ext_resource type="Curve" uid="uid://d15cjufi3m0wg" path="res://assets/cars/sounds/med_db.tres" id="5_7w6r4"]
[ext_resource type="Curve" uid="uid://d0rkqfng2uvkw" path="res://assets/cars/sounds/high_db.tres" id="6_h74co"]
@@ -381,14 +380,8 @@ transform = Transform3D(-2.33967, 0, -2.0454e-07, 0, 2.33967, 0, 2.0454e-07, 0,
mesh = SubResource("ArrayMesh_n2y6h")
skeleton = NodePath("")
-[node name="particles" type="GPUParticles3D" parent="br"]
-emitting = false
-lifetime = 3.0
-explosiveness = 0.1
-randomness = 0.2
-visibility_aabb = AABB(-3.72308, -2.91366, -16.6076, 7.11382, 10.4403, 19.4272)
-process_material = ExtResource("2_yev8o")
-draw_pass_1 = ExtResource("3_wncel")
+[node name="particles" parent="br" instance=ExtResource("4_axi2x")]
+explosiveness = 0.01
[node name="bl" type="VehicleWheel3D" parent="."]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -1.2, 0.8, 1.51)
@@ -407,14 +400,7 @@ transform = Transform3D(2.33967, -1.78815e-14, -2.0454e-07, 0, 2.33967, -2.0454e
mesh = SubResource("ArrayMesh_n2y6h")
skeleton = NodePath("")
-[node name="particles" type="GPUParticles3D" parent="bl"]
-emitting = false
-lifetime = 3.0
-explosiveness = 0.1
-randomness = 0.2
-visibility_aabb = AABB(-3.72308, -2.91366, -16.6076, 7.11382, 10.4403, 19.4272)
-process_material = ExtResource("2_yev8o")
-draw_pass_1 = ExtResource("3_wncel")
+[node name="particles" parent="bl" instance=ExtResource("4_axi2x")]
[node name="fl" type="VehicleWheel3D" parent="."]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -1.2, 0.8, -1.51)
@@ -433,14 +419,7 @@ transform = Transform3D(2.33967, -3.08847e-14, -2.0454e-07, 0, 2.33967, -3.5328e
mesh = SubResource("ArrayMesh_n2y6h")
skeleton = NodePath("")
-[node name="particles" type="GPUParticles3D" parent="fl"]
-emitting = false
-lifetime = 3.0
-explosiveness = 0.1
-randomness = 0.2
-visibility_aabb = AABB(-3.72308, -2.91366, -16.6076, 7.11382, 10.4403, 19.4272)
-process_material = ExtResource("2_yev8o")
-draw_pass_1 = ExtResource("3_wncel")
+[node name="particles" parent="fl" instance=ExtResource("4_axi2x")]
[node name="fr" type="VehicleWheel3D" parent="."]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 1.2, 0.8, -1.51)
@@ -459,14 +438,7 @@ transform = Transform3D(-2.33967, 0, -2.0454e-07, 0, 2.33967, 0, 2.0454e-07, 0,
mesh = SubResource("ArrayMesh_n2y6h")
skeleton = NodePath("")
-[node name="particles" type="GPUParticles3D" parent="fr"]
-emitting = false
-lifetime = 3.0
-explosiveness = 0.1
-randomness = 0.2
-visibility_aabb = AABB(-3.72308, -2.91366, -16.6076, 7.11382, 10.4403, 19.4272)
-process_material = ExtResource("2_yev8o")
-draw_pass_1 = ExtResource("3_wncel")
+[node name="particles" parent="fr" instance=ExtResource("4_axi2x")]
[node name="Coll" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.43328, 0)
diff --git a/assets/textures/checkpoint.png.import b/assets/textures/checkpoint.png.import
index d573eb7..db703c7 100644
--- a/assets/textures/checkpoint.png.import
+++ b/assets/textures/checkpoint.png.import
@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/checkpoint.png-dac8cd7986b94a518a1a7788f75dc7
[params]
compress/mode=0
+compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
-compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
diff --git a/assets/textures/finish.png.import b/assets/textures/finish.png.import
index fa9915d..30e4c3e 100644
--- a/assets/textures/finish.png.import
+++ b/assets/textures/finish.png.import
@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/finish.png-8d313dadff4636164fef822b4b0a8dae.c
[params]
compress/mode=0
+compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
-compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
diff --git a/assets/textures/road.png.import b/assets/textures/road.png.import
index 68cb883..11bf00e 100644
--- a/assets/textures/road.png.import
+++ b/assets/textures/road.png.import
@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/road.png-d477774f72907c6d431b3440dca2d9fc.cte
[params]
compress/mode=0
+compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
-compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
diff --git a/assets/textures/start.png.import b/assets/textures/start.png.import
index ee31170..06007b5 100644
--- a/assets/textures/start.png.import
+++ b/assets/textures/start.png.import
@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/start.png-3733841c0e1b31b58bc761257dcedb56.ct
[params]
compress/mode=0
+compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
-compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
diff --git a/assets/textures/support.png.import b/assets/textures/support.png.import
index 8c5179a..230e829 100644
--- a/assets/textures/support.png.import
+++ b/assets/textures/support.png.import
@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/support.png-302cf88a429f8c9d60f7b2b4f46840dd.
[params]
compress/mode=0
+compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
-compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
diff --git a/classes/car.gd b/classes/car.gd
index bdace2c..cd9a66a 100644
--- a/classes/car.gd
+++ b/classes/car.gd
@@ -21,7 +21,7 @@ var particles: Array[GPUParticles3D] = []
signal shifted
-var gear_ratios: Array[float] = [ 5, 2.01, 1.59, 1.32, 1.13, 1.0 ]
+var gear_ratios: Array[float] = [ 5 ]
var current_gear := 0 # -1 reverse, 0 = neutral, 1 - 6 = gear 1 to 6.
var clutch_position := 1 # 0.0 = clutch engaged
var gear_timer := 0.0
diff --git a/scenes/skid_particles.tscn b/scenes/skid_particles.tscn
new file mode 100644
index 0000000..fbf9f44
--- /dev/null
+++ b/scenes/skid_particles.tscn
@@ -0,0 +1,13 @@
+[gd_scene load_steps=3 format=3 uid="uid://c5kk8cn8ipuy1"]
+
+[ext_resource type="Material" uid="uid://b0t01t5nxdfdp" path="res://assets/cars/skid.tres" id="1_kxobg"]
+[ext_resource type="SphereMesh" uid="uid://cd2plk55q0xr7" path="res://assets/cars/sphere.tres" id="2_fo2nd"]
+
+[node name="particles" type="GPUParticles3D"]
+emitting = false
+lifetime = 3.0
+explosiveness = 0.1
+randomness = 0.2
+visibility_aabb = AABB(-3.72308, -2.91366, -16.6076, 7.11382, 10.4403, 19.4272)
+process_material = ExtResource("1_kxobg")
+draw_pass_1 = ExtResource("2_fo2nd")
diff --git a/ui/assets/flag.png.import b/ui/assets/flag.png.import
index 83baf36..3915419 100644
--- a/ui/assets/flag.png.import
+++ b/ui/assets/flag.png.import
@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/flag.png-ae4aee06cb6133fea5cfeec11a85a7a4.cte
[params]
compress/mode=0
+compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
-compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
diff --git a/ui/assets/ghost.png.import b/ui/assets/ghost.png.import
index b9f6c13..fb644fa 100644
--- a/ui/assets/ghost.png.import
+++ b/ui/assets/ghost.png.import
@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/ghost.png-610c2abac161623bca06478a79c589c4.ct
[params]
compress/mode=0
+compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
-compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
diff --git a/ui/assets/line.png.import b/ui/assets/line.png.import
index 6e63f13..68d40a5 100644
--- a/ui/assets/line.png.import
+++ b/ui/assets/line.png.import
@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/line.png-b33e28e32d8a52ddf96a3673a00aafcd.cte
[params]
compress/mode=0
+compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
-compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
diff --git a/ui/assets/player_indicator.png.import b/ui/assets/player_indicator.png.import
index 34563c5..52250ee 100644
--- a/ui/assets/player_indicator.png.import
+++ b/ui/assets/player_indicator.png.import
@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/player_indicator.png-0f15ec53c35e919f51b0b4bc
[params]
compress/mode=0
+compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
-compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
diff --git a/ui/hud.tscn b/ui/hud.tscn
index 961e6ad..a8b93d7 100644
--- a/ui/hud.tscn
+++ b/ui/hud.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=18 format=3 uid="uid://vok7fdcyec68"]
+[gd_scene load_steps=17 format=3 uid="uid://vok7fdcyec68"]
[ext_resource type="Theme" uid="uid://ch2uo5qd8ubx6" path="res://ui/theme.tres" id="1_ie2j2"]
[ext_resource type="Script" path="res://ui/hud.gd" id="1_sfhpc"]
@@ -9,7 +9,6 @@
[ext_resource type="Script" path="res://ui/gears.gd" id="5_g6cg4"]
[ext_resource type="StyleBox" uid="uid://cly1aqudpku5j" path="res://ui/panel_skew_r.tres" id="6_g2n2l"]
[ext_resource type="Texture2D" uid="uid://b3nmp7eyu0hjk" path="res://ui/assets/flag.png" id="6_ho2g6"]
-[ext_resource type="Script" path="res://ui/revs.gd" id="6_l10wo"]
[ext_resource type="Texture2D" uid="uid://b6ad1yrgtg6qk" path="res://ui/assets/player_indicator.png" id="7_wv12s"]
[ext_resource type="Texture2D" uid="uid://dkbrx7rpa8dvc" path="res://ui/assets/ghost.png" id="8_yfv7r"]
[ext_resource type="PackedScene" uid="uid://nkh2xi7tnumc" path="res://ui/splits/splits.tscn" id="9_gtkqi"]
@@ -119,21 +118,6 @@ bbcode_enabled = true
text = "[center] [b][color=#4682b4]N[/color][/b][/center]"
script = ExtResource("5_g6cg4")
-[node name="revs" type="PanelContainer" parent="Dashboard"]
-layout_mode = 2
-size_flags_vertical = 8
-theme_override_styles/panel = ExtResource("6_g2n2l")
-
-[node name="revs" type="Label" parent="Dashboard/revs"]
-custom_minimum_size = Vector2(0, 80)
-layout_mode = 2
-size_flags_horizontal = 4
-theme_override_font_sizes/font_size = 60
-text = " 0rpm"
-horizontal_alignment = 1
-vertical_alignment = 1
-script = ExtResource("6_l10wo")
-
[node name="MiniMap" type="Line2D" parent="."]
texture_repeat = 2
scale = Vector2(0.5, 0.5)
@@ -159,5 +143,4 @@ offset_right = 25.0
[connection signal="assigned" from="." to="Dashboard/speed/speed" method="car_assigned" unbinds=3]
[connection signal="assigned" from="." to="Dashboard/timer/time" method="assigned" unbinds=1]
[connection signal="assigned" from="." to="Dashboard/gears/gears" method="assigned" unbinds=3]
-[connection signal="assigned" from="." to="Dashboard/revs/revs" method="assigned" unbinds=3]
[connection signal="next_lap" from="." to="Dashboard/laps" method="increment"]