Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #400 from ineedhelpbad/patch-1 

BUGFIX: Camera invert #373
This commit is contained in:
fgsfds 2020-08-15 07:17:02 +03:00 committed by GitHub
parent 5f38df53a5 6591f35da7
commit 05584673d0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,18 +269,18 @@ static void newcam_rotate_button(void) {
play_sound(SOUND_MENU_CAMERA_ZOOM_IN, gDefaultSoundArgs); play_sound(SOUND_MENU_CAMERA_ZOOM_IN, gDefaultSoundArgs);
#endif #endif
if (newcam_modeflags & NC_FLAG_8D) if (newcam_modeflags & NC_FLAG_8D)
newcam_yaw_target = newcam_yaw_target+(ivrt(newcam_invertX)*0x2000); newcam_yaw_target = newcam_yaw_target+(ivrt(0)*0x2000);
else else
newcam_yaw_target = newcam_yaw_target+(ivrt(newcam_invertX)*0x4000); newcam_yaw_target = newcam_yaw_target+(ivrt(0)*0x4000);
newcam_centering = 1; newcam_centering = 1;
} else if ((gPlayer1Controller->buttonPressed & R_CBUTTONS) && newcam_analogue == 0) { } else if ((gPlayer1Controller->buttonPressed & R_CBUTTONS) && newcam_analogue == 0) {
#ifndef nosound #ifndef nosound
play_sound(SOUND_MENU_CAMERA_ZOOM_IN, gDefaultSoundArgs); play_sound(SOUND_MENU_CAMERA_ZOOM_IN, gDefaultSoundArgs);
#endif #endif
if (newcam_modeflags & NC_FLAG_8D) if (newcam_modeflags & NC_FLAG_8D)
newcam_yaw_target = newcam_yaw_target-(ivrt(newcam_invertX)*0x2000); newcam_yaw_target = newcam_yaw_target-(ivrt(0)*0x2000);
else else
newcam_yaw_target = newcam_yaw_target-(ivrt(newcam_invertX)*0x4000); newcam_yaw_target = newcam_yaw_target-(ivrt(0)*0x4000);
newcam_centering = 1; newcam_centering = 1;
} }
} else if (newcam_modeflags & NC_FLAG_XTURN) { } else if (newcam_modeflags & NC_FLAG_XTURN) {
@ -314,7 +314,7 @@ static void newcam_rotate_button(void) {
newcam_framessincec[1] ++; newcam_framessincec[1] ++;
if ((gPlayer1Controller->buttonPressed & L_CBUTTONS) && newcam_modeflags & NC_FLAG_XTURN && !(newcam_modeflags & NC_FLAG_8D) && newcam_analogue == 0) { if ((gPlayer1Controller->buttonPressed & L_CBUTTONS) && newcam_modeflags & NC_FLAG_XTURN && !(newcam_modeflags & NC_FLAG_8D) && newcam_analogue == 0) {
if (newcam_framessincec[0] < 6) { if (newcam_framessincec[0] < 6) {
newcam_yaw_target = newcam_yaw+(ivrt(newcam_invertX)*0x3000); newcam_yaw_target = newcam_yaw+(ivrt(0)*0x3000);
newcam_centering = 1; newcam_centering = 1;
#ifndef nosound #ifndef nosound
play_sound(SOUND_MENU_CAMERA_ZOOM_IN, gDefaultSoundArgs); play_sound(SOUND_MENU_CAMERA_ZOOM_IN, gDefaultSoundArgs);
@ -324,7 +324,7 @@ static void newcam_rotate_button(void) {
} }
if ((gPlayer1Controller->buttonPressed & R_CBUTTONS) && newcam_modeflags & NC_FLAG_XTURN && !(newcam_modeflags & NC_FLAG_8D) && newcam_analogue == 0) { if ((gPlayer1Controller->buttonPressed & R_CBUTTONS) && newcam_modeflags & NC_FLAG_XTURN && !(newcam_modeflags & NC_FLAG_8D) && newcam_analogue == 0) {
if (newcam_framessincec[1] < 6) { if (newcam_framessincec[1] < 6) {
newcam_yaw_target = newcam_yaw-(ivrt(newcam_invertX)*0x3000); newcam_yaw_target = newcam_yaw-(ivrt(0)*0x3000);
newcam_centering = 1; newcam_centering = 1;
#ifndef nosound #ifndef nosound
play_sound(SOUND_MENU_CAMERA_ZOOM_IN, gDefaultSoundArgs); play_sound(SOUND_MENU_CAMERA_ZOOM_IN, gDefaultSoundArgs);
@ -350,14 +350,14 @@ static void newcam_rotate_button(void) {
#endif #endif
if (newcam_stick2[0] > 20) { if (newcam_stick2[0] > 20) {
if (newcam_modeflags & NC_FLAG_8D) if (newcam_modeflags & NC_FLAG_8D)
newcam_yaw_target = newcam_yaw_target+(ivrt(newcam_invertX)*0x2000); newcam_yaw_target = newcam_yaw_target+(ivrt(0)*0x2000);
else else
newcam_yaw_target = newcam_yaw_target+(ivrt(newcam_invertX)*0x4000); newcam_yaw_target = newcam_yaw_target+(ivrt(0)*0x4000);
} else { } else {
if (newcam_modeflags & NC_FLAG_8D) if (newcam_modeflags & NC_FLAG_8D)
newcam_yaw_target = newcam_yaw_target-(ivrt(newcam_invertX)*0x2000); newcam_yaw_target = newcam_yaw_target-(ivrt(0)*0x2000);
else else
newcam_yaw_target = newcam_yaw_target-(ivrt(newcam_invertX)*0x4000); newcam_yaw_target = newcam_yaw_target-(ivrt(0)*0x4000);
} }
} }
} else { } else {
@ -425,9 +425,9 @@ static void newcam_update_values(void) {
u8 waterflag = 0; u8 waterflag = 0;
if (newcam_modeflags & NC_FLAG_XTURN) if (newcam_modeflags & NC_FLAG_XTURN)
newcam_yaw -= ((newcam_yaw_acc*(newcam_sensitivityX/10))*ivrt(newcam_invertX)); 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 <= 12000) && (newcam_tilt >= -12000)) && newcam_modeflags & NC_FLAG_YTURN)
newcam_tilt += ((newcam_tilt_acc*ivrt(newcam_invertY))*(newcam_sensitivityY/10)); newcam_tilt += ((newcam_tilt_acc*ivrt(1))*(newcam_sensitivityY/10));
if (newcam_tilt > 12000) if (newcam_tilt > 12000)
newcam_tilt = 12000; newcam_tilt = 12000;