izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Implement VisMono with custom framebuffer effects (#136)

Browse Source
This commit is contained in:
Archez
2024-05-22 09:04:59 -05:00
committed by Garrett Cox
parent 45bf29fade
commit f4aec1ed0a
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/2s2h/framebuffer_effects.c
+5 -3
View File
@@ -5,7 +5,9 @@ int gfx_create_framebuffer(uint32_t width, uint32_t height);
s32 gPauseFrameBuffer = -1;
s32 gBlurFrameBuffer = -1;
s32 gShrinkFrameBuffer = -1;
// A framebuffer that should only be used for drawing in the same frame that it is copied too
// i.e. the VisMono and VisFbuf effects
s32 gReusableFrameBuffer = -1;
void FB_CreateFramebuffers(void) {
if (gPauseFrameBuffer == -1) {
@@ -16,8 +18,8 @@ void FB_CreateFramebuffers(void) {
gBlurFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT);
}
if (gShrinkFrameBuffer == -1) {
gShrinkFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT);
if (gReusableFrameBuffer == -1) {
gReusableFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT);
}
}
mm/2s2h/framebuffer_effects.h
+1 -1
View File
@@ -5,7 +5,7 @@
extern s32 gPauseFrameBuffer;
extern s32 gBlurFrameBuffer;
extern s32 gShrinkFrameBuffer;
extern s32 gReusableFrameBuffer;
void FB_CreateFramebuffers(void);
void FB_CopyToFramebuffer(Gfx** gfxp, s32 fb_src, s32 fb_dest, u8 oncePerFrame, u8* hasCopied);
mm/src/code/z_play.c
+7 -2
View File
@@ -1276,8 +1276,13 @@ void Play_DrawMain(PlayState* this) {
TransitionFade_Draw(&this->unk_18E48, &sp218);
if (gVisMonoColor.a != 0) {
sPlayVisMono.primColor.rgba = gVisMonoColor.rgba;
VisMono_Draw(&sPlayVisMono, &sp218);
// 2S2H [Port] Implement VisMono by performing a framebuffer copy and redraw with an active
// grayscale command to set the mono color
FB_CopyToFramebuffer(&sp218, 0, gReusableFrameBuffer, false, NULL);
gDPSetGrayscaleColor(sp218++, gVisMonoColor.r, gVisMonoColor.g, gVisMonoColor.b, gVisMonoColor.a);
gSPGrayscale(sp218++, true);
FB_DrawFromFramebuffer(&sp218, gReusableFrameBuffer, 255);
gSPGrayscale(sp218++, false);
}
gSPEndDisplayList(sp218++);
mm/src/code/z_visfbuf.c
+2 -2
View File
@@ -170,7 +170,7 @@ void VisFbuf_ApplyEffects(VisFbuf* this, Gfx** gfxP, void* source, void* img, s3
G_AD_PATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE |
G_TD_CLAMP | G_TP_NONE | G_CYC_COPY | G_PM_NPRIMITIVE,
G_AC_NONE | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2);
FB_CopyToFramebuffer(&gfx, 0, gShrinkFrameBuffer, false, NULL);
FB_CopyToFramebuffer(&gfx, 0, gReusableFrameBuffer, false, NULL);
gDPPipeSync(gfx++);
// fill framebuffer with primColor
@@ -224,7 +224,7 @@ void VisFbuf_ApplyEffects(VisFbuf* this, Gfx** gfxP, void* source, void* img, s3
// 2S2H [Port][Widescreen]
// Draw shrunk window using an adjusted horizontal scale accounting for different aspect ratios
FB_DrawFromFramebufferScaled(&gfx, gShrinkFrameBuffer, 255,
FB_DrawFromFramebufferScaled(&gfx, gReusableFrameBuffer, 255,
(1.0f - scale) * (OTRGetAspectRatio() / ((float)SCREEN_WIDTH / SCREEN_HEIGHT)),
(1.0f - scale));
}