thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-26 20:11:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Camera fixes
Some checks are pending
Build coop / build-windows (push) Waiting to run
Details
Build coop / build-macos-arm (push) Waiting to run
Details
Build coop / build-ubuntu (push) Waiting to run
Details
Build coop / build-macos-intel (push) Waiting to run
Details

Browse source
This commit is contained in:
Agent X 2025-03-29 00:03:08 -04:00
parent 0ee8d5f81e
commit 3abbb2039d
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/bettercamera.inc.h
View file

@ -459,7 +459,7 @@ static void newcam_zoom_button(void) {
newcam_distance = newcam_distance_target;
}
if (newcam_l_centering && (gPlayer1Controller->buttonDown & L_TRIG) && (newcam_modeflags & NC_FLAG_ZOOM)) {
if (newcam_l_centering && (gPlayer1Controller->buttonPressed & L_TRIG) && (newcam_modeflags & NC_FLAG_ZOOM)) {
//When you press L, set the flag for centering the camera. Afterwards, start setting the yaw to the Player's yaw at the time.
newcam_yaw_target = -gMarioStates[0].faceAngle[1]-0x4000;
newcam_centering = 1;

4
src/game/camera.c
View file

@ -12396,8 +12396,8 @@ void mode_rom_hack_camera(struct Camera *c) {
sRomHackIsUpdate = 0;
// figure out desired position
f32 desiredDist = sRomHackZoom ? gRomhackCameraSettings.zoomedInDist : gRomhackCameraSettings.zoomedInDist + gRomhackCameraSettings.zoomedOutDist;
f32 desiredHeight = sRomHackZoom ? gRomhackCameraSettings.zoomedInHeight : gRomhackCameraSettings.zoomedInHeight + gRomhackCameraSettings.zoomedOutHeight;
f32 desiredDist = sRomHackZoom ? gRomhackCameraSettings.zoomedInDist : gRomhackCameraSettings.zoomedOutDist;
f32 desiredHeight = sRomHackZoom ? gRomhackCameraSettings.zoomedInHeight : gRomhackCameraSettings.zoomedOutHeight;
f32* mPos = &gMarioStates[0].pos[0];
pos[0] = mPos[0] + coss(sRomHackYaw) * desiredDist;
pos[1] = mPos[1] + desiredHeight;

3
src/pc/configfile.c
View file

@ -140,7 +140,7 @@ unsigned int configFreeCameraDegrade = 50; // 0 - 100%
// romhack camera settings
unsigned int configEnableRomhackCamera = 0; // 0 for automatic, 1 for force on, 2 for force off
bool configRomhackCameraBowserFights = false;
bool configRomhackCameraHasCollision = false;
bool configRomhackCameraHasCollision = true;
bool configRomhackCameraHasCentering = false;
bool configRomhackCameraDPadBehavior = false;
bool configRomhackCameraSlowFall = true;
@ -272,7 +272,6 @@ static const struct ConfigOption options[] = {
{.name = "bettercam_dpad", .type = CONFIG_TYPE_BOOL, .boolValue = &configFreeCameraDPadBehavior},
{.name = "bettercam_collision", .type = CONFIG_TYPE_BOOL, .boolValue = &configFreeCameraHasCollision},
{.name = "bettercam_mouse_look", .type = CONFIG_TYPE_BOOL, .boolValue = &configFreeCameraMouse},
{.name = "bettercam_xsens", .type = CONFIG_TYPE_UINT, .uintValue = &configFreeCameraXSens},
{.name = "bettercam_ysens", .type = CONFIG_TYPE_UINT, .uintValue = &configFreeCameraYSens},
{.name = "bettercam_aggression", .type = CONFIG_TYPE_UINT, .uintValue = &configFreeCameraAggr},