diff --git a/default_bus_layout.tres b/default_bus_layout.tres index 3961658..d246562 100644 --- a/default_bus_layout.tres +++ b/default_bus_layout.tres @@ -6,7 +6,7 @@ resource_name = "Record" [resource] bus/1/name = &"Record" bus/1/solo = false -bus/1/mute = false +bus/1/mute = true bus/1/bypass_fx = false bus/1/volume_db = 0.0 bus/1/send = &"Master" diff --git a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/Player.gd b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/Player.gd index ae508fa..394f04f 100644 --- a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/Player.gd +++ b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/Player.gd @@ -31,8 +31,10 @@ func _ready(): AudioServer.add_bus_effect(idx, AudioEffectRecord.new(), 0) effect = AudioServer.get_bus_effect(idx, 0) while true: + var tree = get_tree() + if !tree: return _on_RecordButton_pressed() - await get_tree().create_timer(0.1).timeout + await tree.create_timer(0.1).timeout _on_RecordButton_pressed() _on_PlayButton_pressed() @@ -55,26 +57,28 @@ func _on_RecordButton_pressed(): effect.set_recording_active(true) func _on_PlayButton_pressed(): + var max_amplitude = 0 var data = recording.get_data() - const max_amplitude = 12000.0 - var amplitude = 0.0 + const threshold = 5000 # Iterate through each pair of bytes in the PackedByteArray for i in range(0, data.size(), 2): # Combine two bytes to create one 16-bit sample var sample = data[i] | (data[i+1] << 8) - + # Convert to signed 16-bit integer if necessary if sample >= 32768: sample -= 65536 - + # Calculate absolute value for amplitude - amplitude = abs(sample) - if amplitude <= 200.0: - amplitude = 0.0 - #var amplitude_percentage = roundi(100.0*max_amplitude/(32768 - threshold)) - var amplitude_percentage = roundi(100.0* (amplitude / max_amplitude)) + var amplitude = abs(sample) + amplitude = max(0, amplitude - threshold) + + # Update max_amplitude if this sample's amplitude is greater + if amplitude > max_amplitude: + max_amplitude = amplitude + var amplitude_percentage = roundi(100.0*max_amplitude/(32768 - threshold)) amp_changes.emit("Amp: " + str(amplitude_percentage) +"%") - SPEED = 250.0 + 250.0 * (amplitude / max_amplitude) + SPEED = 250.0 + 250.0 * (max_amplitude / threshold) func reset_player(): position = Vector2(128.0, 512.0) @@ -90,7 +94,7 @@ func _physics_process(delta): if Input.is_action_just_pressed("up") and is_on_floor(): velocity.y = -JUMP_VELOCITY - if Input.is_action_just_pressed("ui_accept") and is_on_floor(): + if Input.is_action_just_pressed("ui_accept"): reset_player() diff --git a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/game-test.gd b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/game-test.gd index c4e8a25..bef1791 100644 --- a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/game-test.gd +++ b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/game-test.gd @@ -29,7 +29,7 @@ func _on_host_button_pressed(): func _on_join_button_pressed(): main_menu.hide() hud.show() - print("here2") + var address = address_entry.text if address_entry.text == "": address = "localhost" diff --git a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/player.tscn b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/player.tscn index 08d58e8..d87c3f6 100644 --- a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/player.tscn +++ b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/player.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/CameraPlayer.gd" id="8_xrvh5"] [ext_resource type="Texture2D" uid="uid://coiaxftxa6ket" path="res://prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/resources/images/Light.png" id="9_fo443"] -[sub_resource type="Image" id="Image_nymhq"] +[sub_resource type="Image" id="Image_vmxbo"] data = { "data": PackedByteArray(249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0), "format": "RGBA8", @@ -15,7 +15,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_0052l"] -image = SubResource("Image_nymhq") +image = SubResource("Image_vmxbo") [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_tugnh"] properties/0/path = NodePath(".:position") diff --git a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/world.tscn b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/world.tscn index bdde4e9..add9c1e 100644 --- a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/world.tscn +++ b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/world.tscn @@ -20,7 +20,7 @@ particles_anim_loop = false [sub_resource type="RectangleShape2D" id="RectangleShape2D_d1mxw"] size = Vector2(831, 36) -[sub_resource type="Image" id="Image_rby6c"] +[sub_resource type="Image" id="Image_vx857"] data = { "data": PackedByteArray(249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0), "format": "RGBA8", @@ -30,7 +30,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_4bga1"] -image = SubResource("Image_rby6c") +image = SubResource("Image_vx857") [node name="World" type="Node2D"] diff --git a/prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/Player.gd b/prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/Player.gd index ef6572a..162ac09 100644 --- a/prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/Player.gd +++ b/prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/Player.gd @@ -115,23 +115,25 @@ func _on_RecordButton_pressed(): effect.set_recording_active(true) func _on_PlayButton_pressed(): + var max_amplitude = 0 var data = recording.get_data() - const max_amplitude = 12000.0 - var amplitude = 0.0 + const threshold = 5000 # Iterate through each pair of bytes in the PackedByteArray for i in range(0, data.size(), 2): # Combine two bytes to create one 16-bit sample var sample = data[i] | (data[i+1] << 8) - + # Convert to signed 16-bit integer if necessary if sample >= 32768: sample -= 65536 - + # Calculate absolute value for amplitude - amplitude = abs(sample) - if amplitude <= 200.0: - amplitude = 0.0 - #var amplitude_percentage = roundi(100.0*max_amplitude/(32768 - threshold)) - var amplitude_percentage = roundi(100.0* (amplitude / max_amplitude)) + var amplitude = abs(sample) + amplitude = max(0, amplitude - threshold) + + # Update max_amplitude if this sample's amplitude is greater + if amplitude > max_amplitude: + max_amplitude = amplitude + var amplitude_percentage = roundi(100.0*max_amplitude/(32768 - threshold)) amp_changes.emit("Amp: " + str(amplitude_percentage) +"%") - SPEED = 10.0 + 10.0 * (amplitude / max_amplitude) + SPEED = 10.0 + 10.0 * (max_amplitude / threshold)