teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Polymost: Account for yscale when deciding if the sky is tall enough to repeat or not. Comment out code that is not working as expected.

Browse source 
Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6560 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-12-12 05:14:09 +00:00
parent b6d7de7d27
commit 583dc0f47a
1 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3017,7 +3017,7 @@ static void polymost_drawalls(int32_t const bunch)
int i = (1<<(picsiz[globalpicnum]>>4)); if (i != tilesiz[globalpicnum].y) i += i;
vec3f_t o;
if (tilesiz[globalpicnum].y > 256)
if ((tilesiz[globalpicnum].y * daptileyscale * (1.f/65536.f)) > 256)
{
//Hack to draw black rectangle below sky when looking down...
xtex.d = xtex.u = xtex.v = 0;
@ -3056,6 +3056,7 @@ static void polymost_drawalls(int32_t const bunch)
else
polymost_domost(x0,fy0,x1,fy1);
#if 0
//Hack to draw color rectangle above sky when looking up...
xtex.d = xtex.u = xtex.v = 0;
@ -3069,29 +3070,25 @@ static void polymost_drawalls(int32_t const bunch)
o.y = -vv[0]/vv[1];
if ((o.y < cy0) && (o.y < cy1))
if ((o.y < fy0) && (o.y < fy1))
polymost_domost(x1,o.y,x0,o.y);
else if ((o.y < cy0) != (o.y < cy1))
else if ((o.y < fy0) != (o.y < fy1))
{
/* cy1 cy0
// / \
//oy---------- oy---------
// / \
// cy0 cy1 */
o.x = (o.y-cy0)*(x1-x0)/(cy1-cy0) + x0;
if (o.y < cy0)
o.x = (o.y-fy0)*(x1-x0)/(fy1-fy0) + x0;
if (o.y < fy0)
{
polymost_domost(o.x,o.y,x0,o.y);
polymost_domost(x1,cy1,o.x,o.y);
polymost_domost(x1,fy1,o.x,o.y);
}
else
{
polymost_domost(o.x,o.y,x0,cy0);
polymost_domost(o.x,o.y,x0,fy0);
polymost_domost(x1,o.y,o.x,o.y);
}
}
else
polymost_domost(x1,cy1,x0,cy0);
polymost_domost(x1,fy1,x0,fy0);
#endif
}
else
skyclamphack = 0;
@ -3352,8 +3349,9 @@ static void polymost_drawalls(int32_t const bunch)
int i = (1<<(picsiz[globalpicnum]>>4)); if (i != tilesiz[globalpicnum].y) i += i;
vec3f_t o;
if (tilesiz[globalpicnum].y > 256)
if ((tilesiz[globalpicnum].y * daptileyscale * (1.f/65536.f)) > 256)
{
#if 0
//Hack to draw black rectangle below sky when looking down...
xtex.d = xtex.u = xtex.v = 0;
@ -3367,29 +3365,25 @@ static void polymost_drawalls(int32_t const bunch)
o.y = ((float)tilesiz[globalpicnum].y*dd-vv[0])/vv[1];
if ((o.y > fy0) && (o.y > fy1))
if ((o.y > cy0) && (o.y > cy1))
polymost_domost(x0,o.y,x1,o.y);
else if ((o.y > fy0) != (o.y > fy1))
else if ((o.y > cy0) != (o.y > cy1))
{
// fy0 fy1
// \ /
//oy---------- oy----------
// \ /
// fy1 fy0
o.x = (o.y-fy0)*(x1-x0)/(fy1-fy0) + x0;
if (o.y > fy0)
o.x = (o.y-cy0)*(x1-x0)/(cy1-cy0) + x0;
if (o.y > cy0)
{
polymost_domost(x0,o.y,o.x,o.y);
polymost_domost(o.x,o.y,x1,fy1);
polymost_domost(o.x,o.y,x1,cy1);
}
else
{
polymost_domost(x0,fy0,o.x,o.y);
polymost_domost(x0,cy0,o.x,o.y);
polymost_domost(o.x,o.y,x1,o.y);
}
}
else
polymost_domost(x0,fy0,x1,fy1);
polymost_domost(x0,cy0,x1,cy1);
#endif
//Hack to draw color rectangle above sky when looking up...
xtex.d = xtex.u = xtex.v = 0;