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

Compare commits

base: cogentleman:27c371e97ebecc02133f31f8f153e657f68a18aa
Branches Tags
cogentleman:master
..
compare: cogentleman:77610f6b0603abe217108300b62b52e7fde6d8fe
Branches Tags
cogentleman:master

No commits in common. "27c371e97ebecc02133f31f8f153e657f68a18aa" and "77610f6b0603abe217108300b62b52e7fde6d8fe" have entirely different histories.
27c371e97e ... 77610f6b06

1 changed files with 1 additions and 5 deletions
Show Stats Expand all files Collapse all files

6
src/samples/ghhb_game.h
View File

@ -16,7 +16,6 @@ namespace
{ {
constexpr int LANE_COUNT = 12; constexpr int LANE_COUNT = 12;
constexpr int OCTAVE_COUNT = 3; constexpr int OCTAVE_COUNT = 3;
constexpr int OCTAVE_OFFSET = 48;
constexpr int MAX_GAMEPADS = 4; constexpr int MAX_GAMEPADS = 4;
constexpr int MAX_INSTRUMENT_TYPES = MAX_GAMEPADS; constexpr int MAX_INSTRUMENT_TYPES = MAX_GAMEPADS;
constexpr float RECEPTOR_HEIGHT = 150.0f; constexpr float RECEPTOR_HEIGHT = 150.0f;
@ -259,10 +258,7 @@ std::vector<Glyph> chart_from_song(const Song& song, int track_override)
float time_sec = note.ticks / ticks_per_sec; // This is now the BOTTOM time float time_sec = note.ticks / ticks_per_sec; // This is now the BOTTOM time
float duration_sec = note.duration_ticks / ticks_per_sec; float duration_sec = note.duration_ticks / ticks_per_sec;
int lane = note.midi % LANE_COUNT; int lane = note.midi % LANE_COUNT;
int offset = 0; int octave = note.midi % (LANE_COUNT * OCTAVE_COUNT);
if (note.midi >= OCTAVE_OFFSET)
offset = OCTAVE_OFFSET;
int octave = (note.midi - offset) % (LANE_COUNT * OCTAVE_COUNT);
int instrument_slot = note_index % MAX_INSTRUMENT_TYPES; int instrument_slot = note_index % MAX_INSTRUMENT_TYPES;
// Log original glyph timing (time is bottom, time + duration is top) // Log original glyph timing (time is bottom, time + duration is top)