mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-10 23:02:08 +00:00
- remove pointless code
This commit is contained in:
parent
b0cc472e85
commit
acf9f55849
2 changed files with 10 additions and 27 deletions
|
@ -559,7 +559,7 @@ namespace swrenderer
|
||||||
Thread->Portal->AddLinePortal(mLineSegment->linedef, draw_segment->x1, draw_segment->x2, draw_segment->sprtopclip, draw_segment->sprbottomclip);
|
Thread->Portal->AddLinePortal(mLineSegment->linedef, draw_segment->x1, draw_segment->x2, draw_segment->sprtopclip, draw_segment->sprbottomclip);
|
||||||
}
|
}
|
||||||
|
|
||||||
return m3DFloor.type == Fake3DOpaque::Normal;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SWRenderLine::ShouldMarkFloor() const
|
bool SWRenderLine::ShouldMarkFloor() const
|
||||||
|
|
|
@ -483,10 +483,6 @@ namespace swrenderer
|
||||||
int fll, cll, position;
|
int fll, cll, position;
|
||||||
FSectorPortal *portal;
|
FSectorPortal *portal;
|
||||||
|
|
||||||
// kg3D - fake floor stuff
|
|
||||||
VisiblePlane *backupfp;
|
|
||||||
VisiblePlane *backupcp;
|
|
||||||
//secplane_t templane;
|
|
||||||
lightlist_t *light;
|
lightlist_t *light;
|
||||||
|
|
||||||
if (InSubsector != nullptr)
|
if (InSubsector != nullptr)
|
||||||
|
@ -622,9 +618,6 @@ namespace swrenderer
|
||||||
// kg3D - fake planes rendering
|
// kg3D - fake planes rendering
|
||||||
if (r_3dfloors && frontsector->e && frontsector->e->XFloor.ffloors.Size())
|
if (r_3dfloors && frontsector->e && frontsector->e->XFloor.ffloors.Size())
|
||||||
{
|
{
|
||||||
backupfp = floorplane;
|
|
||||||
backupcp = ceilingplane;
|
|
||||||
|
|
||||||
Clip3DFloors *clip3d = Thread->Clip3D.get();
|
Clip3DFloors *clip3d = Thread->Clip3D.get();
|
||||||
|
|
||||||
// first check all floors
|
// first check all floors
|
||||||
|
@ -669,8 +662,7 @@ namespace swrenderer
|
||||||
floorlightlevel = *light->p_lightlevel;
|
floorlightlevel = *light->p_lightlevel;
|
||||||
}
|
}
|
||||||
|
|
||||||
ceilingplane = nullptr;
|
VisiblePlane *floorplane3d = Thread->PlaneList->FindPlane(frontsector->floorplane,
|
||||||
floorplane = Thread->PlaneList->FindPlane(frontsector->floorplane,
|
|
||||||
frontsector->GetTexture(sector_t::floor),
|
frontsector->GetTexture(sector_t::floor),
|
||||||
floorlightlevel + LightVisibility::ActualExtraLight(foggy, Thread->Viewport.get()), // killough 3/16/98
|
floorlightlevel + LightVisibility::ActualExtraLight(foggy, Thread->Viewport.get()), // killough 3/16/98
|
||||||
frontsector->GetAlpha(sector_t::floor),
|
frontsector->GetAlpha(sector_t::floor),
|
||||||
|
@ -682,10 +674,10 @@ namespace swrenderer
|
||||||
Fake3DOpaque::FakeFloor,
|
Fake3DOpaque::FakeFloor,
|
||||||
fakeAlpha);
|
fakeAlpha);
|
||||||
|
|
||||||
if (floorplane)
|
if (floorplane3d)
|
||||||
floorplane->AddLights(Thread, frontsector->lighthead);
|
floorplane3d->AddLights(Thread, frontsector->lighthead);
|
||||||
|
|
||||||
FakeDrawLoop(sub, floorplane, ceilingplane, foggy, basecolormap, Fake3DOpaque::FakeFloor);
|
FakeDrawLoop(sub, floorplane3d, nullptr, foggy, basecolormap, Fake3DOpaque::FakeFloor);
|
||||||
frontsector = sub->sector;
|
frontsector = sub->sector;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -735,8 +727,7 @@ namespace swrenderer
|
||||||
}
|
}
|
||||||
tempsec.ceilingplane.ChangeHeight(1 / 65536.);
|
tempsec.ceilingplane.ChangeHeight(1 / 65536.);
|
||||||
|
|
||||||
floorplane = nullptr;
|
VisiblePlane *ceilingplane3d = Thread->PlaneList->FindPlane(frontsector->ceilingplane, // killough 3/8/98
|
||||||
ceilingplane = Thread->PlaneList->FindPlane(frontsector->ceilingplane, // killough 3/8/98
|
|
||||||
frontsector->GetTexture(sector_t::ceiling),
|
frontsector->GetTexture(sector_t::ceiling),
|
||||||
ceilinglightlevel + LightVisibility::ActualExtraLight(foggy, Thread->Viewport.get()), // killough 4/11/98
|
ceilinglightlevel + LightVisibility::ActualExtraLight(foggy, Thread->Viewport.get()), // killough 4/11/98
|
||||||
frontsector->GetAlpha(sector_t::ceiling),
|
frontsector->GetAlpha(sector_t::ceiling),
|
||||||
|
@ -748,16 +739,14 @@ namespace swrenderer
|
||||||
Fake3DOpaque::FakeCeiling,
|
Fake3DOpaque::FakeCeiling,
|
||||||
fakeAlpha);
|
fakeAlpha);
|
||||||
|
|
||||||
if (ceilingplane)
|
if (ceilingplane3d)
|
||||||
ceilingplane->AddLights(Thread, frontsector->lighthead);
|
ceilingplane3d->AddLights(Thread, frontsector->lighthead);
|
||||||
|
|
||||||
FakeDrawLoop(sub, floorplane, ceilingplane, foggy, basecolormap, Fake3DOpaque::FakeCeiling);
|
FakeDrawLoop(sub, nullptr, ceilingplane3d, foggy, basecolormap, Fake3DOpaque::FakeCeiling);
|
||||||
frontsector = sub->sector;
|
frontsector = sub->sector;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
clip3d->fakeFloor = nullptr;
|
clip3d->fakeFloor = nullptr;
|
||||||
floorplane = backupfp;
|
|
||||||
ceilingplane = backupcp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
basecolormap = GetColorTable(frontsector->Colormap, frontsector->SpecialColors[sector_t::sprites], true);
|
basecolormap = GetColorTable(frontsector->Colormap, frontsector->SpecialColors[sector_t::sprites], true);
|
||||||
|
@ -801,10 +790,6 @@ namespace swrenderer
|
||||||
// kg3D - fake planes bounding calculation
|
// kg3D - fake planes bounding calculation
|
||||||
if (r_3dfloors && 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;
|
|
||||||
floorplane = nullptr;
|
|
||||||
ceilingplane = nullptr;
|
|
||||||
Clip3DFloors *clip3d = Thread->Clip3D.get();
|
Clip3DFloors *clip3d = Thread->Clip3D.get();
|
||||||
for (unsigned int i = 0; i < line->backsector->e->XFloor.ffloors.Size(); i++)
|
for (unsigned int i = 0; i < line->backsector->e->XFloor.ffloors.Size(); i++)
|
||||||
{
|
{
|
||||||
|
@ -821,11 +806,9 @@ namespace swrenderer
|
||||||
clip3d->fakeFloor->validcount = validcount;
|
clip3d->fakeFloor->validcount = validcount;
|
||||||
clip3d->NewClip();
|
clip3d->NewClip();
|
||||||
}
|
}
|
||||||
renderline.Render(line, InSubsector, frontsector, &tempsec, floorplane, ceilingplane, foggy, basecolormap, opaque3dfloor); // fake
|
renderline.Render(line, InSubsector, frontsector, &tempsec, nullptr, nullptr, foggy, basecolormap, opaque3dfloor); // fake
|
||||||
}
|
}
|
||||||
clip3d->fakeFloor = nullptr;
|
clip3d->fakeFloor = nullptr;
|
||||||
floorplane = backupfp;
|
|
||||||
ceilingplane = backupcp;
|
|
||||||
}
|
}
|
||||||
renderline.Render(line, InSubsector, frontsector, nullptr, floorplane, ceilingplane, foggy, basecolormap, Fake3DOpaque::Normal); // now real
|
renderline.Render(line, InSubsector, frontsector, nullptr, floorplane, ceilingplane, foggy, basecolormap, Fake3DOpaque::Normal); // now real
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue