fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-24 04:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

view.c: New "gl_cshiftpercent_contents", "gl_cshiftpercent_damage", "gl_cshiftpercent_bonus", "gl_cshiftpercent_powerup" cvars for tuning the strength of specic view blends.

Browse source 
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1515 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
ewasylishen 2017-10-03 19:49:04 +00:00
parent 638d4e097b
commit bc00400aef
4 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
quakespasm/Linux/sgml/Quakespasm.sgml
View file

@ -175,6 +175,7 @@ these patched libSDL binaries may help.
<item> New "r_viewmodel_quake" cvar. Set to 1 for WinQuake gun position (from MarkV).
<item> New "find" / "apropos" command, searches for commands/cvar names for the given substring (from Spike).
<item> New "randmap" command for loading a random map.
<item> New "gl_cshiftpercent_contents", "gl_cshiftpercent_damage", "gl_cshiftpercent_bonus", "gl_cshiftpercent_powerup" cvars for tuning the strength of specic view blends.
<item> Fix macOS startup delay (avoid calling gethostbyname() for ".local" hostnames).
<item> Fix memory corruption in PF_lightstyle with out of bounds lightstyles.
<item> Fix crash in BoundPoly with polygons extending beyond +/-9999.

17
quakespasm/Quake/view.c
View file

@ -60,6 +60,10 @@ cvar_t v_idlescale = {"v_idlescale", "0", CVAR_NONE};
cvar_t crosshair = {"crosshair", "0", CVAR_ARCHIVE};
cvar_t gl_cshiftpercent = {"gl_cshiftpercent", "100", CVAR_NONE};
cvar_t gl_cshiftpercent_contents = {"gl_cshiftpercent_contents", "100", CVAR_NONE}; // QuakeSpasm
cvar_t gl_cshiftpercent_damage = {"gl_cshiftpercent_damage", "100", CVAR_NONE}; // QuakeSpasm
cvar_t gl_cshiftpercent_bonus = {"gl_cshiftpercent_bonus", "100", CVAR_NONE}; // QuakeSpasm
cvar_t gl_cshiftpercent_powerup = {"gl_cshiftpercent_powerup", "100", CVAR_NONE}; // QuakeSpasm
cvar_t r_viewmodel_quake = {"r_viewmodel_quake", "0", CVAR_ARCHIVE};
@ -429,6 +433,12 @@ void V_CalcBlend (void)
{
float r, g, b, a, a2;
int j;
cvar_t *cshiftpercent_cvars[NUM_CSHIFTS] = {
&gl_cshiftpercent_contents,
&gl_cshiftpercent_damage,
&gl_cshiftpercent_bonus,
&gl_cshiftpercent_powerup
};
r = 0;
g = 0;
@ -446,6 +456,9 @@ void V_CalcBlend (void)
//johnfitz
a2 = ((cl.cshifts[j].percent * gl_cshiftpercent.value) / 100.0) / 255.0;
// QuakeSpasm -- also scale by the specific gl_cshiftpercent_* cvar
a2 *= (cshiftpercent_cvars[j]->value / 100.0);
// QuakeSpasm
if (!a2)
continue;
a = a + a2*(1-a);
@ -913,6 +926,10 @@ void V_Init (void)
Cvar_RegisterVariable (&v_idlescale);
Cvar_RegisterVariable (&crosshair);
Cvar_RegisterVariable (&gl_cshiftpercent);
Cvar_RegisterVariable (&gl_cshiftpercent_contents); // QuakeSpasm
Cvar_RegisterVariable (&gl_cshiftpercent_damage); // QuakeSpasm
Cvar_RegisterVariable (&gl_cshiftpercent_bonus); // QuakeSpasm
Cvar_RegisterVariable (&gl_cshiftpercent_powerup); // QuakeSpasm
Cvar_RegisterVariable (&scr_ofsx);
Cvar_RegisterVariable (&scr_ofsy);

1
quakespasm/Quakespasm.html
View file

@ -269,6 +269,7 @@ these patched libSDL binaries may help.
<LI> New "r_viewmodel_quake" cvar. Set to 1 for WinQuake gun position (from MarkV).</LI>
<LI> New "find" / "apropos" command, searches for commands/cvar names for the given substring (from Spike).</LI>
<LI> New "randmap" command for loading a random map.</LI>
<LI> New "gl_cshiftpercent_contents", "gl_cshiftpercent_damage", "gl_cshiftpercent_bonus", "gl_cshiftpercent_powerup" cvars for tuning the strength of specic view blends.</LI>
<LI> Fix macOS startup delay (avoid calling gethostbyname() for ".local" hostnames).</LI>
<LI> Fix memory corruption in PF_lightstyle with out of bounds lightstyles.</LI>
<LI> Fix crash in BoundPoly with polygons extending beyond +/-9999.</LI>

4
quakespasm/Quakespasm.txt
View file

@ -340,6 +340,10 @@
o New "randmap" command for loading a random map.
o New "gl_cshiftpercent_contents", "gl_cshiftpercent_damage",
"gl_cshiftpercent_bonus", "gl_cshiftpercent_powerup" cvars for
tuning the strength of specic view blends.
o Fix macOS startup delay (avoid calling gethostbyname() for ".local"
hostnames).