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

added WIP collision

Browse source
This commit is contained in:
MelonSpeedruns 2022-03-28 17:19:12 -04:00
commit 6278049307
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1416,6 +1416,7 @@ s32 Camera_Free(Camera* camera) {
f32 playerHeight = Player_GetHeight(camera->player); f32 playerHeight = Player_GetHeight(camera->player);
f32 sp94; f32 sp94;
CamColChk bgChk;
sCameraInterfaceFlags = norm1->interfaceFlags; sCameraInterfaceFlags = norm1->interfaceFlags;
@ -1464,7 +1465,14 @@ s32 Camera_Free(Camera* camera) {
OLib_Vec3fDiffToVecSphGeo(&eyeAdjustment, &camera->at, &camera->eye); OLib_Vec3fDiffToVecSphGeo(&eyeAdjustment, &camera->at, &camera->eye);
OLib_Vec3fDiffToVecSphGeo(&eyeAdjustment, &camera->at, &camera->eyeNext); OLib_Vec3fDiffToVecSphGeo(&eyeAdjustment, &camera->at, &camera->eyeNext);
if (Camera_BGCheck(camera, &camera->at, &camera->eye)) {
VecSph collSphere;
OLib_Vec3fDiffToVecSphGeo(&collSphere, &camera->at, &camera->eye);
float rad = collSphere.r;
camera->dist = eyeAdjustment.r = rad;
} else {
camera->dist = eyeAdjustment.r = 150; camera->dist = eyeAdjustment.r = 150;
}
f32 newCamX = -D_8015BD7C->state.input[0].cur.cam_x; f32 newCamX = -D_8015BD7C->state.input[0].cur.cam_x;
f32 newCamY = D_8015BD7C->state.input[0].cur.cam_y; f32 newCamY = D_8015BD7C->state.input[0].cur.cam_y;