zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small cleanups to fogcalc() and fogcalc_old()

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7103 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-10-25 23:31:01 +00:00
parent ffab1f7d71
commit ad8a65d154
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
source/build/src/polymost.cpp
View file

@ -1254,25 +1254,20 @@ static void fogcalc_old(int32_t shade, int32_t vis)
{ {
float f; float f;
if (r_usenewshading==1) if (r_usenewshading == 1)
{ {
f = 0.9f * shade; f = 0.9f * shade;
f = (vis > 239) ? (float)(gvisibility*((vis-240+f))) : f = (vis > 239) ? (float)(gvisibility * (vis - 240 + f)) :
(float)(gvisibility*(vis+16+f)); (float)(gvisibility * (vis + 16 + f));
} }
else else
{ {
f = (shade < 0) ? shade * 3.5f : shade * .66f; f = (shade < 0) ? shade * 3.5f : shade * .66f;
f = (vis > 239) ? (float)(gvisibility*((vis-240+f)/(klabs(vis-256)))) : f = (vis > 239) ? (float)(gvisibility * ((vis - 240 + f) / (klabs(vis - 256)))) :
(float)(gvisibility*(vis+16+f)); (float)(gvisibility * (vis + 16 + f));
} }
if (f < 0.001f) fogresult = clamp(f, 0.001f, 100.0f);
f = 0.001f;
else if (f > 100.0f)
f = 100.0f;
fogresult = f;
} }
// For GL_LINEAR fog: // For GL_LINEAR fog:
@ -1304,13 +1299,13 @@ static inline void fogcalc(int32_t tile, int32_t shade, int32_t vis, int32_t pal
{ {
// beg = -D*shade, end = D*(NUMSHADES-1-shade) // beg = -D*shade, end = D*(NUMSHADES-1-shade)
// => end/beg = -(NUMSHADES-1-shade)/shade // => end/beg = -(NUMSHADES-1-shade)/shade
fogresult = (float) -FULLVIS_BEGIN; fogresult = -FULLVIS_BEGIN;
fogresult2 = FULLVIS_BEGIN * (float) (numshades-1-shade)/shade; fogresult2 = FULLVIS_BEGIN * (float)(numshades-1-shade) / shade;
} }
else else
{ {
fogresult = (float) FULLVIS_BEGIN; fogresult = FULLVIS_BEGIN;
fogresult2 = (float) FULLVIS_END; fogresult2 = FULLVIS_END;
} }
} }
else if (r_usenewshading == 3 && shade >= numshades-1) else if (r_usenewshading == 3 && shade >= numshades-1)
@ -1321,7 +1316,7 @@ static inline void fogcalc(int32_t tile, int32_t shade, int32_t vis, int32_t pal
else else
{ {
combvis = 1.f/combvis; combvis = 1.f/combvis;
fogresult = (r_usenewshading == 3 && shade > 0) ? 0 : -(FOGDISTCONST * shade) * combvis; fogresult = (r_usenewshading == 3 && shade > 0) ? 0.f : -(FOGDISTCONST * shade) * combvis;
fogresult2 = (FOGDISTCONST * (numshades-1-shade)) * combvis; fogresult2 = (FOGDISTCONST * (numshades-1-shade)) * combvis;
} }
} }