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

Make libultra OSContPad struct consistent with the one from libultraship

Browse source
This commit is contained in:
Kenix3 2022-08-11 18:46:34 -04:00
commit 86faa42acf
4 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1410,8 +1410,8 @@ s32 Camera_Noop(Camera* camera) {
}
s32 SetCameraManual(Camera* camera) {
f32 newCamX = -D_8015BD7C->state.input[0].cur.cam_x * 10.0f;
f32 newCamY = D_8015BD7C->state.input[0].cur.cam_y * 10.0f;
f32 newCamX = -D_8015BD7C->state.input[0].cur.right_stick_x * 10.0f;
f32 newCamY = D_8015BD7C->state.input[0].cur.right_stick_y * 10.0f;
if ((fabsf(newCamX) >= 15.0f || fabsf(newCamY) >= 15.0f) && camera->globalCtx->manualCamera == false) {
camera->globalCtx->manualCamera = true;
@ -1479,8 +1479,8 @@ s32 Camera_Free(Camera* camera) {
camera->animState = 1;
f32 newCamX = -D_8015BD7C->state.input[0].cur.cam_x * 10.0f;
f32 newCamY = D_8015BD7C->state.input[0].cur.cam_y * 10.0f;
f32 newCamX = -D_8015BD7C->state.input[0].cur.right_stick_x * 10.0f;
f32 newCamY = D_8015BD7C->state.input[0].cur.right_stick_y * 10.0f;
camera->globalCtx->camX += newCamX;
camera->globalCtx->camY += newCamY;

12
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
View file

@ -128,8 +128,8 @@ void KaleidoScope_DrawPlayerWork(GlobalContext* globalCtx) {
} else if ((AllowDPadRotation && CHECK_BTN_ALL(input->cur.button, BTN_DRIGHT)) ||
(AllowCRotation && CHECK_BTN_ALL(input->cur.button, BTN_CRIGHT))) {
link_kaleido_rot.y = link_kaleido_rot.y + RotationSpeed;
} else if(AllowStickRotation && input->cur.cam_x*10.0f != 0){
link_kaleido_rot.y = link_kaleido_rot.y + (input->cur.cam_x*10.0f*(((f32)RotationSpeed)/600.0f));
} else if (AllowStickRotation && input->cur.right_stick_x * 10.0f != 0) {
link_kaleido_rot.y = link_kaleido_rot.y + (input->cur.right_stick_x * 10.0f * (((f32)RotationSpeed) / 600.0f));
}
if ((AllowDPadRotation && CHECK_BTN_ALL(input->press.button, BTN_DUP)) || // reset rotation
@ -138,13 +138,13 @@ void KaleidoScope_DrawPlayerWork(GlobalContext* globalCtx) {
} else if ((AllowCRotation && CHECK_BTN_ALL(input->press.button, BTN_CUP)) ||
(AllowCRotation && CHECK_BTN_ALL(input->press.button, BTN_CDOWN))) {
link_kaleido_rot.y = 32300;
} else if (AllowStickRotation && input->cur.cam_y * 10.0f < -1200) {
} else if (AllowStickRotation && input->cur.right_stick_y * 10.0f < -1200) {
link_kaleido_rot.y = 32300;
}
if (AllowStickRotation && input->cur.cam_y * 10.0f > 0) { // Zoom in
scale = scale + input->cur.cam_y*10.0f*.00005f;
pos.y = pos.y - input->cur.cam_y*10.0f*0.25f;
if (AllowStickRotation && input->cur.right_stick_y * 10.0f > 0) { // Zoom in
scale = scale + input->cur.right_stick_y * 10.0f * .00005f;
pos.y = pos.y - input->cur.right_stick_y * 10.0f * 0.25f;
}