Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made camera interpolation more seamless on warp

This commit is contained in:
MysterD 2023-05-30 19:35:56 -07:00
parent b5e9dd2423
commit 7353c0cc99
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/camera.c
View File

@ -497,6 +497,9 @@ extern u8 sZoomOutAreaMasks[];
static void skip_camera_interpolation(void) { static void skip_camera_interpolation(void) {
gLakituState.skipCameraInterpolationTimestamp = gGlobalTimer; gLakituState.skipCameraInterpolationTimestamp = gGlobalTimer;
extern s32 gCamSkipInterp;
gCamSkipInterp = 1;
} }
/** /**

1
src/game/level_update.c
View File

@ -637,6 +637,7 @@ void check_instant_warp(void) {
//vec3f_mul(gMarioStates[0].vel, -0.8f); //vec3f_mul(gMarioStates[0].vel, -0.8f);
return; return;
} }
mario_drop_held_object(&gMarioStates[0]); mario_drop_held_object(&gMarioStates[0]);
u8 changeOfArea = (gCurrAreaIndex != warp->area); u8 changeOfArea = (gCurrAreaIndex != warp->area);
gMarioStates[0].pos[0] += warp->displacement[0]; gMarioStates[0].pos[0] += warp->displacement[0];

19
src/game/rendering_graph_node.c
View File

@ -55,6 +55,9 @@ Mat4 gMatStackPrev[MATRIX_STACK_SIZE] = {};
Mtx *gMatStackFixed[MATRIX_STACK_SIZE] = { 0 }; Mtx *gMatStackFixed[MATRIX_STACK_SIZE] = { 0 };
Mtx *gMatStackPrevFixed[MATRIX_STACK_SIZE] = { 0 }; Mtx *gMatStackPrevFixed[MATRIX_STACK_SIZE] = { 0 };
s32 gCamSkipInterp = 0;
Vec3f gCamSkipInterpDisplacement = { 0 };
u8 sUsingCamSpace = FALSE; u8 sUsingCamSpace = FALSE;
Mtx sPrevCamTranf, sCurrCamTranf = { Mtx sPrevCamTranf, sCurrCamTranf = {
.m = { .m = {
@ -227,6 +230,9 @@ void patch_mtx_interpolated(f32 delta) {
Mtx camTranfInv, prevCamTranfInv; Mtx camTranfInv, prevCamTranfInv;
if (sPerspectiveNode != NULL) { if (sPerspectiveNode != NULL) {
if (gCamSkipInterp) {
sPerspectiveNode->prevFov = sPerspectiveNode->fov;
}
u16 perspNorm; u16 perspNorm;
f32 fovInterpolated = delta_interpolate_f32(sPerspectiveNode->prevFov, sPerspectiveNode->fov, delta); f32 fovInterpolated = delta_interpolate_f32(sPerspectiveNode->prevFov, sPerspectiveNode->fov, delta);
f32 near = MIN(sPerspectiveNode->near, gProjectionMaxNearValue); f32 near = MIN(sPerspectiveNode->near, gProjectionMaxNearValue);
@ -320,6 +326,7 @@ void patch_mtx_interpolated(f32 delta) {
G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
} }
gCamSkipInterp = 0;
} }
/** /**
@ -556,6 +563,18 @@ static void geo_process_camera(struct GraphNodeCamera *node) {
mtxf_lookat(cameraTransform, node->pos, node->focus, node->roll); mtxf_lookat(cameraTransform, node->pos, node->focus, node->roll);
mtxf_mul(gMatStack[gMatStackIndex + 1], cameraTransform, gMatStack[gMatStackIndex]); mtxf_mul(gMatStack[gMatStackIndex + 1], cameraTransform, gMatStack[gMatStackIndex]);
if (gCamSkipInterp) {
// apply prevpos camera offset
vec3f_copy(node->prevPos, node->pos);
vec3f_add(node->prevPos, gCamSkipInterpDisplacement);
vec3f_copy(node->prevFocus, node->focus);
vec3f_add(node->prevFocus, gCamSkipInterpDisplacement);
}
// save prevpos camera offset
vec3f_copy(gCamSkipInterpDisplacement, node->prevPos);
vec3f_sub(gCamSkipInterpDisplacement, node->pos);
if (gGlobalTimer == node->prevTimestamp + 1 && gGlobalTimer != gLakituState.skipCameraInterpolationTimestamp) { if (gGlobalTimer == node->prevTimestamp + 1 && gGlobalTimer != gLakituState.skipCameraInterpolationTimestamp) {
mtxf_lookat(cameraTransform, node->prevPos, node->prevFocus, node->roll); mtxf_lookat(cameraTransform, node->prevPos, node->prevFocus, node->roll);
mtxf_mul(gMatStackPrev[gMatStackIndex + 1], cameraTransform, gMatStackPrev[gMatStackIndex]); mtxf_mul(gMatStackPrev[gMatStackIndex + 1], cameraTransform, gMatStackPrev[gMatStackIndex]);