mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-15 01:01:33 +00:00
Disable sprite/model rotation on slopes for now
This commit is contained in:
parent
a71a7f2710
commit
bc9e7c1461
3 changed files with 14 additions and 0 deletions
|
@ -1630,8 +1630,13 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
|
|||
}
|
||||
}
|
||||
|
||||
#if 0
|
||||
p.anglez = FIXED_TO_FLOAT(AngleFixed(interp.pitch));
|
||||
p.anglex = FIXED_TO_FLOAT(AngleFixed(interp.roll));
|
||||
#else
|
||||
p.anglez = 0.f;
|
||||
p.anglex = 0.f;
|
||||
#endif
|
||||
|
||||
p.flip = atransform.flip;
|
||||
p.mirror = atransform.mirror;
|
||||
|
|
|
@ -1556,6 +1556,7 @@ void P_CheckGravity(mobj_t *mo, boolean affect)
|
|||
//
|
||||
void P_SetPitchRollFromSlope(mobj_t *mo, pslope_t *slope)
|
||||
{
|
||||
#if 0
|
||||
if (slope)
|
||||
{
|
||||
fixed_t tempz = slope->normal.z;
|
||||
|
@ -1569,6 +1570,10 @@ void P_SetPitchRollFromSlope(mobj_t *mo, pslope_t *slope)
|
|||
{
|
||||
mo->pitch = mo->roll = 0;
|
||||
}
|
||||
#else
|
||||
(void)mo;
|
||||
(void)slope;
|
||||
#endif
|
||||
}
|
||||
|
||||
#define STOPSPEED (FRACUNIT)
|
||||
|
|
|
@ -26,6 +26,7 @@ angle_t R_ModelRotationAngle(interpmobjstate_t *interp)
|
|||
|
||||
angle_t R_SpriteRotationAngle(interpmobjstate_t *interp)
|
||||
{
|
||||
#if 0
|
||||
angle_t viewingAngle = R_PointToAngle(interp->x, interp->y);
|
||||
|
||||
fixed_t pitchMul = -FINESINE(viewingAngle >> ANGLETOFINESHIFT);
|
||||
|
@ -34,6 +35,9 @@ angle_t R_SpriteRotationAngle(interpmobjstate_t *interp)
|
|||
angle_t rollOrPitch = FixedMul(interp->pitch, pitchMul) + FixedMul(interp->roll, rollMul);
|
||||
|
||||
return (rollOrPitch + R_ModelRotationAngle(interp));
|
||||
#else
|
||||
return R_ModelRotationAngle(interp);
|
||||
#endif
|
||||
}
|
||||
|
||||
INT32 R_GetRollAngle(angle_t rollangle)
|
||||
|
|
Loading…
Reference in a new issue