small racing game im working on
music [skip ci]
| -rw-r--r-- | assets/sounds/music.ogg | bin | 0 -> 632481 bytes | |||
| -rw-r--r-- | assets/sounds/music.ogg.import | 19 | ||||
| -rw-r--r-- | default_bus_layout.tres | 6 | ||||
| -rw-r--r-- | scenes/ghost_watcher.gd | 1 | ||||
| -rw-r--r-- | scenes/race_highlevel.gd | 1 | ||||
| -rw-r--r-- | start.tscn | 8 | ||||
| -rw-r--r-- | ui/tracks.gd | 10 |
7 files changed, 42 insertions, 3 deletions
diff --git a/assets/sounds/music.ogg b/assets/sounds/music.ogg Binary files differnew file mode 100644 index 0000000..1892dd2 --- /dev/null +++ b/assets/sounds/music.ogg diff --git a/assets/sounds/music.ogg.import b/assets/sounds/music.ogg.import new file mode 100644 index 0000000..29a58c0 --- /dev/null +++ b/assets/sounds/music.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bwiyphl31lwu6" +path="res://.godot/imported/music.ogg-a816242481c3cc8e174cac58f63e5379.oggvorbisstr" + +[deps] + +source_file="res://assets/sounds/music.ogg" +dest_files=["res://.godot/imported/music.ogg-a816242481c3cc8e174cac58f63e5379.oggvorbisstr"] + +[params] + +loop=true +loop_offset=0.0 +bpm=0.0 +beat_count=0 +bar_beats=4 diff --git a/default_bus_layout.tres b/default_bus_layout.tres index 5aa9abb..ab4dca2 100644 --- a/default_bus_layout.tres +++ b/default_bus_layout.tres @@ -1,3 +1,9 @@ [gd_resource type="AudioBusLayout" format=3 uid="uid://bqa1ktdoiq6xq"] [resource] +bus/1/name = &"music" +bus/1/solo = false +bus/1/mute = false +bus/1/bypass_fx = false +bus/1/volume_db = 0.0 +bus/1/send = &"music 2" diff --git a/scenes/ghost_watcher.gd b/scenes/ghost_watcher.gd index abf2d1c..3df6d7b 100644 --- a/scenes/ghost_watcher.gd +++ b/scenes/ghost_watcher.gd @@ -56,6 +56,7 @@ func _physics_process(delta: float) -> void: timer.stop() finished.emit() ghost.reset(false) + queue_free() return ghost.update(Globals.ghost.load_snap(frame), delta) diff --git a/scenes/race_highlevel.gd b/scenes/race_highlevel.gd index 7b84429..c9e44aa 100644 --- a/scenes/race_highlevel.gd +++ b/scenes/race_highlevel.gd @@ -46,6 +46,7 @@ func add_player() -> void: finish.queue_free() get_tree().paused = false ) + finish.quit.connect(queue_free) ) func count_in(): @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=3 uid="uid://bvfqaoqjsxj73"] +[gd_scene load_steps=10 format=3 uid="uid://bvfqaoqjsxj73"] [ext_resource type="Theme" uid="uid://cru1d7n2ftrfm" path="res://ui/theme.tres" id="1_gm0ws"] [ext_resource type="Script" path="res://ui/tracks.gd" id="2_po2ce"] @@ -8,6 +8,7 @@ [ext_resource type="Resource" path="res://tracks/the fallen tramps.tres" id="5_qwie6"] [ext_resource type="PackedScene" uid="uid://demunxvqkmtwa" path="res://scenes/ghost_watcher.tscn" id="7_6ph7w"] [ext_resource type="PackedScene" uid="uid://dfvtugujgcjcw" path="res://ui/track_button.tscn" id="7_pchkj"] +[ext_resource type="AudioStream" uid="uid://bwiyphl31lwu6" path="res://assets/sounds/music.ogg" id="9_ma7kx"] [node name="start" type="Control"] layout_mode = 3 @@ -46,3 +47,8 @@ tracks = Array[Resource("res://classes/track.gd")]([ExtResource("3_0yjp1"), ExtR race = ExtResource("5_m5kci") ghost_watch = ExtResource("7_6ph7w") trackbutton = ExtResource("7_pchkj") + +[node name="music" type="AudioStreamPlayer" parent="."] +stream = ExtResource("9_ma7kx") +autoplay = true +bus = &"music" diff --git a/ui/tracks.gd b/ui/tracks.gd index 89463b6..eb3d14d 100644 --- a/ui/tracks.gd +++ b/ui/tracks.gd @@ -18,10 +18,16 @@ func play(track: TrackResource, ghost: GhostData) -> void: print("play %s" % track.name) Globals.playing = track Globals.ghost = ghost - get_tree().change_scene_to_packed(race) + add_to_main(race) func watch(track: TrackResource, ghost: GhostData) -> void: print("watch %s" % track.name) Globals.playing = track Globals.ghost = ghost - get_tree().change_scene_to_packed(ghost_watch) + add_to_main(ghost_watch) + +func add_to_main(p: PackedScene) -> void: + owner.hide() + var c := p.instantiate() + get_viewport().add_child(c) + c.tree_exited.connect(owner.show) |