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

Make it so player 1 can control the credits camera

This commit is contained in:
Agent X 2023-12-30 12:02:31 -05:00
parent 7ba65e7799
commit 97633044c4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/camera.c
View File

@ -7382,15 +7382,12 @@ void reset_pan_distance(UNUSED struct Camera *c) {
* Easter egg: the player 2 controller can move the camera's focus in the ending and credits. * Easter egg: the player 2 controller can move the camera's focus in the ending and credits.
*/ */
void player2_rotate_cam(struct Camera *c, s16 minPitch, s16 maxPitch, s16 minYaw, s16 maxYaw) { void player2_rotate_cam(struct Camera *c, s16 minPitch, s16 maxPitch, s16 minYaw, s16 maxYaw) {
// disable for co-op
return;
f32 distCamToFocus; f32 distCamToFocus;
s16 pitch, yaw, pitchCap; s16 pitch, yaw, pitchCap;
// Change the camera rotation to match the 2nd player's stick // Change the camera rotation to match the 2nd player's stick
approach_s16_asymptotic_bool(&sCreditsPlayer2Yaw, -(s16)(gPlayer2Controller->stickX * 250.f), 4); approach_s16_asymptotic_bool(&sCreditsPlayer2Yaw, -(s16)(gPlayer1Controller->stickX * 250.f), 4);
approach_s16_asymptotic_bool(&sCreditsPlayer2Pitch, -(s16)(gPlayer2Controller->stickY * 265.f), 4); approach_s16_asymptotic_bool(&sCreditsPlayer2Pitch, -(s16)(gPlayer1Controller->stickY * 265.f), 4);
vec3f_get_dist_and_angle(c->pos, c->focus, &distCamToFocus, &pitch, &yaw); vec3f_get_dist_and_angle(c->pos, c->focus, &distCamToFocus, &pitch, &yaw);
pitchCap = 0x3800 - pitch; if (pitchCap < 0) { pitchCap = 0x3800 - pitch; if (pitchCap < 0) {