mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-23 01:42:19 -05:00
Code Issues Projects Releases Wiki Activity

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
parent d623ac5918
commit 86faa42acf
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libultraship/libultraship/Controller.cpp
View File

@ -12,7 +12,7 @@ namespace Ship {
Controller::Controller() : isRumbling(false) { Controller::Controller() : isRumbling(false) {
Attachment = nullptr; Attachment = nullptr;
for(int virtualSlot = 0; virtualSlot < MAXCONTROLLERS; virtualSlot++) { for(int32_t virtualSlot = 0; virtualSlot < MAXCONTROLLERS; virtualSlot++) {
profiles[virtualSlot] = std::make_shared<DeviceProfileV0>(); profiles[virtualSlot] = std::make_shared<DeviceProfileV0>();
ButtonData[virtualSlot] = std::make_shared<Buttons>(); ButtonData[virtualSlot] = std::make_shared<Buttons>();
} }

18
libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/controller.h
View File

@ -108,15 +108,15 @@ typedef struct {
} OSContStatus; // size = 0x04 } OSContStatus; // size = 0x04
typedef struct { typedef struct {
/* 0x00 */ u16 button; /* 0x00 */ uint16_t button;
/* 0x02 */ s8 stick_x; /* 0x02 */ int8_t stick_x;
/* 0x03 */ s8 stick_y; /* 0x03 */ int8_t stick_y;
/* 0x04 */ u8 err_no; /* 0x04 */ uint8_t err_no;
/* 0x05 */ f32 gyro_x; /* 0x05 */ float gyro_x;
/* 0x09 */ f32 gyro_y; /* 0x09 */ float gyro_y;
/* 0x1C */ f32 cam_x; /* 0x1C */ int8_t right_stick_x;
/* 0x20 */ f32 cam_y; /* 0x20 */ int8_t right_stick_y;
} OSContPad; // size = 0x24 } OSContPad; // size = 0x22
typedef struct { typedef struct {
/* 0x00 */ u8 rumble; /* 0x00 */ u8 rumble;

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

@ -1410,8 +1410,8 @@ s32 Camera_Noop(Camera* camera) {
} }
s32 SetCameraManual(Camera* camera) { s32 SetCameraManual(Camera* camera) {
f32 newCamX = -D_8015BD7C->state.input[0].cur.cam_x * 10.0f; f32 newCamX = -D_8015BD7C->state.input[0].cur.right_stick_x * 10.0f;
f32 newCamY = D_8015BD7C->state.input[0].cur.cam_y * 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) { if ((fabsf(newCamX) >= 15.0f || fabsf(newCamY) >= 15.0f) && camera->globalCtx->manualCamera == false) {
camera->globalCtx->manualCamera = true; camera->globalCtx->manualCamera = true;
@ -1479,8 +1479,8 @@ s32 Camera_Free(Camera* camera) {
camera->animState = 1; camera->animState = 1;
f32 newCamX = -D_8015BD7C->state.input[0].cur.cam_x * 10.0f; f32 newCamX = -D_8015BD7C->state.input[0].cur.right_stick_x * 10.0f;
f32 newCamY = D_8015BD7C->state.input[0].cur.cam_y * 10.0f; f32 newCamY = D_8015BD7C->state.input[0].cur.right_stick_y * 10.0f;
camera->globalCtx->camX += newCamX; camera->globalCtx->camX += newCamX;
camera->globalCtx->camY += newCamY; 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)) || } else if ((AllowDPadRotation && CHECK_BTN_ALL(input->cur.button, BTN_DRIGHT)) ||
(AllowCRotation && CHECK_BTN_ALL(input->cur.button, BTN_CRIGHT))) { (AllowCRotation && CHECK_BTN_ALL(input->cur.button, BTN_CRIGHT))) {
link_kaleido_rot.y = link_kaleido_rot.y + RotationSpeed; link_kaleido_rot.y = link_kaleido_rot.y + RotationSpeed;
} else if(AllowStickRotation && input->cur.cam_x*10.0f != 0){ } else if (AllowStickRotation && input->cur.right_stick_x * 10.0f != 0) {
link_kaleido_rot.y = link_kaleido_rot.y + (input->cur.cam_x*10.0f*(((f32)RotationSpeed)/600.0f)); 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 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)) || } else if ((AllowCRotation && CHECK_BTN_ALL(input->press.button, BTN_CUP)) ||
(AllowCRotation && CHECK_BTN_ALL(input->press.button, BTN_CDOWN))) { (AllowCRotation && CHECK_BTN_ALL(input->press.button, BTN_CDOWN))) {
link_kaleido_rot.y = 32300; 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; link_kaleido_rot.y = 32300;
} }
if (AllowStickRotation && input->cur.cam_y * 10.0f > 0) { // Zoom in if (AllowStickRotation && input->cur.right_stick_y * 10.0f > 0) { // Zoom in
scale = scale + input->cur.cam_y*10.0f*.00005f; scale = scale + input->cur.right_stick_y * 10.0f * .00005f;
pos.y = pos.y - input->cur.cam_y*10.0f*0.25f; pos.y = pos.y - input->cur.right_stick_y * 10.0f * 0.25f;
} }