teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-12-03 09:32:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- partial fix for the broken sky in E3M2 of Blood.

Browse source
This commit is contained in:
Christoph Oelckers 2020-01-26 13:45:33 +01:00
parent 4c6265e246
commit 43f48a10dd
1 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -458,7 +458,38 @@ static void polymost_drawpoly(vec2f_t const * const dpxy, int32_t const n, int32
int const npoints = j; int const npoints = j;
if (skyclamphack) method |= DAMETH_CLAMPED; float usub = 0;
float vsub = 0;
if (skyclamphack)
{
drawpoly_srepeat = false;
drawpoly_trepeat = false;
method = DAMETH_CLAMPED;
vec2f_t const scale = { 1.f / tsiz.x, 1.f / tsiz.y };
#if 0
usub = FLT_MAX;
vsub = FLT_MAX;
for (int i = 0; i < npoints; i++)
{
float const r = 1.f / dd[i];
float u = floor(uu[i] * r * scale.x);
float v = floor(vv[i] * r * scale.y);
if (u < usub) usub = u;
if (v < vsub) vsub = v;
}
#endif
for (int i = 0; i < npoints; i++)
{
float const r = 1.f / dd[i];
float u = uu[i] * r * scale.x - usub;
float v = vv[i] * r * scale.y - vsub;
if (u < -FLT_EPSILON || u > 1 + FLT_EPSILON) drawpoly_srepeat = true;
if (v < -FLT_EPSILON || v > 1 + FLT_EPSILON) drawpoly_trepeat = true;
}
}
polymost_outputGLDebugMessage(3, "polymost_drawpoly(dpxy:%p, n:%d, method_:%X), method: %X", dpxy, n, method_, method); polymost_outputGLDebugMessage(3, "polymost_drawpoly(dpxy:%p, n:%d, method_:%X), method: %X", dpxy, n, method_, method);
@ -526,8 +557,8 @@ static void polymost_drawpoly(vec2f_t const * const dpxy, int32_t const n, int32
//update texcoords //update texcoords
vt->SetTexCoord( vt->SetTexCoord(
uu[i] * r * scale.x, uu[i] * r * scale.x - usub,
vv[i] * r * scale.y); vv[i] * r * scale.y - vsub);
//update verts //update verts
vt->SetVertex( vt->SetVertex(
@ -547,12 +578,10 @@ static void polymost_drawpoly(vec2f_t const * const dpxy, int32_t const n, int32
{ {
vec3d_t const bxtex = xtex, bytex = ytex, botex = otex; vec3d_t const bxtex = xtex, bytex = ytex, botex = otex;
xtex = xtex2, ytex = ytex2, otex = otex2; xtex = xtex2, ytex = ytex2, otex = otex2;
skyzbufferhack_pass++;
GLInterface.SetColorMask(false); GLInterface.SetColorMask(false);
polymost_drawpoly(dpxy, n, DAMETH_MASK, tilesize); GLInterface.Draw(DT_TRIANGLE_FAN, data.second, npoints);
GLInterface.SetColorMask(true); GLInterface.SetColorMask(true);
xtex = bxtex, ytex = bytex, otex = botex; xtex = bxtex, ytex = bytex, otex = botex;
skyzbufferhack_pass--;
} }
if (!success) if (!success)
@ -1921,7 +1950,7 @@ static void polymost_flatskyrender(vec2f_t const* const dpxy, int32_t const n, i
int y = ((int32_t)(((x0-ghalfx)*o.y)+fglobalang)>>(11-dapskybits)); int y = ((int32_t)(((x0-ghalfx)*o.y)+fglobalang)>>(11-dapskybits));
float fx = x0; float fx = x0;
if (playing_blood) method |= DAMETH_CLAMPED; // Hack to make Blood's skies show properly. skyclamphack = true; // Hack to make Blood's skies show properly.
do do
{ {
globalpicnum = dapskyoff[y&((1<<dapskybits)-1)]+ti; globalpicnum = dapskyoff[y&((1<<dapskybits)-1)]+ti;
@ -2047,6 +2076,7 @@ static void polymost_flatskyrender(vec2f_t const* const dpxy, int32_t const n, i
otex = otexbak, xtex = xtexbak, ytex = ytexbak; otex = otexbak, xtex = xtexbak, ytex = ytexbak;
} }
while (ti >= 0); while (ti >= 0);
skyclamphack = false;
globalpicnum = picnumbak; globalpicnum = picnumbak;