oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Optimization Part 2 (#6)

Browse Source 
Authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
2021-06-20 18:19:42 +02:00
committed by GitHub
parent 4e09f522ff
commit d5a0022b7b
18 changed files with 330 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
addons/escoria-core/game/scenes/sound/bg_music.gd
View File

@@ -1,23 +1,28 @@
# Background music player
extends Control
class_name ESCBackgroundMusic
func get_class():
return "ESCBackgroundMusic"
onready var stream = $AudioStreamPlayer
var state = "default"
export var global_id = "bg_music"
# Global id of the background music player
export var global_id: String = "bg_music"
func game_cleared():
set_state("off", true)
escoria.object_manager.register_object(
ESCObject.new(global_id, self),
true
)
# The state of the music player. "default" or "off" disable music
# Any other state refers to a music stream that should be played
var state: String = "default"
func set_state(p_state, p_force = false):
# Reference to the audio player
onready var stream: AudioStreamPlayer = $AudioStreamPlayer
# Set the state of this player
#
# #### Parameters
#
# - p_state: New state to use
# - p_force: Override the existing state even if the stream is still playing
func set_state(p_state: String, p_force: bool = false) -> void:
# If already playing this stream, keep playing, unless p_force
if p_state == state and not p_force and stream.is_playing():
return
@@ -39,6 +44,8 @@ func set_state(p_state, p_force = false):
stream.volume_db = ProjectSettings.get_setting("escoria/sound/music_volume")
stream.play()
# Register to the object registry
func _ready():
escoria.object_manager.register_object(
ESCObject.new(global_id, self),

30
addons/escoria-core/game/scenes/sound/bg_sound.gd
View File

@@ -1,23 +1,28 @@
# Background sound player
extends Control
class_name ESCBackgroundSound
func get_class():
return "ESCBackgroundSound"
onready var stream = $AudioStreamPlayer
var state = "default"
export var global_id = "bg_sound"
# Global id of the background sound player
export var global_id: String = "bg_sound"
func game_cleared():
stream.stream = null
escoria.object_manager.register_object(
ESCObject.new(global_id, self),
true
)
# The state of the sound player. "default" or "off" disable sound
# Any other state refers to a sound stream that should be played
var state: String = "default"
func set_state(p_state, p_force = false):
# Reference to the audio player
onready var stream: AudioStreamPlayer = $AudioStreamPlayer
# Set the state of this player
#
# #### Parameters
#
# - p_state: New state to use
# - p_force: Override the existing state even if the stream is still playing
func set_state(p_state: String, p_force: bool = false):
# If already playing this stream, keep playing, unless p_force
if p_state == state and not p_force and stream.is_playing():
return
@@ -40,6 +45,7 @@ func set_state(p_state, p_force = false):
stream.play()
# Register to the object registry
func _ready():
escoria.object_manager.register_object(
ESCObject.new(global_id, self),