Skip to content

Draw loop handles and zoom buttons as sprites, enlarge zoom buttons #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prayerie wants to merge 1 commit into
base: new
Choose a base branch
from
Open

Draw loop handles and zoom buttons as sprites, enlarge zoom buttons #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arm9/graphics/loophandle.grit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-gt -gB4 -m! -p! -ftc
Binary file added arm9/graphics/loophandle.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions arm9/graphics/sampleed_zoom.grit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-gt -gB4 -m! -p! -ftc
Binary file added arm9/graphics/sampleed_zoom.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 27 additions & 3 deletions arm9/source/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,14 @@ void handleSampleChange(const u16 newsample)
*/
}

void handleOverlayWidgetChange(u8 screen, bool visible)
{
if (screen == SUB_SCREEN)
{
if (visible) oamDisable(&oamSub);
else if (!sampledisplay->is_occluded()) oamEnable(&oamSub);
}
}

void volEnvSetInst(Instrument *inst)
{
Expand Down Expand Up @@ -3374,6 +3382,7 @@ void setupGUI(bool dldi_enabled)
{
gui = new GUI();
gui->setTheme(settings->getTheme(), settings->getTheme()->col_bg);
gui->setOnOverlayChanged(handleOverlayWidgetChange);

kb = new Piano(0, 152, 224, 40, (uint16*)CHAR_BASE_BLOCK_SUB(0), (uint16*)SCREEN_BASE_BLOCK_SUB(1/*8*/), &sub_vram);
kb->set_overdraw(false);
Expand Down Expand Up @@ -4298,6 +4307,8 @@ void VblankHandler(void)
}
}

oamUpdate(&oamSub);

// Constantly update pattern view while playing
if(redraw_main_requested)
{
Expand Down Expand Up @@ -4428,10 +4439,11 @@ int main(int argc, char **argv) {
videoSetMode(MODE_5_2D | DISPLAY_BG0_ACTIVE | DISPLAY_BG2_ACTIVE);

// Sub screen: Keyboard tiles, Typewriter tiles and ERB
videoSetModeSub(MODE_5_2D | DISPLAY_BG0_ACTIVE | DISPLAY_BG1_ACTIVE | DISPLAY_BG2_ACTIVE);
videoSetModeSub(MODE_5_2D | DISPLAY_BG0_ACTIVE | DISPLAY_BG1_ACTIVE | DISPLAY_BG2_ACTIVE | DISPLAY_SPR_ACTIVE | DISPLAY_SPR_1D);


vramSetPrimaryBanks(VRAM_A_MAIN_BG_0x06000000, VRAM_B_MAIN_BG_0x06020000,
VRAM_C_SUB_BG_0x06200000 , VRAM_D_LCD);
VRAM_C_SUB_BG_0x06200000 , VRAM_D_SUB_SPRITE);

// SUB_BG0 for Piano Tiles
videoBgEnableSub(0);
Expand All @@ -4458,7 +4470,19 @@ int main(int argc, char **argv) {

// Sub screen framebuffer
int sub_bg = bgInitSub(2, BgType_Bmp16, BgSize_B16_256x256, 2, 0);
bgSetPriority(sub_bg, 0);
bgSetPriority(sub_bg, 1);

oamInit(&oamSub, SpriteMapping_1D_32, false);

// Create a window the same size as the sample display. (so we can occclude loop handles, etc)
windowEnableSub(WINDOW_0);

bgWindowEnable(sub_bg, (WINDOW)(WINDOW_0|WINDOW_OUT));
bgWindowEnable(piano_bg, (WINDOW)(WINDOW_0|WINDOW_OUT));
bgWindowEnable(typewriter_bg, (WINDOW)(WINDOW_0|WINDOW_OUT));

windowSetBoundsSub(WINDOW_0, 5, 24, 5+129, 23+61); // sampledisplay x1,y1,x2,y2
oamWindowEnable(&oamSub, WINDOW_0);

// Special effects
#ifdef DEBUG
Expand Down
Loading