* Updated to ZDoom r3178:

- Apply kgsws-CZ's fixes:
  * Added new cvar, r_3dfloors for testing, so for example, you can see the FPS difference.
  * ds_p->bkup is not always allocated.
  * Fixed particles visible through 3D floors.
  * Fixed FAKE3D flag names.
* Fixed r_3dfloors.h and r_bsp.cpp to allow compilation.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1205 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2011-04-13 08:04:05 +00:00
parent 55f1ad0bb0
commit 555b9f552b
6 changed files with 21 additions and 16 deletions

View file

@ -1238,7 +1238,7 @@ void R_Subsector (subsector_t *sub)
) : NULL;
// kg3D - fake planes rendering
if (frontsector->e && frontsector->e->XFloor.ffloors.Size())
if (r_3dfloors && frontsector->e && frontsector->e->XFloor.ffloors.Size())
{
backupfp = floorplane;
backupcp = ceilingplane;
@ -1399,7 +1399,7 @@ void R_Subsector (subsector_t *sub)
if (!outersubsector || line->sidedef == NULL || !(line->sidedef->Flags & WALLF_POLYOBJ))
{
// kg3D - fake planes bounding calculation
if (line->backsector && frontsector->e && line->backsector->e->XFloor.ffloors.Size())
if (r_3dfloors && line->backsector && frontsector->e && line->backsector->e->XFloor.ffloors.Size())
{
backupfp = floorplane;
backupcp = ceilingplane;
@ -1423,11 +1423,11 @@ void R_Subsector (subsector_t *sub)
}
if (frontsector->CenterFloor() >= backsector->CenterFloor())
{
fake3D |= FAKE3D_DOWN2UP;
fake3D |= FAKE3D_CLIPBOTFRONT;
}
if (frontsector->CenterCeiling() <= backsector->CenterCeiling())
{
fake3D |= FAKE3D_16;
fake3D |= FAKE3D_CLIPTOPFRONT;
}
R_AddLine(line); // fake
}