cogentleman/guitarHeroButBetter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Gordon Weeks 2026-01-31 16:52:57 -08:00
parent c370dbef9a
commit 65a1c122c4
3 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/entities/song_catalog.h
View File

@ -10,9 +10,9 @@ using SongCatalogEntry = std::pair<std::string, int>;
inline std::vector<SongCatalogEntry> get_song_catalog() inline std::vector<SongCatalogEntry> get_song_catalog()
{ {
return { return {
{"assets/songs/json/mary.json", 0}, {"assets/songs/json/mary.json", -1},
{"assets/songs/json/pallettown.json", 0}, {"assets/songs/json/pallettown.json", -1},
{"assets/songs/json/tetris.json", 0}, {"assets/songs/json/tetris.json", -1},
{"assets/songs/json/undertale.json", 0}, {"assets/songs/json/undertale.json", 0},
}; };
} }

116
src/samples/ghhb_game.h
View File

@ -81,18 +81,18 @@ const Color INSTRUMENT_COLORS[MAX_INSTRUMENT_TYPES] = {
const char* const INSTRUMENT_LANE_WAV[MAX_INSTRUMENT_TYPES][LANE_COUNT * OCTAVE_COUNT] { const char* const INSTRUMENT_LANE_WAV[MAX_INSTRUMENT_TYPES][LANE_COUNT * OCTAVE_COUNT] {
{ // Instrument 0 - Bass { // Instrument 0 - Bass
"assets/sounds/genesis_bass/genesis_bass_024.wav", "assets/sounds/genesis_bass/genesis_bass_025.wav", "assets/sounds/snes_synth/snes_synth_048.wav", "assets/sounds/snes_synth/snes_synth_049.wav",
"assets/sounds/genesis_bass/genesis_bass_026.wav", "assets/sounds/genesis_bass/genesis_bass_027.wav", "assets/sounds/snes_synth/snes_synth_050.wav", "assets/sounds/snes_synth/snes_synth_051.wav",
"assets/sounds/genesis_bass/genesis_bass_028.wav", "assets/sounds/genesis_bass/genesis_bass_029.wav", "assets/sounds/snes_synth/snes_synth_052.wav", "assets/sounds/snes_synth/snes_synth_053.wav",
"assets/sounds/genesis_bass/genesis_bass_030.wav", "assets/sounds/genesis_bass/genesis_bass_031.wav", "assets/sounds/snes_synth/snes_synth_054.wav", "assets/sounds/snes_synth/snes_synth_055.wav",
"assets/sounds/genesis_bass/genesis_bass_032.wav", "assets/sounds/genesis_bass/genesis_bass_033.wav", "assets/sounds/snes_synth/snes_synth_056.wav", "assets/sounds/snes_synth/snes_synth_057.wav",
"assets/sounds/genesis_bass/genesis_bass_034.wav", "assets/sounds/genesis_bass/genesis_bass_035.wav", "assets/sounds/snes_synth/snes_synth_058.wav", "assets/sounds/snes_synth/snes_synth_059.wav",
"assets/sounds/genesis_bass/genesis_bass_036.wav", "assets/sounds/genesis_bass/genesis_bass_037.wav", "assets/sounds/snes_synth/snes_synth_060.wav", "assets/sounds/snes_synth/snes_synth_061.wav",
"assets/sounds/genesis_bass/genesis_bass_038.wav", "assets/sounds/genesis_bass/genesis_bass_039.wav", "assets/sounds/snes_synth/snes_synth_062.wav", "assets/sounds/snes_synth/snes_synth_063.wav",
"assets/sounds/genesis_bass/genesis_bass_040.wav", "assets/sounds/genesis_bass/genesis_bass_041.wav", "assets/sounds/snes_synth/snes_synth_064.wav", "assets/sounds/snes_synth/snes_synth_065.wav",
"assets/sounds/genesis_bass/genesis_bass_042.wav", "assets/sounds/genesis_bass/genesis_bass_043.wav", "assets/sounds/snes_synth/snes_synth_066.wav", "assets/sounds/snes_synth/snes_synth_067.wav",
"assets/sounds/genesis_bass/genesis_bass_044.wav", "assets/sounds/genesis_bass/genesis_bass_045.wav", "assets/sounds/snes_synth/snes_synth_068.wav", "assets/sounds/snes_synth/snes_synth_069.wav",
"assets/sounds/genesis_bass/genesis_bass_046.wav", "assets/sounds/genesis_bass/genesis_bass_047.wav" "assets/sounds/snes_synth/snes_synth_070.wav", "assets/sounds/snes_synth/snes_synth_071.wav"
}, },
{ // Instrument 1 - Synth { // Instrument 1 - Synth
"assets/sounds/snes_synth/snes_synth_048.wav", "assets/sounds/snes_synth/snes_synth_049.wav", "assets/sounds/snes_synth/snes_synth_048.wav", "assets/sounds/snes_synth/snes_synth_049.wav",
@ -109,18 +109,18 @@ const char* const INSTRUMENT_LANE_WAV[MAX_INSTRUMENT_TYPES][LANE_COUNT * OCTAVE_
"assets/sounds/snes_synth/snes_synth_070.wav", "assets/sounds/snes_synth/snes_synth_071.wav" "assets/sounds/snes_synth/snes_synth_070.wav", "assets/sounds/snes_synth/snes_synth_071.wav"
}, },
{ // Instrument 2 { // Instrument 2
"assets/sounds/genesis_bass/genesis_bass_024.wav", "assets/sounds/genesis_bass/genesis_bass_025.wav", "assets/sounds/snes_synth/snes_synth_048.wav", "assets/sounds/snes_synth/snes_synth_049.wav",
"assets/sounds/genesis_bass/genesis_bass_026.wav", "assets/sounds/genesis_bass/genesis_bass_027.wav", "assets/sounds/snes_synth/snes_synth_050.wav", "assets/sounds/snes_synth/snes_synth_051.wav",
"assets/sounds/genesis_bass/genesis_bass_028.wav", "assets/sounds/genesis_bass/genesis_bass_029.wav", "assets/sounds/snes_synth/snes_synth_052.wav", "assets/sounds/snes_synth/snes_synth_053.wav",
"assets/sounds/genesis_bass/genesis_bass_030.wav", "assets/sounds/genesis_bass/genesis_bass_031.wav", "assets/sounds/snes_synth/snes_synth_054.wav", "assets/sounds/snes_synth/snes_synth_055.wav",
"assets/sounds/genesis_bass/genesis_bass_032.wav", "assets/sounds/genesis_bass/genesis_bass_033.wav", "assets/sounds/snes_synth/snes_synth_056.wav", "assets/sounds/snes_synth/snes_synth_057.wav",
"assets/sounds/genesis_bass/genesis_bass_034.wav", "assets/sounds/genesis_bass/genesis_bass_035.wav", "assets/sounds/snes_synth/snes_synth_058.wav", "assets/sounds/snes_synth/snes_synth_059.wav",
"assets/sounds/genesis_bass/genesis_bass_036.wav", "assets/sounds/genesis_bass/genesis_bass_037.wav", "assets/sounds/snes_synth/snes_synth_060.wav", "assets/sounds/snes_synth/snes_synth_061.wav",
"assets/sounds/genesis_bass/genesis_bass_038.wav", "assets/sounds/genesis_bass/genesis_bass_039.wav", "assets/sounds/snes_synth/snes_synth_062.wav", "assets/sounds/snes_synth/snes_synth_063.wav",
"assets/sounds/genesis_bass/genesis_bass_040.wav", "assets/sounds/genesis_bass/genesis_bass_041.wav", "assets/sounds/snes_synth/snes_synth_064.wav", "assets/sounds/snes_synth/snes_synth_065.wav",
"assets/sounds/genesis_bass/genesis_bass_042.wav", "assets/sounds/genesis_bass/genesis_bass_043.wav", "assets/sounds/snes_synth/snes_synth_066.wav", "assets/sounds/snes_synth/snes_synth_067.wav",
"assets/sounds/genesis_bass/genesis_bass_044.wav", "assets/sounds/genesis_bass/genesis_bass_045.wav", "assets/sounds/snes_synth/snes_synth_068.wav", "assets/sounds/snes_synth/snes_synth_069.wav",
"assets/sounds/genesis_bass/genesis_bass_046.wav", "assets/sounds/genesis_bass/genesis_bass_047.wav" "assets/sounds/snes_synth/snes_synth_070.wav", "assets/sounds/snes_synth/snes_synth_071.wav"
}, },
{ // Instrument 3 { // Instrument 3
"assets/sounds/snes_synth/snes_synth_048.wav", "assets/sounds/snes_synth/snes_synth_049.wav", "assets/sounds/snes_synth/snes_synth_048.wav", "assets/sounds/snes_synth/snes_synth_049.wav",
@ -233,8 +233,6 @@ std::vector<Glyph> chart_from_song(const Song& song, int track_override)
// Log original glyph timing (time is bottom, time + duration is top) // Log original glyph timing (time is bottom, time + duration is top)
float new_bottom_time = time_sec; float new_bottom_time = time_sec;
float new_top_time = time_sec + duration_sec; float new_top_time = time_sec + duration_sec;
std::printf("[NEW GLYPH] lane=%d bottom=%.3f top=%.3f dur=%.3f\n",
lane, new_bottom_time, new_top_time, duration_sec);
Glyph* last_in_lane = nullptr; Glyph* last_in_lane = nullptr;
for (size_t i = glyphs.size(); i-- > 0;) for (size_t i = glyphs.size(); i-- > 0;)
@ -251,21 +249,13 @@ std::vector<Glyph> chart_from_song(const Song& song, int track_override)
float existing_bottom = last_in_lane->time; float existing_bottom = last_in_lane->time;
float existing_top = last_in_lane->time + last_in_lane->duration_sec; float existing_top = last_in_lane->time + last_in_lane->duration_sec;
std::printf(" [CHECK] existing lane=%d bottom=%.3f top=%.3f vs new_bottom=%.3f\n",
last_in_lane->lane, existing_bottom, existing_top, new_bottom_time);
if (existing_top > new_bottom_time) if (existing_top > new_bottom_time)
{ {
// Truncate existing glyph so its top doesn't go past new glyph's bottom // Truncate existing glyph so its top doesn't go past new glyph's bottom
float shortened_duration = new_bottom_time - existing_bottom; float shortened_duration = new_bottom_time - existing_bottom;
std::printf(" [OVERLAP DETECTED] shortened_dur=%.3f (was %.3f)\n",
shortened_duration, last_in_lane->duration_sec);
if (shortened_duration < MIN_GLYPH_DURATION_SEC) if (shortened_duration < MIN_GLYPH_DURATION_SEC)
{ {
std::printf(" [SKIP] shortened duration %.3f < MIN %.3f, skipping new glyph\n",
shortened_duration, MIN_GLYPH_DURATION_SEC);
note_index++; note_index++;
continue; continue;
} }
@ -273,14 +263,10 @@ std::vector<Glyph> chart_from_song(const Song& song, int track_override)
float old_duration = last_in_lane->duration_sec; float old_duration = last_in_lane->duration_sec;
last_in_lane->duration_sec = shortened_duration; last_in_lane->duration_sec = shortened_duration;
std::printf(" [TRUNCATED] lane=%d: duration %.3f -> %.3f (new_top=%.3f)\n",
last_in_lane->lane, old_duration, shortened_duration,
last_in_lane->time + shortened_duration);
} }
} }
glyphs.push_back(Glyph{time_sec, duration_sec, lane, instrument_slot, octave}); glyphs.push_back(Glyph{time_sec, duration_sec, lane, instrument_slot, octave});
std::printf(" [ADDED] glyph count now: %zu\n\n", glyphs.size());
note_index++; note_index++;
} }
@ -454,20 +440,16 @@ public:
return false; return false;
} }
bool is_instrument_auto_played(int instrument_slot) const
{
return INSTRUMENT_PHYSICAL_GAMEPAD[instrument_slot] < 0;
}
bool is_lane_held_by_instrument(int lane, int instrument_slot) const bool is_lane_held_by_instrument(int lane, int instrument_slot) const
{ {
int physical_id = INSTRUMENT_PHYSICAL_GAMEPAD[instrument_slot]; int physical_id = INSTRUMENT_PHYSICAL_GAMEPAD[instrument_slot];
if (physical_id < 0) if (physical_id < 0)
{
if (IsKeyDown(KEY_KEYS[lane]))
return true;
for (int i = 0; i < MAX_GAMEPADS; i++)
{
if (IsGamepadAvailable(i) && IsGamepadButtonDown(i, GAMEPAD_BUTTONS[lane]))
return true;
}
return false; return false;
}
return IsGamepadAvailable(physical_id) && return IsGamepadAvailable(physical_id) &&
IsGamepadButtonDown(physical_id, GAMEPAD_BUTTONS[lane]); IsGamepadButtonDown(physical_id, GAMEPAD_BUTTONS[lane]);
} }
@ -476,6 +458,8 @@ public:
{ {
for (int slot = 0; slot < MAX_INSTRUMENT_TYPES; slot++) for (int slot = 0; slot < MAX_INSTRUMENT_TYPES; slot++)
{ {
if (is_instrument_auto_played(slot))
continue;
if (is_lane_held_by_instrument(lane, slot)) if (is_lane_held_by_instrument(lane, slot))
continue; continue;
auto it = std::find_if(active_sustained.begin(), active_sustained.end(), auto it = std::find_if(active_sustained.begin(), active_sustained.end(),
@ -499,14 +483,7 @@ public:
{ {
int physical_id = INSTRUMENT_PHYSICAL_GAMEPAD[instrument_slot]; int physical_id = INSTRUMENT_PHYSICAL_GAMEPAD[instrument_slot];
if (physical_id < 0) if (physical_id < 0)
{
for (int i = 0; i < MAX_GAMEPADS; i++)
{
if (IsGamepadAvailable(i) && IsGamepadButtonPressed(i, GAMEPAD_BUTTONS[lane]))
return true;
}
return false; return false;
}
return IsGamepadAvailable(physical_id) && return IsGamepadAvailable(physical_id) &&
IsGamepadButtonPressed(physical_id, GAMEPAD_BUTTONS[lane]); IsGamepadButtonPressed(physical_id, GAMEPAD_BUTTONS[lane]);
} }
@ -613,8 +590,6 @@ public:
{ {
float bottom_hits_line_time = g.time + chart_time_offset; float bottom_hits_line_time = g.time + chart_time_offset;
float top_hits_line_time = bottom_hits_line_time + g.duration_sec; float top_hits_line_time = bottom_hits_line_time + g.duration_sec;
std::printf("[chart] glyph lane=%d bottom_time=%.3f top_time=%.3f dur=%.3f\n",
g.lane, bottom_hits_line_time, top_hits_line_time, g.duration_sec);
} }
debug_bottom_printed = true; debug_bottom_printed = true;
} }
@ -717,6 +692,8 @@ public:
continue; continue;
if (missed_notes.count(n) != 0) if (missed_notes.count(n) != 0)
continue; continue;
if (is_instrument_auto_played(n->instrument_slot))
continue;
float bottom_y = glyph_bottom_y(*n); float bottom_y = glyph_bottom_y(*n);
if (bottom_y > hit_line_y + HIT_ZONE_MARGIN) if (bottom_y > hit_line_y + HIT_ZONE_MARGIN)
{ {
@ -755,25 +732,21 @@ public:
} }
} }
if (dev_auto_hit_mode) std::vector<Glyph*> to_auto_consume;
{
std::vector<Glyph*> to_consume;
for (Glyph* n : spawned) for (Glyph* n : spawned)
{ {
if (completed_notes.count(n) != 0) if (completed_notes.count(n) != 0)
continue; continue;
if (is_note_hittable(*n)) if (!is_note_hittable(*n))
{ continue;
to_consume.push_back(n); if (dev_auto_hit_mode || is_instrument_auto_played(n->instrument_slot))
to_auto_consume.push_back(n);
} }
} for (Glyph* n : to_auto_consume)
for (Glyph* n : to_consume)
{ {
consume_note(n); consume_note(n);
} }
}
else
{
for (int lane = 0; lane < LANE_COUNT; lane++) for (int lane = 0; lane < LANE_COUNT; lane++)
{ {
stop_playing_released_notes(lane, time_per_glyph_height); stop_playing_released_notes(lane, time_per_glyph_height);
@ -789,17 +762,13 @@ public:
for (Glyph* n : spawned) for (Glyph* n : spawned)
{ {
if (n->lane != lane) if (n->lane != lane)
{
continue; continue;
}
if (!is_note_hittable(*n)) if (!is_note_hittable(*n))
{
continue; continue;
} if (is_instrument_auto_played(n->instrument_slot))
continue;
if (!lane_pressed_by_instrument_owner(lane, n->instrument_slot)) if (!lane_pressed_by_instrument_owner(lane, n->instrument_slot))
{
continue; continue;
}
float bottom_y = glyph_bottom_y(*n); float bottom_y = glyph_bottom_y(*n);
float d = fabsf(bottom_y - hit_line_y); float d = fabsf(bottom_y - hit_line_y);
if (d < best_dist) if (d < best_dist)
@ -818,7 +787,6 @@ public:
score = std::max(0, score - 25); score = std::max(0, score - 25);
} }
} }
}
if (is_menu_pressed()) if (is_menu_pressed())
{ {

62
src/samples/instrument_select.h
View File

@ -88,24 +88,32 @@ public:
} }
} }
bool all_selected = true; bool at_least_one_selected = false;
for (int s = 0; s < MAX_INSTRUMENT_TYPES; s++) for (int s = 0; s < MAX_INSTRUMENT_TYPES; s++)
{ {
if (instrument_owner[s] < 0) if (instrument_owner[s] >= 0)
{ {
all_selected = false; at_least_one_selected = true;
break; break;
} }
} }
if (all_selected) if (at_least_one_selected)
{ {
if (IsKeyPressed(KEY_ENTER)) if (IsKeyPressed(KEY_ENTER))
{ {
for (int i = 0; i < MAX_INSTRUMENT_TYPES; i++) for (int i = 0; i < MAX_INSTRUMENT_TYPES; i++)
{
if (instrument_owner[i] >= 0)
{ {
INSTRUMENT_GAMEPAD_INDEX[i] = instrument_owner[i]; INSTRUMENT_GAMEPAD_INDEX[i] = instrument_owner[i];
INSTRUMENT_PHYSICAL_GAMEPAD[i] = participant_order[instrument_owner[i]]; INSTRUMENT_PHYSICAL_GAMEPAD[i] = participant_order[instrument_owner[i]];
} }
else
{
INSTRUMENT_GAMEPAD_INDEX[i] = -1;
INSTRUMENT_PHYSICAL_GAMEPAD[i] = -1;
}
}
game->go_to_scene("ghhb"); game->go_to_scene("ghhb");
return; return;
} }
@ -114,10 +122,18 @@ public:
if (IsGamepadAvailable(gp) && IsGamepadButtonPressed(gp, GAMEPAD_BUTTON_MIDDLE_RIGHT)) if (IsGamepadAvailable(gp) && IsGamepadButtonPressed(gp, GAMEPAD_BUTTON_MIDDLE_RIGHT))
{ {
for (int i = 0; i < MAX_INSTRUMENT_TYPES; i++) for (int i = 0; i < MAX_INSTRUMENT_TYPES; i++)
{
if (instrument_owner[i] >= 0)
{ {
INSTRUMENT_GAMEPAD_INDEX[i] = instrument_owner[i]; INSTRUMENT_GAMEPAD_INDEX[i] = instrument_owner[i];
INSTRUMENT_PHYSICAL_GAMEPAD[i] = participant_order[instrument_owner[i]]; INSTRUMENT_PHYSICAL_GAMEPAD[i] = participant_order[instrument_owner[i]];
} }
else
{
INSTRUMENT_GAMEPAD_INDEX[i] = -1;
INSTRUMENT_PHYSICAL_GAMEPAD[i] = -1;
}
}
game->go_to_scene("ghhb"); game->go_to_scene("ghhb");
return; return;
} }
@ -186,36 +202,52 @@ public:
const float label_font_size = 60.0f; const float label_font_size = 60.0f;
const float label_offset = 50.0f; const float label_offset = 50.0f;
const float label_offset_bottom = 110.0f; const float label_offset_bottom = 110.0f;
auto draw_player_label = [this, &player_labels, label_font_size, label_offset, auto draw_slot_label = [this, &player_labels, label_font_size, label_offset,
label_offset_bottom](float ix, float iy, int slot) { label_offset_bottom](float ix, float iy, int slot) {
if (instrument_owner[slot] < 0) if (instrument_owner[slot] >= 0)
return; {
const char* label = player_labels[instrument_owner[slot]]; const char* label = player_labels[instrument_owner[slot]];
float lw = MeasureTextEx(font, label, label_font_size, 1.0f).x; float lw = MeasureTextEx(font, label, label_font_size, 1.0f).x;
float ly = (slot == SLOT_BOTTOM) ? iy - label_offset_bottom : iy + label_offset; float ly = (slot == SLOT_BOTTOM) ? iy - label_offset_bottom : iy + label_offset;
DrawTextEx(font, label, Vector2{ix - lw * 0.5f, ly}, label_font_size, 1.0f, WHITE); DrawTextEx(font, label, Vector2{ix - lw * 0.5f, ly}, label_font_size, 1.0f, WHITE);
}
else
{
const char* label = "CPU";
float lw = MeasureTextEx(font, label, label_font_size, 1.0f).x;
float ly = (slot == SLOT_BOTTOM) ? iy - label_offset_bottom : iy + label_offset;
DrawTextEx(font, label, Vector2{ix - lw * 0.5f, ly}, label_font_size, 1.0f,
Color{180, 180, 180, 255});
}
}; };
draw_player_label(cx, icon_y_top, SLOT_TOP); draw_slot_label(cx, icon_y_top, SLOT_TOP);
draw_player_label(cx, icon_y_bottom, SLOT_BOTTOM); draw_slot_label(cx, icon_y_bottom, SLOT_BOTTOM);
draw_player_label(icon_x_left, cy, SLOT_LEFT); draw_slot_label(icon_x_left, cy, SLOT_LEFT);
draw_player_label(icon_x_right, cy, SLOT_RIGHT); draw_slot_label(icon_x_right, cy, SLOT_RIGHT);
bool all_selected = true; bool at_least_one_selected = false;
for (int s = 0; s < MAX_INSTRUMENT_TYPES; s++) for (int s = 0; s < MAX_INSTRUMENT_TYPES; s++)
{ {
if (instrument_owner[s] < 0) if (instrument_owner[s] >= 0)
{ {
all_selected = false; at_least_one_selected = true;
break; break;
} }
} }
if (all_selected) if (at_least_one_selected)
{ {
const char* prompt = "Press Start to begin"; const char* prompt = "Press Start to begin";
float font_size = 24.0f; float font_size = 24.0f;
float pw = MeasureTextEx(font, prompt, font_size, 1.0f).x; float pw = MeasureTextEx(font, prompt, font_size, 1.0f).x;
DrawTextEx(font, prompt, Vector2{cx - pw * 0.5f, h - 40.0f}, font_size, 1.0f, WHITE); DrawTextEx(font, prompt, Vector2{cx - pw * 0.5f, h - 40.0f}, font_size, 1.0f, WHITE);
} }
else
{
const char* prompt = "Select at least one instrument";
float font_size = 24.0f;
float pw = MeasureTextEx(font, prompt, font_size, 1.0f).x;
DrawTextEx(font, prompt, Vector2{cx - pw * 0.5f, h - 40.0f}, font_size, 1.0f, WHITE);
}
} }
}; };