github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 22:33:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed epona camera height + added WW z-target free camera

Browse source
This commit is contained in:
MelonSpeedruns 2022-05-14 15:31:45 -04:00
commit 6c8eb951e2
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
soh/src/code/z_camera.c
View file

@ -1478,7 +1478,10 @@ s32 Camera_Free(Camera* camera) {
camera->animState = 1; camera->animState = 1;
at.x = Camera_LERPCeilF(camera->player->actor.world.pos.x, camera->at.x, camSpeed, 1.0f); at.x = Camera_LERPCeilF(camera->player->actor.world.pos.x, camera->at.x, camSpeed, 1.0f);
at.y = Camera_LERPCeilF(camera->player->actor.world.pos.y + Player_GetHeight(camera->player), camera->at.y, at.y = Camera_LERPCeilF(camera->player->actor.world.pos.y + (camera->player->rideActor != NULL
? Player_GetHeight(camera->player) / 2
: Player_GetHeight(camera->player)),
camera->at.y,
camSpeed, 1.0f); camSpeed, 1.0f);
at.z = Camera_LERPCeilF(camera->player->actor.world.pos.z, camera->at.z, camSpeed, 1.0f); at.z = Camera_LERPCeilF(camera->player->actor.world.pos.z, camera->at.z, camSpeed, 1.0f);
@ -2090,6 +2093,16 @@ s32 Camera_Normal0(Camera* camera) {
} }
s32 Camera_Parallel1(Camera* camera) { s32 Camera_Parallel1(Camera* camera) {
f32 newCamX = -D_8015BD7C->state.input[0].cur.cam_x;
f32 newCamY = D_8015BD7C->state.input[0].cur.cam_y;
manualCamera = false;
if (CVar_GetS32("gFreeCamera", 0) && SetCameraManual(camera) == 1) {
Camera_Free(camera);
return 1;
}
Vec3f* eye = &camera->eye; Vec3f* eye = &camera->eye;
Vec3f* at = &camera->at; Vec3f* at = &camera->at;
Vec3f* eyeNext = &camera->eyeNext; Vec3f* eyeNext = &camera->eyeNext;
@ -2134,8 +2147,6 @@ s32 Camera_Parallel1(Camera* camera) {
OLib_Vec3fDiffToVecSphGeo(&atToEyeDir, at, eye); OLib_Vec3fDiffToVecSphGeo(&atToEyeDir, at, eye);
OLib_Vec3fDiffToVecSphGeo(&atToEyeNextDir, at, eyeNext); OLib_Vec3fDiffToVecSphGeo(&atToEyeNextDir, at, eyeNext);
manualCamera = false;
switch (camera->animState) { switch (camera->animState) {
case 0: case 0:
case 0xA: case 0xA: