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

This commit is contained in:
Alug committed 2024-01-14 22:50:11 +01:00
commit 6f6252b6f8
4 files changed
+5 -23

No files matched your search

-3
View File
@@ -123,7 +123,6 @@ consvar_t cv_secbright = {"secbright", "0", CV_SAVE, secbright_cons_t,
consvar_t cv_grfovchange = {"gr_fovchange", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_grvhseffect = {"gr_vhseffect", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
// values for the far clipping plane
static float clipping_distances[] = {1024.0f, 2048.0f, 4096.0f, 6144.0f, 8192.0f, 12288.0f, 16384.0f};
@@ -6405,8 +6404,6 @@ void HWR_AddCommands(void)
CV_RegisterVar(&cv_grpaletterendering);
CV_RegisterVar(&cv_grpalettedepth);
CV_RegisterVar(&cv_grflashpal);
CV_RegisterVar(&cv_grvhseffect);
}
// --------------------------------------------------------------------------
-1
View File
@@ -195,7 +195,6 @@ extern consvar_t cv_grscreentextures;
extern consvar_t cv_grportals;
extern consvar_t cv_nostencil;
extern consvar_t cv_secbright;
extern consvar_t cv_grvhseffect;
extern CV_PossibleValue_t granisotropicmode_cons_t[];
+1 -6
View File
@@ -1492,8 +1492,7 @@ static menuitem_t OP_ExpOptionsMenu[] =
{IT_STRING | IT_CVAR, NULL, "FFloorclip", &cv_ffloorclip, 85},
{IT_STRING | IT_CVAR, NULL, "Spriteclip", &cv_spriteclip, 95},
#ifdef HWRENDER
{IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_grscreentextures, 65},
{IT_STRING | IT_CVAR, NULL, "VHS effect", &cv_grvhseffect, 75},
{IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_grscreentextures, 75},
{IT_STRING | IT_CVAR, NULL, "Splitwall/Slope texture fix", &cv_splitwallfix, 95},
{IT_STRING | IT_CVAR, NULL, "Slope midtexture peg fix", &cv_slopepegfix, 105},
@@ -1512,7 +1511,6 @@ static const char* OP_ExpTooltips[] =
"Hides Sprites which are not visible\npotentially resulting in a performance boost.",
#ifdef HWRENDER
"Should the game do Screen Textures? Provides a good boost to frames\nat the cost of some visual effects not working when disabled.",
"Show a VHS-like effect when the game is paused or youre rewinding replays.",
"Fixes issues that resulted in Textures sticking from the ground sometimes.\n This may be CPU heavy and result in worse performance in some cases.",
"Fixes issues that resulted in Textures not being properly skewed\n example: Fences on slopes that didnt show proper.\n This may be CPU heavy and result in worse performance in some cases.",
"Fixes issues that resulted in Textures on Floor over Floors ZFighting heavily.",
@@ -1530,7 +1528,6 @@ enum
op_exp_sprclip,
#ifdef HWRENDER
op_exp_grscrtx,
op_exp_grvhs,
op_exp_spltwal,
op_exp_pegging,
op_exp_fofzfight,
@@ -4476,7 +4473,6 @@ void M_Init(void)
{
OP_VideoOptionsMenu[op_video_ogl].status = IT_DISABLED;
OP_ExpOptionsMenu[op_exp_grscrtx].status = IT_DISABLED;
OP_ExpOptionsMenu[op_exp_grvhs].status = IT_DISABLED;
OP_ExpOptionsMenu[op_exp_spltwal].status = IT_DISABLED;
OP_ExpOptionsMenu[op_exp_pegging].status = IT_DISABLED;
OP_ExpOptionsMenu[op_exp_fofzfight].status = IT_DISABLED;
@@ -4484,7 +4480,6 @@ void M_Init(void)
}
if (rendermode == render_opengl){
OP_ExpOptionsMenu[op_exp_vhs].status = IT_DISABLED;
OP_ExpOptionsMenu[op_exp_ffclip].status = IT_DISABLED;
OP_ExpOptionsMenu[op_exp_sprclip].status = IT_DISABLED;
}
+4 -13
View File
@@ -1366,26 +1366,17 @@ void V_DrawVhsEffect(boolean rewind)
if (rewind)
V_DrawVhsEffect(false); // experimentation
if (R_UsingFrameInterpolation()) // omg i fucking hate interp so much, its a bit smoother but still not great whatever, atleast like this shit wont completely go nuts when youre on high framerates
if (renderisnewtic)
{
if (renderisnewtic)
{
upbary -= FixedMul(vid.dupy * (rewind ? 3 : 1.8f), 22937*3);
downbary += FixedMul(vid.dupy * (rewind ? 2 : 1), 22937*3);
}
}
else
{
upbary -= vid.dupy * (rewind ? 3 : 1.8f);
downbary += vid.dupy * (rewind ? 2 : 1);
upbary -= (vid.dupy * (rewind ? 3 : 1.8f));
downbary += (vid.dupy * (rewind ? 2 : 1));
}
if (upbary < -barsize) upbary = vid.height;
if (downbary > vid.height) downbary = -barsize;
#ifdef HWRENDER
if ((rendermode == render_opengl) && (cv_grvhseffect.value))
if (rendermode == render_opengl)
{
HWR_RenderVhsEffect(upbary, downbary, updistort, downdistort, barsize);
return;