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

fixed z_en_egol and z_en_estone frame interpolation issue. (#371)

Browse Source 
* fixed z_en_egol and z_en_estone frame interpolation issue.

* Changed EnEgol_draw RecordOpenCHild from "Poly_XLU_DISP" to "this"
This commit is contained in:
sitton76
2024-05-22 09:05:05 -05:00
committed by Garrett Cox
parent 1ed1c3e877
commit 8b6cb55bc7
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/src/overlays/actors/ovl_En_Egol/z_en_egol.c
+5
View File
@@ -11,6 +11,7 @@
#include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
#include "overlays/actors/ovl_En_Estone/z_en_estone.h"
#include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h"
#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
#define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_80000000)
@@ -1515,6 +1516,7 @@ void EnEgol_Draw(Actor* thisx, PlayState* play2) {
laserLightScaleMod = 10.0f;
laserLightAlpha = 80.0f;
for (i = 0; i < ARRAY_COUNT(sLightOrbColors); i++) {
FrameInterpolation_RecordOpenChild(this, i);
Matrix_Push();
Matrix_Scale(laserLightScaleMod, laserLightScaleMod, laserLightScaleMod, MTXMODE_APPLY);
Matrix_ReplaceRotation(&play->billboardMtxF);
@@ -1526,6 +1528,7 @@ void EnEgol_Draw(Actor* thisx, PlayState* play2) {
Matrix_Pop();
laserLightScaleMod = 3.0f;
laserLightAlpha = 200.0f;
FrameInterpolation_RecordCloseChild();
}
} else {
gDPSetEnvColor(POLY_XLU_DISP++, 155, 255, 255, 128);
@@ -1627,6 +1630,7 @@ void EnEgol_DrawEffects(EnEgol* this, PlayState* play) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
for (i = 0; i < ARRAY_COUNT(this->effects); i++, effect++) {
if (effect->isActive) {
FrameInterpolation_RecordOpenChild(effect, i);
Matrix_Push();
Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
@@ -1667,6 +1671,7 @@ void EnEgol_DrawEffects(EnEgol* this, PlayState* play) {
default:
break;
FrameInterpolation_RecordCloseChild();
}
Matrix_Pop();
}
mm/src/overlays/actors/ovl_En_Estone/z_en_estone.c
+3
View File
@@ -7,6 +7,7 @@
#include "z_en_estone.h"
#include "objects/object_eg/object_eg.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)
@@ -267,6 +268,7 @@ void EnEstone_DrawEffects(EnEstone* this, PlayState* play) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
for (i = 0; i < ARRAY_COUNT(this->effects); i++, effect++) {
if (effect->isActive) {
FrameInterpolation_RecordOpenChild(effect, i);
Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
Matrix_RotateXS(effect->rot.x, MTXMODE_APPLY);
Matrix_RotateYS(effect->rot.y, MTXMODE_APPLY);
@@ -277,6 +279,7 @@ void EnEstone_DrawEffects(EnEstone* this, PlayState* play) {
gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x80, 255, 255, 255, 255);
gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, 255);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_06AB30);
FrameInterpolation_RecordCloseChild();
}
}