mirror of
https://github.com/HarbourMasters/2ship2harkinian.git
synced 2024-11-23 05:59:40 +00:00
Fixed interpolation issue in z_eff_dust related to post STT cutscene. (#390)
This commit is contained in:
parent
a46a952c58
commit
1ed1c3e877
@ -7,6 +7,7 @@
|
|||||||
#include "z_eff_dust.h"
|
#include "z_eff_dust.h"
|
||||||
#include "objects/gameplay_keep/gameplay_keep.h"
|
#include "objects/gameplay_keep/gameplay_keep.h"
|
||||||
#include "system_malloc.h"
|
#include "system_malloc.h"
|
||||||
|
#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
|
||||||
|
|
||||||
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)
|
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)
|
||||||
|
|
||||||
@ -290,6 +291,7 @@ void func_80919768(Actor* thisx, PlayState* play2) {
|
|||||||
gSPSegment(POLY_XLU_DISP++, 0x08, D_80919DB0);
|
gSPSegment(POLY_XLU_DISP++, 0x08, D_80919DB0);
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_COUNT(this->distanceTraveled); i++) {
|
for (i = 0; i < ARRAY_COUNT(this->distanceTraveled); i++) {
|
||||||
|
FrameInterpolation_RecordOpenChild(this, i);
|
||||||
if (*distanceTraveled < 1.0f) {
|
if (*distanceTraveled < 1.0f) {
|
||||||
aux = 1.0f - SQ(*distanceTraveled);
|
aux = 1.0f - SQ(*distanceTraveled);
|
||||||
Matrix_Translate(thisx->world.pos.x, thisx->world.pos.y, thisx->world.pos.z, MTXMODE_NEW);
|
Matrix_Translate(thisx->world.pos.x, thisx->world.pos.y, thisx->world.pos.z, MTXMODE_NEW);
|
||||||
@ -309,6 +311,7 @@ void func_80919768(Actor* thisx, PlayState* play2) {
|
|||||||
|
|
||||||
gSPSetGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
|
gSPSetGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
|
||||||
}
|
}
|
||||||
|
FrameInterpolation_RecordCloseChild();
|
||||||
initialPositions++;
|
initialPositions++;
|
||||||
distanceTraveled++;
|
distanceTraveled++;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user