mirror of https://github.com/sm64pc/sm64pc.git
Undo the bettercamera update
This screwed up the bettercamera for whatever reason. Urgent hotfix. Please test
This commit is contained in:
parent
4e7ce3ffba
commit
4cc5ffff32
|
@ -74,9 +74,9 @@ struct newcam_hardpos newcam_fixedcam[] =
|
||||||
#endif // noaccel
|
#endif // noaccel
|
||||||
|
|
||||||
s16 newcam_yaw; //Z axis rotation
|
s16 newcam_yaw; //Z axis rotation
|
||||||
f32 newcam_yaw_acc;
|
s8 newcam_yaw_acc;
|
||||||
s16 newcam_tilt = 1500; //Y axis rotation
|
s16 newcam_tilt = 1500; //Y axis rotation
|
||||||
f32 newcam_tilt_acc;
|
s8 newcam_tilt_acc;
|
||||||
u16 newcam_distance = 750; //The distance the camera stays from the player
|
u16 newcam_distance = 750; //The distance the camera stays from the player
|
||||||
u16 newcam_distance_target = 750; //The distance the player camera tries to reach.
|
u16 newcam_distance_target = 750; //The distance the player camera tries to reach.
|
||||||
f32 newcam_pos_target[3]; //The position the camera is basing calculations off. *usually* Mario.
|
f32 newcam_pos_target[3]; //The position the camera is basing calculations off. *usually* Mario.
|
||||||
|
@ -187,20 +187,13 @@ void newcam_diagnostics(void)
|
||||||
print_text_fmt_int(32,32,"DISTANCE %d",newcam_distance);
|
print_text_fmt_int(32,32,"DISTANCE %d",newcam_distance);
|
||||||
}
|
}
|
||||||
|
|
||||||
static s16 newcam_adjust_value(s16 var, s16 val, s8 max)
|
static s16 newcam_adjust_value(s16 var, s16 val)
|
||||||
{
|
{
|
||||||
if (val > 0)
|
var += val;
|
||||||
{
|
if (var > 100)
|
||||||
var += val;
|
var = 100;
|
||||||
if (var > max)
|
if (var < -100)
|
||||||
var = max;
|
var = -100;
|
||||||
}
|
|
||||||
else if (val < 0)
|
|
||||||
{
|
|
||||||
var += val;
|
|
||||||
if (var < max)
|
|
||||||
var = max;
|
|
||||||
}
|
|
||||||
return var;
|
return var;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -240,8 +233,6 @@ static int ivrt(u8 axis)
|
||||||
|
|
||||||
static void newcam_rotate_button(void)
|
static void newcam_rotate_button(void)
|
||||||
{
|
{
|
||||||
f32 intendedXMag;
|
|
||||||
f32 intendedYMag;
|
|
||||||
if ((newcam_modeflags & NC_FLAG_8D || newcam_modeflags & NC_FLAG_4D) && newcam_modeflags & NC_FLAG_XTURN) //8 directional camera rotation input for buttons.
|
if ((newcam_modeflags & NC_FLAG_8D || newcam_modeflags & NC_FLAG_4D) && newcam_modeflags & NC_FLAG_XTURN) //8 directional camera rotation input for buttons.
|
||||||
{
|
{
|
||||||
if ((gPlayer1Controller->buttonPressed & L_CBUTTONS) && newcam_analogue == 0)
|
if ((gPlayer1Controller->buttonPressed & L_CBUTTONS) && newcam_analogue == 0)
|
||||||
|
@ -272,33 +263,27 @@ static void newcam_rotate_button(void)
|
||||||
if (newcam_modeflags & NC_FLAG_XTURN)
|
if (newcam_modeflags & NC_FLAG_XTURN)
|
||||||
{
|
{
|
||||||
if ((gPlayer1Controller->buttonDown & L_CBUTTONS) && newcam_analogue == 0)
|
if ((gPlayer1Controller->buttonDown & L_CBUTTONS) && newcam_analogue == 0)
|
||||||
newcam_yaw_acc = newcam_adjust_value(newcam_yaw_acc,accel, 100);
|
newcam_yaw_acc = newcam_adjust_value(newcam_yaw_acc,accel);
|
||||||
else if ((gPlayer1Controller->buttonDown & R_CBUTTONS) && newcam_analogue == 0)
|
else if ((gPlayer1Controller->buttonDown & R_CBUTTONS) && newcam_analogue == 0)
|
||||||
newcam_yaw_acc = newcam_adjust_value(newcam_yaw_acc,-accel, -100);
|
newcam_yaw_acc = newcam_adjust_value(newcam_yaw_acc,-accel);
|
||||||
else
|
else
|
||||||
if (!newcam_analogue)
|
|
||||||
{
|
|
||||||
#ifdef noaccel
|
#ifdef noaccel
|
||||||
newcam_yaw_acc = 0;
|
newcam_yaw_acc = 0;
|
||||||
#else
|
#else
|
||||||
newcam_yaw_acc -= (newcam_yaw_acc*newcam_degrade);
|
newcam_yaw_acc -= (newcam_yaw_acc*newcam_degrade);
|
||||||
#endif
|
#endif
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gPlayer1Controller->buttonDown & U_CBUTTONS && newcam_modeflags & NC_FLAG_YTURN && newcam_analogue == 0)
|
if (gPlayer1Controller->buttonDown & U_CBUTTONS && newcam_modeflags & NC_FLAG_YTURN && newcam_analogue == 0)
|
||||||
newcam_tilt_acc = newcam_adjust_value(newcam_tilt_acc,accel, 100);
|
newcam_tilt_acc = newcam_adjust_value(newcam_tilt_acc,accel);
|
||||||
else if (gPlayer1Controller->buttonDown & D_CBUTTONS && newcam_modeflags & NC_FLAG_YTURN && newcam_analogue == 0)
|
else if (gPlayer1Controller->buttonDown & D_CBUTTONS && newcam_modeflags & NC_FLAG_YTURN && newcam_analogue == 0)
|
||||||
newcam_tilt_acc = newcam_adjust_value(newcam_tilt_acc,-accel, -100);
|
newcam_tilt_acc = newcam_adjust_value(newcam_tilt_acc,-accel);
|
||||||
else
|
else
|
||||||
if (!newcam_analogue)
|
|
||||||
{
|
|
||||||
#ifdef noaccel
|
#ifdef noaccel
|
||||||
newcam_tilt_acc = 0;
|
newcam_tilt_acc = 0;
|
||||||
#else
|
#else
|
||||||
newcam_tilt_acc -= (newcam_tilt_acc*newcam_degrade);
|
newcam_tilt_acc -= (newcam_tilt_acc*newcam_degrade);
|
||||||
#endif
|
#endif
|
||||||
}
|
|
||||||
|
|
||||||
newcam_framessincec[0] += 1;
|
newcam_framessincec[0] += 1;
|
||||||
newcam_framessincec[1] += 1;
|
newcam_framessincec[1] += 1;
|
||||||
|
@ -330,8 +315,6 @@ static void newcam_rotate_button(void)
|
||||||
|
|
||||||
if (newcam_analogue == 1) //There's not much point in keeping this behind a check, but it wouldn't hurt, just incase any 2player shenanigans ever happen, it makes it easy to disable.
|
if (newcam_analogue == 1) //There's not much point in keeping this behind a check, but it wouldn't hurt, just incase any 2player shenanigans ever happen, it makes it easy to disable.
|
||||||
{ //The joystick values cap at 80, so divide by 8 to get the same net result at maximum turn as the button
|
{ //The joystick values cap at 80, so divide by 8 to get the same net result at maximum turn as the button
|
||||||
intendedXMag = gPlayer2Controller->stickX*1.25;
|
|
||||||
intendedYMag = gPlayer2Controller->stickY*1.25;
|
|
||||||
if (ABS(gPlayer2Controller->stickX) > 20 && newcam_modeflags & NC_FLAG_XTURN)
|
if (ABS(gPlayer2Controller->stickX) > 20 && newcam_modeflags & NC_FLAG_XTURN)
|
||||||
{
|
{
|
||||||
if (newcam_modeflags & NC_FLAG_8D)
|
if (newcam_modeflags & NC_FLAG_8D)
|
||||||
|
@ -360,24 +343,16 @@ static void newcam_rotate_button(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
newcam_yaw_acc = newcam_adjust_value(newcam_yaw_acc,(-gPlayer2Controller->stickX/4));
|
||||||
newcam_yaw_acc = newcam_adjust_value(newcam_yaw_acc,-gPlayer2Controller->stickX/8, intendedXMag);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
if (newcam_analogue)
|
|
||||||
{
|
|
||||||
newcam_cstick_down = 0;
|
newcam_cstick_down = 0;
|
||||||
newcam_yaw_acc -= (newcam_yaw_acc*newcam_degrade);
|
newcam_yaw_acc -= (newcam_yaw_acc*newcam_degrade);
|
||||||
}
|
|
||||||
|
|
||||||
if (ABS(gPlayer2Controller->stickY) > 20 && newcam_modeflags & NC_FLAG_YTURN)
|
if (ABS(gPlayer2Controller->stickY) > 20 && newcam_modeflags & NC_FLAG_YTURN)
|
||||||
newcam_tilt_acc = newcam_adjust_value(newcam_tilt_acc,-gPlayer2Controller->stickY/8, intendedYMag);
|
newcam_tilt_acc = newcam_adjust_value(newcam_tilt_acc,(-gPlayer2Controller->stickY/4));
|
||||||
else
|
else
|
||||||
if (newcam_analogue)
|
|
||||||
{
|
|
||||||
newcam_tilt_acc -= (newcam_tilt_acc*newcam_degrade);
|
newcam_tilt_acc -= (newcam_tilt_acc*newcam_degrade);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newcam_mouse == 1)
|
if (newcam_mouse == 1)
|
||||||
|
@ -439,9 +414,9 @@ 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;
|
||||||
if (newcam_modeflags & NC_FLAG_XTURN)
|
if (newcam_modeflags & NC_FLAG_XTURN)
|
||||||
newcam_yaw += ((ivrt(0)*(newcam_yaw_acc*(newcam_sensitivityX/10))));
|
newcam_yaw += (ivrt(0)*(newcam_yaw_acc*(newcam_sensitivityX/10)));
|
||||||
if (((newcam_tilt < 12000 && newcam_tilt_acc*ivrt(1) > 0) || (newcam_tilt > -12000 && newcam_tilt_acc*ivrt(1) < 0)) && newcam_modeflags & NC_FLAG_YTURN)
|
if (((newcam_tilt < 12000 && newcam_tilt_acc*ivrt(1) > 0) || (newcam_tilt > -12000 && newcam_tilt_acc*ivrt(1) < 0)) && newcam_modeflags & NC_FLAG_YTURN)
|
||||||
newcam_tilt += ((ivrt(1)*(newcam_tilt_acc*(newcam_sensitivityY/10))));
|
newcam_tilt += (ivrt(1)*(newcam_tilt_acc*(newcam_sensitivityY/10)));
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (newcam_tilt > 12000)
|
if (newcam_tilt > 12000)
|
||||||
|
|
Loading…
Reference in New Issue