summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMegaMech <MegaMech@users.noreply.github.com>2025-05-15 21:04:35 -0600
committerGitHub <noreply@github.com>2025-05-15 21:04:35 -0600
commitb9e1f0fa38fed4a1912fdf9e916ae20f5bebcd0e (patch)
treeffd31b11137bd63eac491e2777cb195f1081a8f3
parentdf26c3d727fb5c1618f95b82377128cd18a54a52 (diff)
Fix EditorMatrix (#201)
* Fix build * Fix EditorMatrix * Corrected name of built application on the linux workflow file * Enable jumbotron --------- Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
-rw-r--r--src/engine/courses/WarioStadium.cpp2
-rw-r--r--src/racing/framebuffer_effects.c32
2 files changed, 17 insertions, 17 deletions
diff --git a/src/engine/courses/WarioStadium.cpp b/src/engine/courses/WarioStadium.cpp
index b703323f4..4cd4bbf47 100644
--- a/src/engine/courses/WarioStadium.cpp
+++ b/src/engine/courses/WarioStadium.cpp
@@ -339,7 +339,7 @@ void WarioStadium::Render(struct UnkStruct_800DC5EC* arg0) {
prevFrame = 0;
}
currentScreenSection++;
- if (currentScreenSection > 5) {
+ if (currentScreenSection >= 6) {
currentScreenSection = 0;
}
diff --git a/src/racing/framebuffer_effects.c b/src/racing/framebuffer_effects.c
index 12b2f0624..9a166b448 100644
--- a/src/racing/framebuffer_effects.c
+++ b/src/racing/framebuffer_effects.c
@@ -35,30 +35,30 @@ void FB_CreateFramebuffers(void) {
* sure f3dex2 is loaded before this function is called.
*/
void FB_CopyToFramebuffer(Gfx** gfxP, s32 fb_src, s32 fb_dest, u8 oncePerFrame, u8* hasCopied) {
- // Gfx* gfx = *gfxP;
+ Gfx* gfx = *gfxP;
- // gSPMatrix(gfx++, &gIdentityMatrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+ gSPMatrix(gfx++, &gIdentityMatrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- // gDPSetOtherMode(gfx++,
- // G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_NONE | G_TL_TILE |
- // G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE,
- // G_AC_NONE | G_ZS_PRIM | G_RM_OPA_SURF | G_RM_OPA_SURF2);
+ gDPSetOtherMode(gfx++,
+ G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_NONE | G_TL_TILE |
+ G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE,
+ G_AC_NONE | G_ZS_PRIM | G_RM_OPA_SURF | G_RM_OPA_SURF2);
- // gSPClearGeometryMode(gfx++, G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR);
- // gSPSetGeometryMode(gfx++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH);
+ gSPClearGeometryMode(gfx++, G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR);
+ gSPSetGeometryMode(gfx++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH);
- // gDPSetBlendColor(gfx++, 255, 255, 255, 8);
- // gDPSetPrimDepth(gfx++, 0xFFFF, 0xFFFF);
+ gDPSetBlendColor(gfx++, 255, 255, 255, 8);
+ gDPSetPrimDepth(gfx++, 0xFFFF, 0xFFFF);
- // gDPSetEnvColor(gfx++, 255, 255, 255, 255);
- // gDPSetCombineLERP(gfx++, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0,
- // ENVIRONMENT);
+ gDPSetEnvColor(gfx++, 255, 255, 255, 255);
+ gDPSetCombineLERP(gfx++, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0,
+ ENVIRONMENT);
- // gDPSetScissor(gfx++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
+ gDPSetScissor(gfx++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
- // gDPCopyFB(gfx++, fb_dest, fb_src, oncePerFrame, hasCopied);
+ gDPCopyFB(gfx++, fb_dest, fb_src, oncePerFrame, hasCopied);
- // *gfxP = gfx;
+ *gfxP = gfx;
}
/**