incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix mobjscale related issues with kart tilt

Browse source 
also make RR bumpy terrain tilt the kart here
This commit is contained in:
minenice55 2026-04-21 00:45:30 -04:00
parent 2b5af7d302
commit 412e09c098
4 changed files with 47 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/deh_tables.c
View file

@ -1752,6 +1752,7 @@ struct int_const_s const INT_CONST[] = {
{"TRF_TRIPWIRE",TRF_TRIPWIRE},
{"TRF_REMAP",TRF_REMAP},
{"TRF_BYPASSBOOST", TRF_BYPASSBOOST},
{"TRF_BUMPY", TRF_BUMPY},
// facepatches
{"FACE_RANK", FACE_RANK},

49
src/k_kart.c
View file

@ -2030,7 +2030,8 @@ void K_KartMoveAnimation(player_t *player)
if (player->karttilt)
{
//todo: a way for skins(?) to define the tyre offset
player->mo->rollingyoffset = -abs(FixedMul(2 * player->mo->radius, FINESINE(FixedAngle(abs(player->karttilt))>>ANGLETOFINESHIFT))/FRACUNIT);
player->mo->rollingyoffset = -abs(FixedMul(3 * player->mo->info->radius, FINESINE(FixedAngle(abs(player->karttilt))>>ANGLETOFINESHIFT))/FRACUNIT);
player->mo->rollingxoffset -= (FixedMul(player->mo->info->radius, FINESINE(FixedAngle(player->karttilt)>>ANGLETOFINESHIFT))/FRACUNIT);
}
// Update lastspeed value -- we use to display slow driving frames instead of fast driving when slowing down.
@ -4241,9 +4242,10 @@ static void K_SpawnDriftSparks(player_t *player)
{
fixed_t driftExtraScale = 0;
if (player->karttilt &&
((player->drift < 0 && (i & 1)) || (player->drift > 0 && !(i & 1))))
((player->karttilt < 0 && !(i & 1)) || (player->karttilt > 0 && (i & 1)))
)
{
// when tilting during a null-drift don't spawn the sparks for the front tyre
// when the kart is tilting don't spawn the sparks for the tyre that is lifted off the ground
continue;
}
newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(32*FRACUNIT, player->mo->scale));
@ -9428,12 +9430,12 @@ static void K_HandleAirDriftDrag(player_t *player, boolean onground)
// no float-to-fixed here because this is in the deterministic path
#define FIXEDRADTODEG (3754879) //57.2958
#define PLAYERTILTCAP (90*FRACUNIT)
#define PLAYERTILTMOMENTUMCAP (4*M_PI_FIXED)
#define PLAYERTILTMOMENTUMCAP (8*M_PI_FIXED)
/// @brief simulates applying a torque by applying a force at an offset from the player's centre, is a purely visual effect
/// @param player player to apply angular momentum to
/// @param distance distance from player centre to apply torque to ("radius")
/// @param force linear force to apply to the player to turn into angular velocity, + is CCW
/// @param force linear force to apply to the player to turn into angular velocity, + is CCW. Don't mobjscale if your distance is already scaled
void K_AddTiltImpulse(player_t *player, fixed_t distance, fixed_t force)
{
fixed_t angularvelocity = FixedDiv(force, abs(distance));
@ -9451,6 +9453,7 @@ void K_AddTiltMomentum(player_t *player, fixed_t angularvelocity)
static void K_HandleKartTilt(player_t *player)
{
SINT8 startsign = intsign(player->karttilt);
fixed_t lineargravity = P_GetMobjGravity(player->mo);
fixed_t angulargravity;
fixed_t angaccelgravity;
@ -9459,18 +9462,8 @@ static void K_HandleKartTilt(player_t *player)
return;
}
if (player->mo->eflags & MFE_UNDERWATER)
{
// angular drag
player->karttiltmomentum = FixedMul(player->karttiltmomentum, 92*FRACUNIT/100);
angulargravity = abs(player->mo->gravity) * (P_IsObjectOnGround(player->mo) ? 2 : 1);
}
else
{
// angular drag
player->karttiltmomentum = FixedMul(player->karttiltmomentum, 98*FRACUNIT/100);
angulargravity = abs(player->mo->gravity) * (P_IsObjectOnGround(player->mo) ? 8 : 3);
}
angulargravity = abs(lineargravity) * (P_IsObjectOnGround(player->mo) ? 10 : 3);
// O = (linear velocity) / (distance from CoM)
angaccelgravity = FixedDiv(angulargravity, abs(FixedMul(player->mo->radius, FINECOSINE(FixedAngle(player->karttilt)>>ANGLETOFINESHIFT))));
@ -9482,19 +9475,31 @@ static void K_HandleKartTilt(player_t *player)
player->karttilt += FixedMul(player->karttiltmomentum, FIXEDRADTODEG)/TICRATE;
// CONS_Printf("angaccelgravity: %4.3f\n", FixedToFloat(angaccelgravity));
// CONS_Printf("tilt angle: %4.3f\n", FixedToFloat(player->karttilt));
// CONS_Printf("tilt angle momentum (deg/s): %4.3f\n", FixedToFloat(player->karttiltmomentum) * (M_PI/180.0));
// angular drag
if (player->mo->eflags & MFE_UNDERWATER)
{
player->karttiltmomentum = FixedMul(player->karttiltmomentum, 75*FRACUNIT/100);
}
else
{
player->karttiltmomentum = FixedMul(player->karttiltmomentum, 90*FRACUNIT/100);
}
CONS_Printf("angaccelgravity: %4.3f\n", FixedToFloat(angaccelgravity));
CONS_Printf("tilt angle: %4.3f\n", FixedToFloat(player->karttilt));
CONS_Printf("tilt angle momentum (rad/s): %4.3f\n", FixedToFloat(player->karttiltmomentum));
CONS_Printf("tilt angle momentum (deg/s): %4.3f\n", FixedToFloat(player->karttiltmomentum) * (M_PI/180.0));
if ((player->karttilt < 0 && startsign > 0) ||
(player->karttilt > 0 && startsign < 0))
{
player->karttilt = 0;
player->karttiltmomentum = abs(player->karttiltmomentum) * intsign(player->karttilt);
player->karttiltmomentum /= 2;
if (abs(player->karttiltmomentum) < FRACUNIT/3)
{
player->karttiltmomentum = 0;
}
player->karttilt = 0;
}
else if (abs(player->karttilt) >= PLAYERTILTCAP)
{
@ -9780,7 +9785,7 @@ static void K_KartDrift(player_t *player, boolean onground)
FV2_Normalize(&fwd);
FV2_Normalize(&mov);
dot = FixedMul(CLAMP(abs(player->speed), 0, 30*mapobjectscale), FRACUNIT - abs(FV2_Dot(&fwd, &mov)));
dot = FixedMul(CLAMP(abs(player->speed), 0, 32*mapobjectscale), FRACUNIT - abs(FV2_Dot(&fwd, &mov)));
angularvelocity = FixedDiv(-dot * intsign(player->nulldrift),
abs(FixedMul(player->mo->height/2, FINECOSINE(FixedAngle(player->karttilt)>>ANGLETOFINESHIFT)))

17
src/k_terrain.c
View file

@ -632,6 +632,19 @@ void K_ProcessTerrainEffect(mobj_t *mo)
K_DoSneaker(player, SNEAKERTYPE_WATERPANEL);
}
if ((terrain->flags & TRF_BUMPY) && player->speed > 4*mapobjectscale && abs(player->karttilt) < FRACUNIT/2)
{
fixed_t baseimpulse = 9*FRACUNIT * (player->karttiltmomentum ? intsign(player->karttiltmomentum) : 1);
fixed_t rate = CLAMP(FixedDiv(player->speed, K_GetKartSpeed(player, false, false)), 6*FRACUNIT/10, FRACUNIT);
if (abs(player->karttiltmomentum) < abs(baseimpulse))
{
player->karttilt = (FRACUNIT/2) * (player->karttiltmomentum ? intsign(player->karttiltmomentum) : 1);
player->karttiltmomentum = 0;
K_AddTiltImpulse(player, mo->height/2, baseimpulse);
S_StartSoundAtVolume(mo, sfx_s3k56, CLAMP((200*rate)/FRACUNIT, 0, 200));
}
}
// Speed pad
if (terrain->speedPad > 0)
@ -1826,6 +1839,10 @@ static void K_ParseTerrainParameter(size_t i, char *param, char *val)
{
K_FlagBoolean(&terrain->flags, TRF_BYPASSBOOST, val);
}
else if (fasticmp(param, "bumpy") || fasticmp(param, "stairJank"))
{
K_FlagBoolean(&terrain->flags, TRF_BUMPY, val);
}
}
/*--------------------------------------------------

3
src/k_terrain.h
View file

@ -101,7 +101,8 @@ typedef enum
TRF_WATERRUNPANEL = 1<<2, // Texture is a waterrun panel
TRF_TRIPWIRE = 1<<3, // Texture is a tripwire when used as a midtexture
TRF_REMAP = 1<<4, // Texture colors may be remapped with ENCOREMAP or TWEAKMAP
TRF_BYPASSBOOST = 1<<5 // Texture bypasses boost friction resistence
TRF_BYPASSBOOST = 1<<5, // Texture bypasses boost friction resistence
TRF_BUMPY = 1<<6 // Texture is bumpy and visually shakes players driving on it
} terrain_flags_t;
struct terrain_t