From 5a31d015b192e996236b6e785152d4a4338db183 Mon Sep 17 00:00:00 2001 From: Isaac Shoebottom Date: Sun, 15 Dec 2024 23:12:19 -0400 Subject: [PATCH] Fix keyboard repeated bug, add background --- scenes/Omnichord.tscn | 13 ++++++++++--- scripts/Global.gd | 6 ++++++ scripts/KeyboardController.gd | 4 +++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/scenes/Omnichord.tscn b/scenes/Omnichord.tscn index b0020a7..c9e8886 100644 --- a/scenes/Omnichord.tscn +++ b/scenes/Omnichord.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=3 uid="uid://b4fgp0mhbgkfw"] +[gd_scene load_steps=15 format=3 uid="uid://b4fgp0mhbgkfw"] [ext_resource type="Script" path="res://scripts/StopController.gd" id="1_5jtep"] [ext_resource type="FontFile" uid="uid://bm75cyco0ymhp" path="res://fonts/Roboto_Mono/static/RobotoMono-Medium.ttf" id="1_e5fk4"] @@ -12,17 +12,24 @@ [ext_resource type="Script" path="res://scripts/ChordController.gd" id="4_xrjq4"] [ext_resource type="Script" path="res://scripts/NoteController.gd" id="5_x2vij"] +[sub_resource type="Gradient" id="Gradient_kdyyq"] +offsets = PackedFloat32Array(0) +colors = PackedColorArray(0.2, 0.2, 0.2, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_plal4"] +gradient = SubResource("Gradient_kdyyq") + [sub_resource type="Theme" id="Theme_uc44k"] default_font = ExtResource("1_e5fk4") -[node name="Control" type="Control"] -layout_mode = 3 +[node name="Control" type="TextureRect"] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 0 +texture = SubResource("GradientTexture1D_plal4") [node name="ChordPlayer" type="AudioStreamPlayer" parent="."] diff --git a/scripts/Global.gd b/scripts/Global.gd index d686d60..4ed9619 100644 --- a/scripts/Global.gd +++ b/scripts/Global.gd @@ -1,10 +1,16 @@ extends Node +@warning_ignore("unused_signal") signal chord_changed(chord: String) +@warning_ignore("unused_signal") signal loop_changed(state: bool) +@warning_ignore("unused_signal") signal note_volume(vol: float) +@warning_ignore("unused_signal") signal chord_volume(vol: float) +@warning_ignore("unused_signal") signal rhythm_volume(vol: float) +@warning_ignore("unused_signal") signal rhythm_tempo(tempo: float) diff --git a/scripts/KeyboardController.gd b/scripts/KeyboardController.gd index 308c643..9e72549 100644 --- a/scripts/KeyboardController.gd +++ b/scripts/KeyboardController.gd @@ -1,7 +1,9 @@ extends Node func _input(event): - if event is InputEventKey and event.pressed: + if event is InputEventKey and event.is_pressed(): + if event.is_echo(): + return # Major (Top Row) if event.keycode == KEY_Q: $"Buttons/Chords/eb".button_pressed()