Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86 from xLuigiGamerx/dev 

Increased tilt range for free cam and disabled tilt centering in slide actions
This commit is contained in:
Agent X 2024-03-12 17:43:50 -04:00 committed by GitHub
parent c91214b516 12cb57e307
commit 7455fc47a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/game/bettercamera.inc.h
View File

@ -461,15 +461,18 @@ static void newcam_update_values(void) {
//For tilt, this just limits it so it doesn't go further than 90 degrees either way. 90 degrees is actually 16384, but can sometimes lead to issues, so I just leave it shy of 90. //For tilt, this just limits it so it doesn't go further than 90 degrees either way. 90 degrees is actually 16384, but can sometimes lead to issues, so I just leave it shy of 90.
u8 waterflag = 0; u8 waterflag = 0;
u8 centering = 0; u8 centering = 0;
u8 ycentering = 1;
if (newcam_modeflags & NC_FLAG_XTURN) if (newcam_modeflags & NC_FLAG_XTURN)
newcam_yaw -= ((newcam_yaw_acc*(newcam_sensitivityX/10))*ivrt(0)); newcam_yaw -= ((newcam_yaw_acc*(newcam_sensitivityX/10))*ivrt(0));
if (((newcam_tilt <= 12000) && (newcam_tilt >= -12000)) && newcam_modeflags & NC_FLAG_YTURN) if (((newcam_tilt <= 15000) && (newcam_tilt >= -15000)) && newcam_modeflags & NC_FLAG_YTURN)
newcam_tilt += ((newcam_tilt_acc*ivrt(1))*(newcam_sensitivityY/10)); newcam_tilt += ((newcam_tilt_acc*ivrt(1))*(newcam_sensitivityY/10));
if (newcam_tilt > 12000) if (newcam_tilt > 15000)
newcam_tilt = 12000; newcam_tilt = 15000;
if (newcam_tilt < -12000) if (newcam_tilt < -15000 && gMarioStates[0].pos[1] - gMarioStates[0].floorHeight > 20)
newcam_tilt = -15000;
if (newcam_tilt < -12000 && gMarioStates[0].pos[1] - gMarioStates[0].floorHeight < 20)
newcam_tilt = -12000; newcam_tilt = -12000;
if (newcam_turnwait > 0 && gMarioStates[0].vel[1] == 0) { if (newcam_turnwait > 0 && gMarioStates[0].vel[1] == 0) {
@ -485,10 +488,10 @@ static void newcam_update_values(void) {
if (newcam_modeflags & NC_FLAG_SLIDECORRECT) { if (newcam_modeflags & NC_FLAG_SLIDECORRECT) {
switch (gMarioStates[0].action) { switch (gMarioStates[0].action) {
case ACT_BUTT_SLIDE: if (gMarioStates[0].forwardVel > 8) centering = 1; break; case ACT_BUTT_SLIDE: if (gMarioStates[0].forwardVel > 8) centering = 1; ycentering = 0; break;
case ACT_STOMACH_SLIDE: if (gMarioStates[0].forwardVel > 8) centering = 1; break; case ACT_STOMACH_SLIDE: if (gMarioStates[0].forwardVel > 8) centering = 1; ycentering = 0; break;
case ACT_HOLD_BUTT_SLIDE: if (gMarioStates[0].forwardVel > 8) centering = 1; break; case ACT_HOLD_BUTT_SLIDE: if (gMarioStates[0].forwardVel > 8) centering = 1; ycentering = 0; break;
case ACT_HOLD_STOMACH_SLIDE: if (gMarioStates[0].forwardVel > 8) centering = 1; break; case ACT_HOLD_STOMACH_SLIDE: if (gMarioStates[0].forwardVel > 8) centering = 1; ycentering = 0; break;
} }
} }
@ -522,7 +525,7 @@ static void newcam_update_values(void) {
if (waterflag && newcam_modeflags & NC_FLAG_XTURN) { if (waterflag && newcam_modeflags & NC_FLAG_XTURN) {
newcam_yaw = (approach_s16_symmetric(newcam_yaw,-gMarioStates[0].faceAngle[1]-0x4000,(gMarioStates[0].forwardVel*128))); newcam_yaw = (approach_s16_symmetric(newcam_yaw,-gMarioStates[0].faceAngle[1]-0x4000,(gMarioStates[0].forwardVel*128)));
if ((signed)gMarioStates[0].forwardVel > 1) if ((signed)gMarioStates[0].forwardVel > 1 && ycentering)
newcam_tilt = (approach_s16_symmetric(newcam_tilt,(-gMarioStates[0].faceAngle[0]*0.8)+3000,(gMarioStates[0].forwardVel*32))); newcam_tilt = (approach_s16_symmetric(newcam_tilt,(-gMarioStates[0].faceAngle[0]*0.8)+3000,(gMarioStates[0].forwardVel*32)));
else else
newcam_tilt = (approach_s16_symmetric(newcam_tilt,3000,32)); newcam_tilt = (approach_s16_symmetric(newcam_tilt,3000,32));