Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff

This commit is contained in:
Alug committed 2024-01-08 08:51:05 +01:00
commit a98d46f8a8
8 files changed
+131 -126

No files matched your search

+4 -6
View File
@@ -496,17 +496,12 @@ consvar_t cv_ydeadzone4 = {"joy4_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_c
static CV_PossibleValue_t driftsparkpulse_t[] = {{0, "MIN"}, {FRACUNIT*3, "MAX"}, {0, NULL}};
consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, driftsparkpulse_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t stretchfactor_t[] = {
{0, "Off"}, {FRACUNIT/8, "0.125"}, {FRACUNIT/4, "0.250"},
{3*FRACUNIT/8, "0.375"}, {FRACUNIT/2, "0.500"}, {5*FRACUNIT/8, "0.625"},
{3*FRACUNIT/4, "0.750"}, {7*FRACUNIT/8, "0.875"}, {FRACUNIT, "Max"}, {0, NULL}};
consvar_t cv_gravstretch = {"gravstretch", "0", CV_SAVE, stretchfactor_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_sloperoll = {"sloperoll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_sliptideroll = {"sliptideroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t slamsound_t[] = {{0, "Off"}, {1, "On"}, {0, NULL}};
consvar_t cv_slamsound = {"slamsound", "1", CV_SAVE, slamsound_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -516,8 +511,11 @@ static CV_PossibleValue_t sloperolldist_cons_t[] = {
{3072, "3072"}, {4096, "4096"}, {6144, "6144"},
{8192, "8192"}, {0, "Infinite"}, {0, NULL}};
consvar_t cv_sloperolldist = {"sloperolldist", "Infinite", CV_SAVE, sloperolldist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t sloperoll_cons_t[] = {{0, "Off"}, {1, "Players"}, {2, "Everything"}, {0, NULL}};
consvar_t cv_spriteroll = {"spriteroll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_sloperoll = {"sloperoll", "Off", CV_SAVE|CV_CALL, sloperoll_cons_t, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_sparkroll = {"sparkroll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_sliptideroll = {"sliptideroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+1
View File
@@ -164,6 +164,7 @@ extern consvar_t cv_saltysquish;
extern consvar_t cv_driftsparkpulse;
extern consvar_t cv_gravstretch;
extern consvar_t cv_sloperoll;
extern consvar_t cv_spriteroll;
extern consvar_t cv_sliptideroll;
extern consvar_t cv_slamsound;
extern consvar_t cv_sloperolldist;
+30 -30
View File
@@ -5324,8 +5324,6 @@ void HWR_ProjectSprite(mobj_t *thing)
angle_t sliptiderollangle = 0;
#endif
// uncapped/interpolation
interpmobjstate_t interp = {0};
@@ -5463,36 +5461,38 @@ void HWR_ProjectSprite(mobj_t *thing)
spr_topoffset = spritecachedinfo[lumpoff].topoffset;
#ifdef ROTSPRITE
rollangle = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), interp.roll)
+ FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), interp.pitch)
+ FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), interp.sloperoll)
+ FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), interp.slopepitch)
+ thing->rollangle;
if ((rollangle)||(thing->player && thing->player->sliproll))
if (cv_spriteroll.value)
{
if (thing->player)
{
sliptiderollangle = cv_sliptideroll.value ? thing->player->sliproll*(thing->player->sliptidemem) : 0;
rollsum = rollangle+FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle);
}
else
rollsum = rollangle;
rollangle = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), interp.roll)
+ FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), interp.pitch)
+ FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), interp.sloperoll)
+ FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), interp.slopepitch)
+ thing->rollangle;
rollangle = R_GetRollAngle(rollsum);
rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle);
if (rotsprite != NULL)
if ((rollangle)||(thing->player && thing->player->sliproll))
{
spr_width = rotsprite->width << FRACBITS;
spr_height = rotsprite->height << FRACBITS;
spr_offset = rotsprite->leftoffset << FRACBITS;
spr_topoffset = rotsprite->topoffset << FRACBITS;
spr_topoffset += FEETADJUST;
// flip -> rotate, not rotate -> flip
flip = 0;
if (thing->player)
{
sliptiderollangle = cv_sliptideroll.value ? thing->player->sliproll*(thing->player->sliptidemem) : 0;
rollsum = rollangle+FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle);
}
else
rollsum = rollangle;
rollangle = R_GetRollAngle(rollsum);
rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle);
if (rotsprite != NULL)
{
spr_width = rotsprite->width << FRACBITS;
spr_height = rotsprite->height << FRACBITS;
spr_offset = rotsprite->leftoffset << FRACBITS;
spr_topoffset = rotsprite->topoffset << FRACBITS;
spr_topoffset += FEETADJUST;
// flip -> rotate, not rotate -> flip
flip = 0;
}
}
}
#endif
@@ -5598,7 +5598,7 @@ void HWR_ProjectSprite(mobj_t *thing)
vis->spriteyoffset = FIXED_TO_FLOAT(spr_topoffset);
#ifdef ROTSPRITE
if (rotsprite)
if ((rotsprite) && (cv_spriteroll.value))
vis->gpatch = (GLPatch_t *)rotsprite;
else
#endif
+1 -1
View File
@@ -6450,7 +6450,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if (cv_sloperolldist.value > 0)
usedist = true;
if (cv_sloperoll.value == 1)
if ((cv_spriteroll.value) && (cv_sloperoll.value))
{
if ((!player->mo->salty_jump)) // seeing a character rotate mid-hop looks really janky
K_RollMobjBySlopes(player->mo, usedist);
+32 -33
View File
@@ -2005,7 +2005,7 @@ static menuitem_t OP_SaturnMenu[] =
{IT_STRING | IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 80},
{IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 85},
{IT_STRING | IT_CVAR, NULL, "Midnight Channel Flicker Effect", &cv_lessflicker, 95},
{IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 95},
{IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 105},
{IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 110},
@@ -2061,21 +2061,23 @@ static menuitem_t OP_PlayerDistortMenu[] =
{
{IT_HEADER, NULL, "Sprite Distortion", NULL, 0},
{IT_STRING | IT_CVAR, NULL, "Rotate Objects on Slopes", &cv_sloperoll, 20},
{IT_STRING | IT_CVAR, NULL, "Slope Rotation Distance", &cv_sloperolldist, 35},
{IT_STRING | IT_CVAR, NULL, "Rotate Players when Sliptiding", &cv_sliptideroll, 50},
{IT_STRING | IT_CVAR, NULL, "Rotate Sparks and Boost Trails", &cv_sparkroll, 65},
{IT_STRING | IT_CVAR, NULL, "Player Stretch Factor", &cv_gravstretch, 80},
{IT_STRING | IT_CVAR, NULL, "Squish Sound Effect", &cv_slamsound, 95},
{IT_STRING | IT_CVAR, NULL, "Saltyhop", &cv_saltyhop, 110},
{IT_STRING | IT_CVAR, NULL, "Saltyhop Sound Effect", &cv_saltyhopsfx, 125},
{IT_STRING | IT_CVAR, NULL, "Saltyhop Squish", &cv_saltysquish, 140},
{IT_STRING | IT_CVAR, NULL, "Sprite Rotation", &cv_spriteroll, 15},
{IT_STRING | IT_CVAR, NULL, "Sprite Slope Rotation", &cv_sloperoll, 30},
{IT_STRING | IT_CVAR, NULL, "Slope Rotation Distance", &cv_sloperolldist, 45},
{IT_STRING | IT_CVAR, NULL, "Rotate Players when Sliptiding", &cv_sliptideroll, 60},
{IT_STRING | IT_CVAR, NULL, "Rotate Sparks and Boost Trails", &cv_sparkroll, 75},
{IT_STRING | IT_CVAR, NULL, "Player Stretch Factor", &cv_gravstretch, 90},
{IT_STRING | IT_CVAR, NULL, "Squish Sound Effect", &cv_slamsound, 105},
{IT_STRING | IT_CVAR, NULL, "Saltyhop", &cv_saltyhop, 120},
{IT_STRING | IT_CVAR, NULL, "Saltyhop Sound Effect", &cv_saltyhopsfx, 135},
{IT_STRING | IT_CVAR, NULL, "Saltyhop Squish", &cv_saltysquish, 150},
};
static const char* OP_PlayerDistortTooltips[] =
{
NULL,
"Object rotation on slopes.",
"Sprite rotation features.",
"Sprite rotation on slopes. Can either be just players or all objects.",
"Distance object rotation should be visable.",
"Player rotation when sliptiding.",
"Rotation of a player's boost trails and drift sparks.",
@@ -2088,9 +2090,12 @@ static const char* OP_PlayerDistortTooltips[] =
enum
{
spriteheader,
spriterotate,
sloperotate,
slrotatedist,
sliptide,
sparkrotate,
stretchyplayer,
squishsound,
salthmmm,
@@ -3127,20 +3132,26 @@ void Addons_option_Onchange(void)
void PDistort_menu_Onchange(void)
{
UINT16 status;
if (cv_sloperoll.value)
if (!cv_spriteroll.value)
{
status = IT_STRING | IT_CVAR;
OP_PlayerDistortMenu[sloperotate].status = IT_GRAYEDOUT;
OP_PlayerDistortMenu[sliptide].status = IT_GRAYEDOUT;
}
else
{
status = IT_GRAYEDOUT;
OP_PlayerDistortMenu[sloperotate].status = IT_STRING | IT_CVAR;
OP_PlayerDistortMenu[sliptide].status = IT_STRING | IT_CVAR;
}
// enable/disable rolldist and sparkroll options
OP_PlayerDistortMenu[2].status = status;
OP_PlayerDistortMenu[4].status = status;
if ((cv_sloperoll.value) && (cv_spriteroll.value)) //enable/disable sloperotate distance
OP_PlayerDistortMenu[slrotatedist].status = IT_STRING | IT_CVAR;
else
OP_PlayerDistortMenu[slrotatedist].status = IT_GRAYEDOUT;
if ((cv_sloperoll.value == 2) && (cv_spriteroll.value)) //enable/disable sparkroll depending on which setting
OP_PlayerDistortMenu[sparkrotate].status = IT_STRING | IT_CVAR;
else
OP_PlayerDistortMenu[sparkrotate].status = IT_GRAYEDOUT;
}
void Bird_menu_Onchange(void)
@@ -3148,26 +3159,18 @@ void Bird_menu_Onchange(void)
UINT16 status;
if (cv_tilting.value)
{
status = IT_STRING | IT_CVAR;
}
else
{
status = IT_GRAYEDOUT;
}
OP_TiltMenu[tiltwturning].status = status;
OP_TiltMenu[smoothening].status = status;
OP_TiltMenu[tiltwquakes].status = status;
if (cv_fading.value)
{
status = IT_STRING | IT_CVAR;
}
else
{
status = IT_GRAYEDOUT;
}
OP_AdvancedBirdMenu[fadeinvinc].status = status;
OP_AdvancedBirdMenu[fadegrow].status = status;
@@ -3194,13 +3197,9 @@ void Saturn_menu_Onchange(void)
UINT16 status;
if (cv_colorizedhud.value)
{
status = IT_STRING | IT_CVAR;
}
status = IT_STRING | IT_CVAR;
else
{
status = IT_GRAYEDOUT;
}
status = IT_GRAYEDOUT;
OP_SaturnMenu[sm_coloritem].status = status;
OP_SaturnMenu[sm_colorhud_customcolor].status = status;
+4 -1
View File
@@ -6263,7 +6263,7 @@ void P_RollPitchMobj(mobj_t* mobj)
if (cv_sloperolldist.value > 0)
usedist = true;
if (cv_sloperoll.value == 1)
if ((cv_spriteroll.value) && (cv_sloperoll.value == 2))
{
K_RollMobjBySlopes(mobj, usedist);
}
@@ -6284,6 +6284,9 @@ angle_t P_MobjPitchAndRoll(mobj_t *mobj)
if (P_MobjWasRemoved(mobj))
return 0;
if (cv_spriteroll.value)
return 0;
size_t rot = mobj->frame & FF_FRAMEMASK;
boolean papersprite = (mobj->frame & FF_PAPERSPRITE);
+1
View File
@@ -1994,6 +1994,7 @@ void R_RegisterEngineStuff(void)
CV_RegisterVar(&cv_driftsparkpulse);
CV_RegisterVar(&cv_gravstretch);
CV_RegisterVar(&cv_sloperoll);
CV_RegisterVar(&cv_spriteroll);
CV_RegisterVar(&cv_sliptideroll);
CV_RegisterVar(&cv_sloperolldist);
CV_RegisterVar(&cv_sparkroll);
+58 -55
View File
@@ -143,11 +143,11 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch
// rotsprite
#ifdef ROTSPRITE
for (r = 0; r < 16; r++)
{
sprtemp[frame].rotated[0][r] = NULL;
sprtemp[frame].rotated[1][r] = NULL;
}
for (r = 0; r < 16; r++)
{
sprtemp[frame].rotated[0][r] = NULL;
sprtemp[frame].rotated[1][r] = NULL;
}
#endif/*ROTSPRITE*/
@@ -1492,61 +1492,64 @@ static void R_ProjectSprite(mobj_t *thing)
#ifdef ROTSPRITE
pitchnroll = 0; // set this to 0, non-paper sprites will affect this value
if (cv_spriteroll.value)
{
if (papersprite)
{
if (ang >= ANGLE_180)
{
// Makes Software act much more sane like OpenGL
rollangle = InvAngle(thing->rollangle);
}
else
{
rollangle = thing->rollangle;
}
}
else
{
// this is very messy, but it on-the-fly calculates rotations for all the
// pitch and roll variables
pitchnroll = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), interp.roll) +
FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), interp.pitch) +
FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), interp.sloperoll) +
FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), interp.slopepitch);
if (papersprite)
{
if (ang >= ANGLE_180)
{
// Makes Software act much more sane like OpenGL
rollangle = InvAngle(thing->rollangle);
}
else
{
rollangle = thing->rollangle;
}
}
else
{
// this is very messy, but it on-the-fly calculates rotations for all the
// pitch and roll variables
pitchnroll = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), interp.roll) +
FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), interp.pitch) +
FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), interp.sloperoll) +
FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), interp.slopepitch);
rollangle = thing->rollangle;
}
rollangle = thing->rollangle;
}
if ((rollangle) || (pitchnroll) || (thing->player && thing->player->sliproll))
{
rollsum = pitchnroll;
if ((rollangle) || (pitchnroll) || (thing->player && thing->player->sliproll))
{
rollsum = pitchnroll;
if (thing->player)
{
sliptiderollangle =
cv_sliptideroll.value ? thing->player->sliproll * (thing->player->sliptidemem) : 0;
rollsum += thing->rollangle +
FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle);
}
else
rollsum += thing->rollangle;
if (thing->player)
{
sliptiderollangle =
cv_sliptideroll.value ? thing->player->sliproll * (thing->player->sliptidemem) : 0;
rollsum += thing->rollangle +
FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle);
}
else
rollsum += thing->rollangle;
rollangle = R_GetRollAngle(rollsum);
rotsprite = Patch_GetRotatedSprite(
sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle);
rollangle = R_GetRollAngle(rollsum);
rotsprite = Patch_GetRotatedSprite(
sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle);
if (rotsprite != NULL)
{
spr_width = rotsprite->width << FRACBITS;
spr_height = rotsprite->height << FRACBITS;
spr_offset = rotsprite->leftoffset << FRACBITS;
spr_topoffset = rotsprite->topoffset << FRACBITS;
spr_topoffset += FEETADJUST;
if (rotsprite != NULL)
{
spr_width = rotsprite->width << FRACBITS;
spr_height = rotsprite->height << FRACBITS;
spr_offset = rotsprite->leftoffset << FRACBITS;
spr_topoffset = rotsprite->topoffset << FRACBITS;
spr_topoffset += FEETADJUST;
// flip -> rotate, not rotate -> flip
flip = 0;
}
}
// flip -> rotate, not rotate -> flip
flip = 0;
}
}
}
#endif
// calculate edges of the shape
@@ -1797,7 +1800,7 @@ static void R_ProjectSprite(mobj_t *thing)
//Fab: lumppat is the lump number of the patch to use, this is different
// than lumpid for sprites-in-pwad : the graphics are patched
#ifdef ROTSPRITE
if (rotsprite != NULL)
if ((rotsprite != NULL) && (cv_spriteroll.value))
vis->patch = rotsprite;
else
#endif