zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-16 01:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Draw upper/lower textures on two-sided portal lines

Browse source
This commit is contained in:
Randy Heit 2016-04-29 21:54:29 -05:00
parent 09730bff73
commit a95c6b9644
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/r_bsp.cpp
View file

@ -575,7 +575,6 @@ void R_AddLine (seg_t *line)
return; return;
vertex_t *v1, *v2; vertex_t *v1, *v2;
v1 = line->linedef->v1; v1 = line->linedef->v1;
v2 = line->linedef->v2; v2 = line->linedef->v2;
@ -605,7 +604,7 @@ void R_AddLine (seg_t *line)
rw_havehigh = rw_havelow = false; rw_havehigh = rw_havelow = false;
// Single sided line? // Single sided line?
if (backsector == NULL || (line->linedef->isVisualPortal() && line->sidedef == line->linedef->sidedef[0])) if (backsector == NULL)
{ {
solid = true; solid = true;
} }
@ -636,8 +635,13 @@ void R_AddLine (seg_t *line)
WallMost (walllower, backsector->floorplane, &WallC); WallMost (walllower, backsector->floorplane, &WallC);
} }
// Portal
if (line->linedef->isVisualPortal() && line->sidedef == line->linedef->sidedef[0])
{
solid = true;
}
// Closed door. // Closed door.
if ((rw_backcz1 <= rw_frontfz1 && rw_backcz2 <= rw_frontfz2) || else if ((rw_backcz1 <= rw_frontfz1 && rw_backcz2 <= rw_frontfz2) ||
(rw_backfz1 >= rw_frontcz1 && rw_backfz2 >= rw_frontcz2)) (rw_backfz1 >= rw_frontcz1 && rw_backfz2 >= rw_frontcz2))
{ {
solid = true; solid = true;

17
src/r_segs.cpp
View file

@ -2016,9 +2016,9 @@ void R_NewWall (bool needlights)
midtexture = toptexture = bottomtexture = 0; midtexture = toptexture = bottomtexture = 0;
if (sidedef == linedef->sidedef[0] && if (sidedef == linedef->sidedef[0] &&
(linedef->isVisualPortal() || (linedef->special == Line_Mirror && r_drawmirrors))) // [ZZ] compatibility with r_drawmirrors cvar that existed way before portals (linedef->special == Line_Mirror && r_drawmirrors)) // [ZZ] compatibility with r_drawmirrors cvar that existed way before portals
{ {
markfloor = markceiling = true; // act like an one-sided wall here (todo: check how does this work with transparency) markfloor = markceiling = true; // act like a one-sided wall here (todo: check how does this work with transparency)
rw_markportal = true; rw_markportal = true;
} }
else if (backsector == NULL) else if (backsector == NULL)
@ -2027,7 +2027,11 @@ void R_NewWall (bool needlights)
// a single sided line is terminal, so it must mark ends // a single sided line is terminal, so it must mark ends
markfloor = markceiling = true; markfloor = markceiling = true;
// [RH] Horizon lines do not need to be textured // [RH] Horizon lines do not need to be textured
if (linedef->special != Line_Horizon) if (linedef->isVisualPortal())
{
rw_markportal = true;
}
else if (linedef->special != Line_Horizon)
{ {
midtexture = TexMan(sidedef->GetTexture(side_t::mid), true); midtexture = TexMan(sidedef->GetTexture(side_t::mid), true);
rw_offset_mid = FLOAT2FIXED(sidedef->GetTextureXOffset(side_t::mid)); rw_offset_mid = FLOAT2FIXED(sidedef->GetTextureXOffset(side_t::mid));
@ -2102,7 +2106,11 @@ void R_NewWall (bool needlights)
rw_frontlowertop = backsector->GetPlaneTexZ(sector_t::ceiling); rw_frontlowertop = backsector->GetPlaneTexZ(sector_t::ceiling);
} }
if ((rw_backcz1 <= rw_frontfz1 && rw_backcz2 <= rw_frontfz2) || if (linedef->isVisualPortal())
{
markceiling = markfloor = true;
}
else if ((rw_backcz1 <= rw_frontfz1 && rw_backcz2 <= rw_frontfz2) ||
(rw_backfz1 >= rw_frontcz1 && rw_backfz2 >= rw_frontcz2)) (rw_backfz1 >= rw_frontcz1 && rw_backfz2 >= rw_frontcz2))
{ {
// closed door // closed door
@ -2260,6 +2268,7 @@ void R_NewWall (bool needlights)
rw_bottomtexturemid += rowoffset; rw_bottomtexturemid += rowoffset;
} }
} }
rw_markportal = linedef->isVisualPortal();
} }
// if a floor / ceiling plane is on the wrong side of the view plane, // if a floor / ceiling plane is on the wrong side of the view plane,