nzp-team/quakespasm
0
0
Fork 0
mirror of https://github.com/nzp-team/quakespasm.git synced 2024-11-22 11:51:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13 from ScatterBox/main

Browse source
This commit is contained in:
Ian 2023-01-18 16:56:30 -05:00 committed by GitHub
commit 0459f67293
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/gl_fog.c
View file

@ -296,8 +296,8 @@ float *Fog_GetColor (void)
}
//find closest 24-bit RGB value, so solid-colored sky can match the fog perfectly
//for (i=0;i<3;i++)
//c[i] = (float)(Q_rint(c[i] * 255)) / 255.0f;
for (i=0;i<3;i++)
c[i] = (float)(Q_rint(c[i] * 255)) / 255.0f;
//#endif
return c;
}
@ -365,6 +365,8 @@ void Fog_SetupFrame (void)
glFogfv(GL_FOG_COLOR, Fog_GetColor());
glFogf(GL_FOG_DENSITY, fog_density_gl);
glFogf(GL_FOG_START, fog_start);
glFogf(GL_FOG_END, fog_end);
//glFogf(GL_FOG_COLOR, *c);
//if(s == 0 || e < 0)
@ -459,8 +461,6 @@ called after drawing stuff that is additive blended -- restores fog color
*/
void Fog_StopAdditive (void)
{
vec3_t color = {0,0,0};
if (Fog_GetDensity() > 0)
glFogfv(GL_FOG_COLOR, Fog_GetColor());
}

8
source/r_alias.c
View file

@ -291,10 +291,10 @@ void GLAlias_CreateShaders (void)
blendLoc = GL_GetUniformLocation (&r_alias_program, "Blend");
shadevectorLoc = GL_GetUniformLocation (&r_alias_program, "ShadeVector");
lightColorLoc = GL_GetUniformLocation (&r_alias_program, "LightColor");
#ifndef VITA
//#ifndef VITA
texLoc = GL_GetUniformLocation (&r_alias_program, "Tex");
fullbrightTexLoc = GL_GetUniformLocation (&r_alias_program, "FullbrightTex");
#endif
//#endif
useFullbrightTexLoc = GL_GetUniformLocation (&r_alias_program, "UseFullbrightTex");
useOverbrightLoc = GL_GetUniformLocation (&r_alias_program, "UseOverbright");
useAlphaTestLoc = GL_GetUniformLocation (&r_alias_program, "UseAlphaTest");
@ -354,10 +354,10 @@ void GL_DrawAliasFrame_GLSL (aliashdr_t *paliashdr, lerpdata_t lerpdata, gltextu
GL_Uniform1fFunc (blendLoc, blend);
GL_Uniform3fFunc (shadevectorLoc, shadevector[0], shadevector[1], shadevector[2]);
GL_Uniform4fFunc (lightColorLoc, lightcolor[0], lightcolor[1], lightcolor[2], entalpha);
#ifndef VITA
//#ifndef VITA
GL_Uniform1iFunc (texLoc, 0);
GL_Uniform1iFunc (fullbrightTexLoc, 1);
#endif
//#endif
GL_Uniform1iFunc (useFullbrightTexLoc, (fb != NULL) ? 1 : 0);
GL_Uniform1fFunc (useOverbrightLoc, overbright ? 1 : 0);
GL_Uniform1iFunc (useAlphaTestLoc, (currententity->model->flags & MF_HOLEY) ? 1 : 0);

4
source/sv_phys.c.bak
View file

@ -1676,11 +1676,11 @@ void SV_Physics (void)
//
ent = sv.edicts;
if (sv_freezenonclients.value)
/* if (sv_freezenonclients.value)
entity_cap = svs.maxclients + 1; // Only run physics on clients and the world
else
entity_cap = sv.num_edicts;
*/
for (i=0 ; i<sv.num_edicts ; i++, ent = NEXT_EDICT(ent))
//for (i=0 ; i<entity_cap ; i++, ent = NEXT_EDICT(ent))
{