mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-13 16:07:55 +00:00
Move portal drawing to r_portal
This commit is contained in:
Magnus Norddahl
parent
60c0dcc3c7
commit
41d0e7c663
10 changed files with 569 additions and 503 deletions
|
|
@ -824,6 +824,7 @@ set( FASTMATH_PCH_SOURCES
|
||||||
swrenderer/scene/r_clip_segment.cpp
|
swrenderer/scene/r_clip_segment.cpp
|
||||||
swrenderer/scene/r_draw_segment.cpp
|
swrenderer/scene/r_draw_segment.cpp
|
||||||
swrenderer/scene/r_portal_segment.cpp
|
swrenderer/scene/r_portal_segment.cpp
|
||||||
|
swrenderer/scene/r_portal.cpp
|
||||||
polyrenderer/poly_renderer.cpp
|
polyrenderer/poly_renderer.cpp
|
||||||
polyrenderer/scene/poly_scene.cpp
|
polyrenderer/scene/poly_scene.cpp
|
||||||
polyrenderer/scene/poly_portal.cpp
|
polyrenderer/scene/poly_portal.cpp
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,8 @@ extern unsigned int R_OldBlend;
|
||||||
|
|
||||||
const double r_Yaspect = 200.0; // Why did I make this a variable? It's never set anywhere.
|
const double r_Yaspect = 200.0; // Why did I make this a variable? It's never set anywhere.
|
||||||
|
|
||||||
|
extern bool r_showviewer;
|
||||||
|
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
//
|
//
|
||||||
// R_PointOnSide
|
// R_PointOnSide
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,7 @@
|
||||||
#include "scene/r_clip_segment.h"
|
#include "scene/r_clip_segment.h"
|
||||||
#include "scene/r_segs.h"
|
#include "scene/r_segs.h"
|
||||||
#include "scene/r_3dfloors.h"
|
#include "scene/r_3dfloors.h"
|
||||||
|
#include "scene/r_portal.h"
|
||||||
#include "r_sky.h"
|
#include "r_sky.h"
|
||||||
#include "drawers/r_draw_rgba.h"
|
#include "drawers/r_draw_rgba.h"
|
||||||
#include "st_stuff.h"
|
#include "st_stuff.h"
|
||||||
|
|
@ -70,16 +71,8 @@
|
||||||
CVAR (String, r_viewsize, "", CVAR_NOSET)
|
CVAR (String, r_viewsize, "", CVAR_NOSET)
|
||||||
CVAR (Bool, r_shadercolormaps, true, CVAR_ARCHIVE)
|
CVAR (Bool, r_shadercolormaps, true, CVAR_ARCHIVE)
|
||||||
|
|
||||||
CVAR(Int, r_portal_recursions, 4, CVAR_ARCHIVE)
|
|
||||||
CVAR(Bool, r_highlight_portals, false, CVAR_ARCHIVE)
|
|
||||||
|
|
||||||
EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor)
|
EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor)
|
||||||
|
|
||||||
extern cycle_t WallCycles, PlaneCycles, MaskedCycles, WallScanCycles;
|
|
||||||
extern cycle_t FrameCycles;
|
|
||||||
|
|
||||||
extern bool r_showviewer;
|
|
||||||
|
|
||||||
namespace swrenderer
|
namespace swrenderer
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
@ -539,245 +532,6 @@ void R_SetupFreelook()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//==========================================================================
|
|
||||||
//
|
|
||||||
// R_EnterPortal
|
|
||||||
//
|
|
||||||
// [RH] Draw the reflection inside a mirror
|
|
||||||
// [ZZ] Merged with portal code, originally called R_EnterMirror
|
|
||||||
//
|
|
||||||
//==========================================================================
|
|
||||||
|
|
||||||
void R_HighlightPortal (PortalDrawseg* pds)
|
|
||||||
{
|
|
||||||
// [ZZ] NO OVERFLOW CHECKS HERE
|
|
||||||
// I believe it won't break. if it does, blame me. :(
|
|
||||||
|
|
||||||
if (r_swtruecolor) // Assuming this is just a debug function
|
|
||||||
return;
|
|
||||||
|
|
||||||
BYTE color = (BYTE)BestColor((DWORD *)GPalette.BaseColors, 255, 0, 0, 0, 255);
|
|
||||||
|
|
||||||
BYTE* pixels = RenderTarget->GetBuffer();
|
|
||||||
// top edge
|
|
||||||
for (int x = pds->x1; x < pds->x2; x++)
|
|
||||||
{
|
|
||||||
if (x < 0 || x >= RenderTarget->GetWidth())
|
|
||||||
continue;
|
|
||||||
|
|
||||||
int p = x - pds->x1;
|
|
||||||
int Ytop = pds->ceilingclip[p];
|
|
||||||
int Ybottom = pds->floorclip[p];
|
|
||||||
|
|
||||||
if (x == pds->x1 || x == pds->x2-1)
|
|
||||||
{
|
|
||||||
RenderTarget->DrawLine(x, Ytop, x, Ybottom+1, color, 0);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
int YtopPrev = pds->ceilingclip[p-1];
|
|
||||||
int YbottomPrev = pds->floorclip[p-1];
|
|
||||||
|
|
||||||
if (abs(Ytop-YtopPrev) > 1)
|
|
||||||
RenderTarget->DrawLine(x, YtopPrev, x, Ytop, color, 0);
|
|
||||||
else *(pixels + Ytop * RenderTarget->GetPitch() + x) = color;
|
|
||||||
|
|
||||||
if (abs(Ybottom-YbottomPrev) > 1)
|
|
||||||
RenderTarget->DrawLine(x, YbottomPrev, x, Ybottom, color, 0);
|
|
||||||
else *(pixels + Ybottom * RenderTarget->GetPitch() + x) = color;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void R_EnterPortal (PortalDrawseg* pds, int depth)
|
|
||||||
{
|
|
||||||
// [ZZ] check depth. fill portal with black if it's exceeding the visual recursion limit, and continue like nothing happened.
|
|
||||||
if (depth >= r_portal_recursions)
|
|
||||||
{
|
|
||||||
BYTE color = (BYTE)BestColor((DWORD *)GPalette.BaseColors, 0, 0, 0, 0, 255);
|
|
||||||
int spacing = RenderTarget->GetPitch();
|
|
||||||
for (int x = pds->x1; x < pds->x2; x++)
|
|
||||||
{
|
|
||||||
if (x < 0 || x >= RenderTarget->GetWidth())
|
|
||||||
continue;
|
|
||||||
|
|
||||||
int Ytop = pds->ceilingclip[x-pds->x1];
|
|
||||||
int Ybottom = pds->floorclip[x-pds->x1];
|
|
||||||
|
|
||||||
if (r_swtruecolor)
|
|
||||||
{
|
|
||||||
uint32_t *dest = (uint32_t*)RenderTarget->GetBuffer() + x + Ytop * spacing;
|
|
||||||
|
|
||||||
uint32_t c = GPalette.BaseColors[color].d;
|
|
||||||
for (int y = Ytop; y <= Ybottom; y++)
|
|
||||||
{
|
|
||||||
*dest = c;
|
|
||||||
dest += spacing;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
BYTE *dest = RenderTarget->GetBuffer() + x + Ytop * spacing;
|
|
||||||
|
|
||||||
for (int y = Ytop; y <= Ybottom; y++)
|
|
||||||
{
|
|
||||||
*dest = color;
|
|
||||||
dest += spacing;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (r_highlight_portals)
|
|
||||||
R_HighlightPortal(pds);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
DAngle startang = ViewAngle;
|
|
||||||
DVector3 startpos = ViewPos;
|
|
||||||
DVector3 savedpath[2] = { ViewPath[0], ViewPath[1] };
|
|
||||||
ActorRenderFlags savedvisibility = camera? camera->renderflags & RF_INVISIBLE : ActorRenderFlags::FromInt(0);
|
|
||||||
|
|
||||||
CurrentPortalUniq++;
|
|
||||||
|
|
||||||
unsigned int portalsAtStart = WallPortals.Size ();
|
|
||||||
|
|
||||||
if (pds->mirror)
|
|
||||||
{
|
|
||||||
//vertex_t *v1 = ds->curline->v1;
|
|
||||||
vertex_t *v1 = pds->src->v1;
|
|
||||||
|
|
||||||
// Reflect the current view behind the mirror.
|
|
||||||
if (pds->src->Delta().X == 0)
|
|
||||||
{ // vertical mirror
|
|
||||||
ViewPos.X = v1->fX() - startpos.X + v1->fX();
|
|
||||||
}
|
|
||||||
else if (pds->src->Delta().Y == 0)
|
|
||||||
{ // horizontal mirror
|
|
||||||
ViewPos.Y = v1->fY() - startpos.Y + v1->fY();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{ // any mirror
|
|
||||||
vertex_t *v2 = pds->src->v2;
|
|
||||||
|
|
||||||
double dx = v2->fX() - v1->fX();
|
|
||||||
double dy = v2->fY() - v1->fY();
|
|
||||||
double x1 = v1->fX();
|
|
||||||
double y1 = v1->fY();
|
|
||||||
double x = startpos.X;
|
|
||||||
double y = startpos.Y;
|
|
||||||
|
|
||||||
// the above two cases catch len == 0
|
|
||||||
double r = ((x - x1)*dx + (y - y1)*dy) / (dx*dx + dy*dy);
|
|
||||||
|
|
||||||
ViewPos.X = (x1 + r * dx)*2 - x;
|
|
||||||
ViewPos.Y = (y1 + r * dy)*2 - y;
|
|
||||||
}
|
|
||||||
ViewAngle = pds->src->Delta().Angle() * 2 - startang;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
P_TranslatePortalXY(pds->src, ViewPos.X, ViewPos.Y);
|
|
||||||
P_TranslatePortalZ(pds->src, ViewPos.Z);
|
|
||||||
P_TranslatePortalAngle(pds->src, ViewAngle);
|
|
||||||
P_TranslatePortalXY(pds->src, ViewPath[0].X, ViewPath[0].Y);
|
|
||||||
P_TranslatePortalXY(pds->src, ViewPath[1].X, ViewPath[1].Y);
|
|
||||||
|
|
||||||
if (!r_showviewer && camera && P_PointOnLineSidePrecise(ViewPath[0], pds->dst) != P_PointOnLineSidePrecise(ViewPath[1], pds->dst))
|
|
||||||
{
|
|
||||||
double distp = (ViewPath[0] - ViewPath[1]).Length();
|
|
||||||
if (distp > EQUAL_EPSILON)
|
|
||||||
{
|
|
||||||
double dist1 = (ViewPos - ViewPath[0]).Length();
|
|
||||||
double dist2 = (ViewPos - ViewPath[1]).Length();
|
|
||||||
|
|
||||||
if (dist1 + dist2 < distp + 1)
|
|
||||||
{
|
|
||||||
camera->renderflags |= RF_INVISIBLE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ViewSin = ViewAngle.Sin();
|
|
||||||
ViewCos = ViewAngle.Cos();
|
|
||||||
|
|
||||||
ViewTanSin = FocalTangent * ViewSin;
|
|
||||||
ViewTanCos = FocalTangent * ViewCos;
|
|
||||||
|
|
||||||
R_CopyStackedViewParameters();
|
|
||||||
|
|
||||||
validcount++;
|
|
||||||
PortalDrawseg* prevpds = CurrentPortal;
|
|
||||||
CurrentPortal = pds;
|
|
||||||
|
|
||||||
R_ClearPlanes (false);
|
|
||||||
R_ClearClipSegs (pds->x1, pds->x2);
|
|
||||||
|
|
||||||
WindowLeft = pds->x1;
|
|
||||||
WindowRight = pds->x2;
|
|
||||||
|
|
||||||
// RF_XFLIP should be removed before calling the root function
|
|
||||||
int prevmf = MirrorFlags;
|
|
||||||
if (pds->mirror)
|
|
||||||
{
|
|
||||||
if (MirrorFlags & RF_XFLIP)
|
|
||||||
MirrorFlags &= ~RF_XFLIP;
|
|
||||||
else MirrorFlags |= RF_XFLIP;
|
|
||||||
}
|
|
||||||
|
|
||||||
// some portals have height differences, account for this here
|
|
||||||
R_3D_EnterSkybox(); // push 3D floor height map
|
|
||||||
CurrentPortalInSkybox = false; // first portal in a skybox should set this variable to false for proper clipping in skyboxes.
|
|
||||||
|
|
||||||
// first pass, set clipping
|
|
||||||
memcpy (ceilingclip + pds->x1, &pds->ceilingclip[0], pds->len*sizeof(*ceilingclip));
|
|
||||||
memcpy (floorclip + pds->x1, &pds->floorclip[0], pds->len*sizeof(*floorclip));
|
|
||||||
|
|
||||||
InSubsector = NULL;
|
|
||||||
R_RenderBSPNode (nodes + numnodes - 1);
|
|
||||||
R_3D_ResetClip(); // reset clips (floor/ceiling)
|
|
||||||
if (!savedvisibility && camera) camera->renderflags &= ~RF_INVISIBLE;
|
|
||||||
|
|
||||||
PlaneCycles.Clock();
|
|
||||||
R_DrawPlanes ();
|
|
||||||
R_DrawPortals ();
|
|
||||||
PlaneCycles.Unclock();
|
|
||||||
|
|
||||||
double vzp = ViewPos.Z;
|
|
||||||
|
|
||||||
int prevuniq = CurrentPortalUniq;
|
|
||||||
// depth check is in another place right now
|
|
||||||
unsigned int portalsAtEnd = WallPortals.Size ();
|
|
||||||
for (; portalsAtStart < portalsAtEnd; portalsAtStart++)
|
|
||||||
{
|
|
||||||
R_EnterPortal (&WallPortals[portalsAtStart], depth + 1);
|
|
||||||
}
|
|
||||||
int prevuniq2 = CurrentPortalUniq;
|
|
||||||
CurrentPortalUniq = prevuniq;
|
|
||||||
|
|
||||||
NetUpdate();
|
|
||||||
|
|
||||||
MaskedCycles.Clock(); // [ZZ] count sprites in portals/mirrors along with normal ones.
|
|
||||||
R_DrawMasked (); // this is required since with portals there often will be cases when more than 80% of the view is inside a portal.
|
|
||||||
MaskedCycles.Unclock();
|
|
||||||
|
|
||||||
NetUpdate();
|
|
||||||
|
|
||||||
R_3D_LeaveSkybox(); // pop 3D floor height map
|
|
||||||
CurrentPortalUniq = prevuniq2;
|
|
||||||
|
|
||||||
// draw a red line around a portal if it's being highlighted
|
|
||||||
if (r_highlight_portals)
|
|
||||||
R_HighlightPortal(pds);
|
|
||||||
|
|
||||||
CurrentPortal = prevpds;
|
|
||||||
MirrorFlags = prevmf;
|
|
||||||
ViewAngle = startang;
|
|
||||||
ViewPos = startpos;
|
|
||||||
ViewPath[0] = savedpath[0];
|
|
||||||
ViewPath[1] = savedpath[1];
|
|
||||||
}
|
|
||||||
|
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
//
|
//
|
||||||
// R_SetupBuffer
|
// R_SetupBuffer
|
||||||
|
|
@ -889,16 +643,7 @@ void R_RenderActorView (AActor *actor, bool dontmaplines)
|
||||||
R_DrawPortals();
|
R_DrawPortals();
|
||||||
PlaneCycles.Unclock();
|
PlaneCycles.Unclock();
|
||||||
|
|
||||||
// [RH] Walk through mirrors
|
R_DrawWallPortals();
|
||||||
// [ZZ] Merged with portals
|
|
||||||
size_t lastportal = WallPortals.Size();
|
|
||||||
for (unsigned int i = 0; i < lastportal; i++)
|
|
||||||
{
|
|
||||||
R_EnterPortal(&WallPortals[i], 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
CurrentPortal = NULL;
|
|
||||||
CurrentPortalUniq = 0;
|
|
||||||
|
|
||||||
NetUpdate ();
|
NetUpdate ();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,9 +35,13 @@ extern int viewwindowy;
|
||||||
|
|
||||||
typedef BYTE lighttable_t; // This could be wider for >8 bit display.
|
typedef BYTE lighttable_t; // This could be wider for >8 bit display.
|
||||||
|
|
||||||
|
extern cycle_t FrameCycles;
|
||||||
|
|
||||||
namespace swrenderer
|
namespace swrenderer
|
||||||
{
|
{
|
||||||
|
|
||||||
|
extern cycle_t WallCycles, PlaneCycles, MaskedCycles, WallScanCycles;
|
||||||
|
|
||||||
//
|
//
|
||||||
// POV related.
|
// POV related.
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,8 @@ enum
|
||||||
FAKED_AboveCeiling
|
FAKED_AboveCeiling
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extern subsector_t *InSubsector;
|
||||||
|
|
||||||
extern seg_t* curline;
|
extern seg_t* curline;
|
||||||
extern side_t* sidedef;
|
extern side_t* sidedef;
|
||||||
extern line_t* linedef;
|
extern line_t* linedef;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "r_bsp.h"
|
||||||
|
|
||||||
namespace swrenderer
|
namespace swrenderer
|
||||||
{
|
{
|
||||||
struct drawseg_t
|
struct drawseg_t
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,6 @@
|
||||||
|
|
||||||
CVAR(Bool, r_linearsky, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
|
CVAR(Bool, r_linearsky, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
|
||||||
CVAR(Bool, tilt, false, 0);
|
CVAR(Bool, tilt, false, 0);
|
||||||
CVAR(Bool, r_skyboxes, true, 0)
|
|
||||||
|
|
||||||
EXTERN_CVAR(Int, r_skymode)
|
EXTERN_CVAR(Int, r_skymode)
|
||||||
|
|
||||||
|
|
@ -90,16 +89,10 @@ static void R_DrawSkyStriped (visplane_t *pl);
|
||||||
planefunction_t floorfunc;
|
planefunction_t floorfunc;
|
||||||
planefunction_t ceilingfunc;
|
planefunction_t ceilingfunc;
|
||||||
|
|
||||||
// Here comes the obnoxious "visplane".
|
|
||||||
#define MAXVISPLANES 128 /* must be a power of 2 */
|
|
||||||
|
|
||||||
// Avoid infinite recursion with stacked sectors by limiting them.
|
|
||||||
#define MAX_SKYBOX_PLANES 1000
|
|
||||||
|
|
||||||
// [RH] Allocate one extra for sky box planes.
|
// [RH] Allocate one extra for sky box planes.
|
||||||
static visplane_t *visplanes[MAXVISPLANES+1]; // killough
|
visplane_t *visplanes[MAXVISPLANES+1];
|
||||||
static visplane_t *freetail; // killough
|
visplane_t *freetail;
|
||||||
static visplane_t **freehead = &freetail; // killough
|
visplane_t **freehead = &freetail;
|
||||||
|
|
||||||
visplane_t *floorplane;
|
visplane_t *floorplane;
|
||||||
visplane_t *ceilingplane;
|
visplane_t *ceilingplane;
|
||||||
|
|
@ -1300,241 +1293,6 @@ void R_DrawSinglePlane (visplane_t *pl, fixed_t alpha, bool additive, bool maske
|
||||||
NetUpdate ();
|
NetUpdate ();
|
||||||
}
|
}
|
||||||
|
|
||||||
//==========================================================================
|
|
||||||
//
|
|
||||||
// R_DrawPortals
|
|
||||||
//
|
|
||||||
// Draws any recorded sky boxes and then frees them.
|
|
||||||
//
|
|
||||||
// The process:
|
|
||||||
// 1. Move the camera to coincide with the SkyViewpoint.
|
|
||||||
// 2. Clear out the old planes. (They have already been drawn.)
|
|
||||||
// 3. Clear a window out of the ClipSegs just large enough for the plane.
|
|
||||||
// 4. Pretend the existing vissprites and drawsegs aren't there.
|
|
||||||
// 5. Create a drawseg at 0 distance to clip sprites to the visplane. It
|
|
||||||
// doesn't need to be associated with a line in the map, since there
|
|
||||||
// will never be any sprites in front of it.
|
|
||||||
// 6. Render the BSP, then planes, then masked stuff.
|
|
||||||
// 7. Restore the previous vissprites and drawsegs.
|
|
||||||
// 8. Repeat for any other sky boxes.
|
|
||||||
// 9. Put the camera back where it was to begin with.
|
|
||||||
//
|
|
||||||
//==========================================================================
|
|
||||||
static int numskyboxes;
|
|
||||||
|
|
||||||
void R_DrawPortals ()
|
|
||||||
{
|
|
||||||
static TArray<size_t> interestingStack;
|
|
||||||
static TArray<ptrdiff_t> drawsegStack;
|
|
||||||
static TArray<ptrdiff_t> visspriteStack;
|
|
||||||
static TArray<DVector3> viewposStack;
|
|
||||||
static TArray<visplane_t *> visplaneStack;
|
|
||||||
|
|
||||||
numskyboxes = 0;
|
|
||||||
|
|
||||||
if (visplanes[MAXVISPLANES] == NULL)
|
|
||||||
return;
|
|
||||||
|
|
||||||
R_3D_EnterSkybox();
|
|
||||||
CurrentPortalInSkybox = true;
|
|
||||||
|
|
||||||
int savedextralight = extralight;
|
|
||||||
DVector3 savedpos = ViewPos;
|
|
||||||
DAngle savedangle = ViewAngle;
|
|
||||||
ptrdiff_t savedvissprite_p = vissprite_p - vissprites;
|
|
||||||
ptrdiff_t savedds_p = ds_p - drawsegs;
|
|
||||||
size_t savedinteresting = FirstInterestingDrawseg;
|
|
||||||
double savedvisibility = R_GetVisibility();
|
|
||||||
AActor *savedcamera = camera;
|
|
||||||
sector_t *savedsector = viewsector;
|
|
||||||
|
|
||||||
int i;
|
|
||||||
visplane_t *pl;
|
|
||||||
|
|
||||||
for (pl = visplanes[MAXVISPLANES]; pl != NULL; pl = visplanes[MAXVISPLANES])
|
|
||||||
{
|
|
||||||
// Pop the visplane off the list now so that if this skybox adds more
|
|
||||||
// skyboxes to the list, they will be drawn instead of skipped (because
|
|
||||||
// new skyboxes go to the beginning of the list instead of the end).
|
|
||||||
visplanes[MAXVISPLANES] = pl->next;
|
|
||||||
pl->next = NULL;
|
|
||||||
|
|
||||||
if (pl->right < pl->left || !r_skyboxes || numskyboxes == MAX_SKYBOX_PLANES || pl->portal == NULL)
|
|
||||||
{
|
|
||||||
R_DrawSinglePlane (pl, OPAQUE, false, false);
|
|
||||||
*freehead = pl;
|
|
||||||
freehead = &pl->next;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
numskyboxes++;
|
|
||||||
|
|
||||||
FSectorPortal *port = pl->portal;
|
|
||||||
switch (port->mType)
|
|
||||||
{
|
|
||||||
case PORTS_SKYVIEWPOINT:
|
|
||||||
{
|
|
||||||
// Don't let gun flashes brighten the sky box
|
|
||||||
ASkyViewpoint *sky = barrier_cast<ASkyViewpoint*>(port->mSkybox);
|
|
||||||
extralight = 0;
|
|
||||||
R_SetVisibility(sky->args[0] * 0.25f);
|
|
||||||
|
|
||||||
ViewPos = sky->InterpolatedPosition(r_TicFracF);
|
|
||||||
ViewAngle = savedangle + (sky->PrevAngles.Yaw + deltaangle(sky->PrevAngles.Yaw, sky->Angles.Yaw) * r_TicFracF);
|
|
||||||
|
|
||||||
R_CopyStackedViewParameters();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case PORTS_STACKEDSECTORTHING:
|
|
||||||
case PORTS_PORTAL:
|
|
||||||
case PORTS_LINKEDPORTAL:
|
|
||||||
extralight = pl->extralight;
|
|
||||||
R_SetVisibility (pl->visibility);
|
|
||||||
ViewPos.X = pl->viewpos.X + port->mDisplacement.X;
|
|
||||||
ViewPos.Y = pl->viewpos.Y + port->mDisplacement.Y;
|
|
||||||
ViewPos.Z = pl->viewpos.Z;
|
|
||||||
ViewAngle = pl->viewangle;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case PORTS_HORIZON:
|
|
||||||
case PORTS_PLANE:
|
|
||||||
// not implemented yet
|
|
||||||
|
|
||||||
default:
|
|
||||||
R_DrawSinglePlane(pl, OPAQUE, false, false);
|
|
||||||
*freehead = pl;
|
|
||||||
freehead = &pl->next;
|
|
||||||
numskyboxes--;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
port->mFlags |= PORTSF_INSKYBOX;
|
|
||||||
if (port->mPartner > 0) sectorPortals[port->mPartner].mFlags |= PORTSF_INSKYBOX;
|
|
||||||
camera = NULL;
|
|
||||||
viewsector = port->mDestination;
|
|
||||||
assert(viewsector != NULL);
|
|
||||||
R_SetViewAngle ();
|
|
||||||
validcount++; // Make sure we see all sprites
|
|
||||||
|
|
||||||
R_ClearPlanes (false);
|
|
||||||
R_ClearClipSegs (pl->left, pl->right);
|
|
||||||
WindowLeft = pl->left;
|
|
||||||
WindowRight = pl->right;
|
|
||||||
|
|
||||||
for (i = pl->left; i < pl->right; i++)
|
|
||||||
{
|
|
||||||
if (pl->top[i] == 0x7fff)
|
|
||||||
{
|
|
||||||
ceilingclip[i] = viewheight;
|
|
||||||
floorclip[i] = -1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ceilingclip[i] = pl->top[i];
|
|
||||||
floorclip[i] = pl->bottom[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a drawseg to clip sprites to the sky plane
|
|
||||||
drawseg_t *draw_segment = R_AddDrawSegment();
|
|
||||||
draw_segment->CurrentPortalUniq = CurrentPortalUniq;
|
|
||||||
draw_segment->siz1 = INT_MAX;
|
|
||||||
draw_segment->siz2 = INT_MAX;
|
|
||||||
draw_segment->sz1 = 0;
|
|
||||||
draw_segment->sz2 = 0;
|
|
||||||
draw_segment->x1 = pl->left;
|
|
||||||
draw_segment->x2 = pl->right;
|
|
||||||
draw_segment->silhouette = SIL_BOTH;
|
|
||||||
draw_segment->sprbottomclip = R_NewOpening (pl->right - pl->left);
|
|
||||||
draw_segment->sprtopclip = R_NewOpening (pl->right - pl->left);
|
|
||||||
draw_segment->maskedtexturecol = ds_p->swall = -1;
|
|
||||||
draw_segment->bFogBoundary = false;
|
|
||||||
draw_segment->curline = NULL;
|
|
||||||
draw_segment->fake = 0;
|
|
||||||
memcpy (openings + draw_segment->sprbottomclip, floorclip + pl->left, (pl->right - pl->left)*sizeof(short));
|
|
||||||
memcpy (openings + draw_segment->sprtopclip, ceilingclip + pl->left, (pl->right - pl->left)*sizeof(short));
|
|
||||||
|
|
||||||
firstvissprite = vissprite_p;
|
|
||||||
firstdrawseg = draw_segment;
|
|
||||||
FirstInterestingDrawseg = InterestingDrawsegs.Size();
|
|
||||||
|
|
||||||
interestingStack.Push (FirstInterestingDrawseg);
|
|
||||||
ptrdiff_t diffnum = firstdrawseg - drawsegs;
|
|
||||||
drawsegStack.Push (diffnum);
|
|
||||||
diffnum = firstvissprite - vissprites;
|
|
||||||
visspriteStack.Push (diffnum);
|
|
||||||
viewposStack.Push(ViewPos);
|
|
||||||
visplaneStack.Push (pl);
|
|
||||||
|
|
||||||
InSubsector = NULL;
|
|
||||||
R_RenderBSPNode (nodes + numnodes - 1);
|
|
||||||
R_3D_ResetClip(); // reset clips (floor/ceiling)
|
|
||||||
R_DrawPlanes ();
|
|
||||||
|
|
||||||
port->mFlags &= ~PORTSF_INSKYBOX;
|
|
||||||
if (port->mPartner > 0) sectorPortals[port->mPartner].mFlags &= ~PORTSF_INSKYBOX;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Draw all the masked textures in a second pass, in the reverse order they
|
|
||||||
// were added. This must be done separately from the previous step for the
|
|
||||||
// sake of nested skyboxes.
|
|
||||||
while (interestingStack.Pop (FirstInterestingDrawseg))
|
|
||||||
{
|
|
||||||
ptrdiff_t pd = 0;
|
|
||||||
|
|
||||||
drawsegStack.Pop (pd);
|
|
||||||
firstdrawseg = drawsegs + pd;
|
|
||||||
visspriteStack.Pop (pd);
|
|
||||||
firstvissprite = vissprites + pd;
|
|
||||||
|
|
||||||
// Masked textures and planes need the view coordinates restored for proper positioning.
|
|
||||||
viewposStack.Pop(ViewPos);
|
|
||||||
|
|
||||||
R_DrawMasked ();
|
|
||||||
|
|
||||||
ds_p = firstdrawseg;
|
|
||||||
vissprite_p = firstvissprite;
|
|
||||||
|
|
||||||
visplaneStack.Pop (pl);
|
|
||||||
if (pl->Alpha > 0 && pl->picnum != skyflatnum)
|
|
||||||
{
|
|
||||||
R_DrawSinglePlane (pl, pl->Alpha, pl->Additive, true);
|
|
||||||
}
|
|
||||||
*freehead = pl;
|
|
||||||
freehead = &pl->next;
|
|
||||||
}
|
|
||||||
firstvissprite = vissprites;
|
|
||||||
vissprite_p = vissprites + savedvissprite_p;
|
|
||||||
firstdrawseg = drawsegs;
|
|
||||||
ds_p = drawsegs + savedds_p;
|
|
||||||
InterestingDrawsegs.Resize ((unsigned int)FirstInterestingDrawseg);
|
|
||||||
FirstInterestingDrawseg = savedinteresting;
|
|
||||||
|
|
||||||
camera = savedcamera;
|
|
||||||
viewsector = savedsector;
|
|
||||||
ViewPos = savedpos;
|
|
||||||
R_SetVisibility(savedvisibility);
|
|
||||||
extralight = savedextralight;
|
|
||||||
ViewAngle = savedangle;
|
|
||||||
R_SetViewAngle ();
|
|
||||||
|
|
||||||
CurrentPortalInSkybox = false;
|
|
||||||
R_3D_LeaveSkybox();
|
|
||||||
|
|
||||||
if(fakeActive) return;
|
|
||||||
|
|
||||||
for (*freehead = visplanes[MAXVISPLANES], visplanes[MAXVISPLANES] = NULL; *freehead; )
|
|
||||||
freehead = &(*freehead)->next;
|
|
||||||
}
|
|
||||||
|
|
||||||
ADD_STAT(skyboxes)
|
|
||||||
{
|
|
||||||
FString out;
|
|
||||||
out.Format ("%d skybox planes", numskyboxes);
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
//
|
//
|
||||||
// R_DrawSkyPlane
|
// R_DrawSkyPlane
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ void R_ClearPlanes (bool fullclear);
|
||||||
void R_AddPlaneLights(visplane_t *plane, FLightNode *light_head);
|
void R_AddPlaneLights(visplane_t *plane, FLightNode *light_head);
|
||||||
|
|
||||||
int R_DrawPlanes ();
|
int R_DrawPlanes ();
|
||||||
void R_DrawPortals ();
|
void R_DrawSinglePlane(visplane_t *pl, fixed_t alpha, bool additive, bool masked);
|
||||||
void R_DrawSkyPlane (visplane_t *pl);
|
void R_DrawSkyPlane (visplane_t *pl);
|
||||||
void R_DrawNormalPlane (visplane_t *pl, double xscale, double yscale, fixed_t alpha, bool additive, bool masked);
|
void R_DrawNormalPlane (visplane_t *pl, double xscale, double yscale, fixed_t alpha, bool additive, bool masked);
|
||||||
void R_DrawTiltedPlane (visplane_t *pl, double xscale, double yscale, fixed_t alpha, bool additive, bool masked);
|
void R_DrawTiltedPlane (visplane_t *pl, double xscale, double yscale, fixed_t alpha, bool additive, bool masked);
|
||||||
|
|
@ -128,6 +128,12 @@ bool R_PlaneInitData (void);
|
||||||
extern visplane_t* floorplane;
|
extern visplane_t* floorplane;
|
||||||
extern visplane_t* ceilingplane;
|
extern visplane_t* ceilingplane;
|
||||||
|
|
||||||
|
#define MAXVISPLANES 128 /* must be a power of 2 */
|
||||||
|
|
||||||
|
extern visplane_t *visplanes[MAXVISPLANES + 1];
|
||||||
|
extern visplane_t *freetail;
|
||||||
|
extern visplane_t **freehead;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // __R_PLANE_H__
|
#endif // __R_PLANE_H__
|
||||||
|
|
|
||||||
534
src/swrenderer/scene/r_portal.cpp
Normal file
534
src/swrenderer/scene/r_portal.cpp
Normal file
|
|
@ -0,0 +1,534 @@
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
|
#include "templates.h"
|
||||||
|
#include "doomdef.h"
|
||||||
|
#include "d_net.h"
|
||||||
|
#include "doomstat.h"
|
||||||
|
#include "m_random.h"
|
||||||
|
#include "m_bbox.h"
|
||||||
|
#include "r_portal.h"
|
||||||
|
#include "r_sky.h"
|
||||||
|
#include "st_stuff.h"
|
||||||
|
#include "c_cvars.h"
|
||||||
|
#include "c_dispatch.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
#include "stats.h"
|
||||||
|
#include "i_video.h"
|
||||||
|
#include "i_system.h"
|
||||||
|
#include "a_sharedglobal.h"
|
||||||
|
#include "r_data/r_translate.h"
|
||||||
|
#include "p_3dmidtex.h"
|
||||||
|
#include "r_data/r_interpolate.h"
|
||||||
|
#include "v_palette.h"
|
||||||
|
#include "po_man.h"
|
||||||
|
#include "p_effect.h"
|
||||||
|
#include "st_start.h"
|
||||||
|
#include "v_font.h"
|
||||||
|
#include "r_data/colormaps.h"
|
||||||
|
#include "p_maputl.h"
|
||||||
|
#include "p_setup.h"
|
||||||
|
#include "version.h"
|
||||||
|
#include "swrenderer/drawers/r_draw_rgba.h"
|
||||||
|
#include "r_utility.h"
|
||||||
|
#include "r_plane.h"
|
||||||
|
#include "r_clip_segment.h"
|
||||||
|
#include "r_draw_segment.h"
|
||||||
|
#include "r_things.h"
|
||||||
|
#include "r_3dfloors.h"
|
||||||
|
#include "swrenderer/r_main.h"
|
||||||
|
#include "swrenderer/r_memory.h"
|
||||||
|
|
||||||
|
CVAR(Int, r_portal_recursions, 4, CVAR_ARCHIVE)
|
||||||
|
CVAR(Bool, r_highlight_portals, false, CVAR_ARCHIVE)
|
||||||
|
CVAR(Bool, r_skyboxes, true, 0)
|
||||||
|
|
||||||
|
// Avoid infinite recursion with stacked sectors by limiting them.
|
||||||
|
#define MAX_SKYBOX_PLANES 1000
|
||||||
|
|
||||||
|
namespace swrenderer
|
||||||
|
{
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
int numskyboxes; // For ADD_STAT(skyboxes)
|
||||||
|
}
|
||||||
|
|
||||||
|
//==========================================================================
|
||||||
|
//
|
||||||
|
// R_DrawPortals
|
||||||
|
//
|
||||||
|
// Draws any recorded sky boxes and then frees them.
|
||||||
|
//
|
||||||
|
// The process:
|
||||||
|
// 1. Move the camera to coincide with the SkyViewpoint.
|
||||||
|
// 2. Clear out the old planes. (They have already been drawn.)
|
||||||
|
// 3. Clear a window out of the ClipSegs just large enough for the plane.
|
||||||
|
// 4. Pretend the existing vissprites and drawsegs aren't there.
|
||||||
|
// 5. Create a drawseg at 0 distance to clip sprites to the visplane. It
|
||||||
|
// doesn't need to be associated with a line in the map, since there
|
||||||
|
// will never be any sprites in front of it.
|
||||||
|
// 6. Render the BSP, then planes, then masked stuff.
|
||||||
|
// 7. Restore the previous vissprites and drawsegs.
|
||||||
|
// 8. Repeat for any other sky boxes.
|
||||||
|
// 9. Put the camera back where it was to begin with.
|
||||||
|
//
|
||||||
|
//==========================================================================
|
||||||
|
|
||||||
|
void R_DrawPortals()
|
||||||
|
{
|
||||||
|
static TArray<size_t> interestingStack;
|
||||||
|
static TArray<ptrdiff_t> drawsegStack;
|
||||||
|
static TArray<ptrdiff_t> visspriteStack;
|
||||||
|
static TArray<DVector3> viewposStack;
|
||||||
|
static TArray<visplane_t *> visplaneStack;
|
||||||
|
|
||||||
|
numskyboxes = 0;
|
||||||
|
|
||||||
|
if (visplanes[MAXVISPLANES] == nullptr)
|
||||||
|
return;
|
||||||
|
|
||||||
|
R_3D_EnterSkybox();
|
||||||
|
CurrentPortalInSkybox = true;
|
||||||
|
|
||||||
|
int savedextralight = extralight;
|
||||||
|
DVector3 savedpos = ViewPos;
|
||||||
|
DAngle savedangle = ViewAngle;
|
||||||
|
ptrdiff_t savedvissprite_p = vissprite_p - vissprites;
|
||||||
|
ptrdiff_t savedds_p = ds_p - drawsegs;
|
||||||
|
size_t savedinteresting = FirstInterestingDrawseg;
|
||||||
|
double savedvisibility = R_GetVisibility();
|
||||||
|
AActor *savedcamera = camera;
|
||||||
|
sector_t *savedsector = viewsector;
|
||||||
|
|
||||||
|
int i;
|
||||||
|
visplane_t *pl;
|
||||||
|
|
||||||
|
for (pl = visplanes[MAXVISPLANES]; pl != nullptr; pl = visplanes[MAXVISPLANES])
|
||||||
|
{
|
||||||
|
// Pop the visplane off the list now so that if this skybox adds more
|
||||||
|
// skyboxes to the list, they will be drawn instead of skipped (because
|
||||||
|
// new skyboxes go to the beginning of the list instead of the end).
|
||||||
|
visplanes[MAXVISPLANES] = pl->next;
|
||||||
|
pl->next = nullptr;
|
||||||
|
|
||||||
|
if (pl->right < pl->left || !r_skyboxes || numskyboxes == MAX_SKYBOX_PLANES || pl->portal == nullptr)
|
||||||
|
{
|
||||||
|
R_DrawSinglePlane(pl, OPAQUE, false, false);
|
||||||
|
*freehead = pl;
|
||||||
|
freehead = &pl->next;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
numskyboxes++;
|
||||||
|
|
||||||
|
FSectorPortal *port = pl->portal;
|
||||||
|
switch (port->mType)
|
||||||
|
{
|
||||||
|
case PORTS_SKYVIEWPOINT:
|
||||||
|
{
|
||||||
|
// Don't let gun flashes brighten the sky box
|
||||||
|
ASkyViewpoint *sky = barrier_cast<ASkyViewpoint*>(port->mSkybox);
|
||||||
|
extralight = 0;
|
||||||
|
R_SetVisibility(sky->args[0] * 0.25f);
|
||||||
|
|
||||||
|
ViewPos = sky->InterpolatedPosition(r_TicFracF);
|
||||||
|
ViewAngle = savedangle + (sky->PrevAngles.Yaw + deltaangle(sky->PrevAngles.Yaw, sky->Angles.Yaw) * r_TicFracF);
|
||||||
|
|
||||||
|
R_CopyStackedViewParameters();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case PORTS_STACKEDSECTORTHING:
|
||||||
|
case PORTS_PORTAL:
|
||||||
|
case PORTS_LINKEDPORTAL:
|
||||||
|
extralight = pl->extralight;
|
||||||
|
R_SetVisibility(pl->visibility);
|
||||||
|
ViewPos.X = pl->viewpos.X + port->mDisplacement.X;
|
||||||
|
ViewPos.Y = pl->viewpos.Y + port->mDisplacement.Y;
|
||||||
|
ViewPos.Z = pl->viewpos.Z;
|
||||||
|
ViewAngle = pl->viewangle;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case PORTS_HORIZON:
|
||||||
|
case PORTS_PLANE:
|
||||||
|
// not implemented yet
|
||||||
|
|
||||||
|
default:
|
||||||
|
R_DrawSinglePlane(pl, OPAQUE, false, false);
|
||||||
|
*freehead = pl;
|
||||||
|
freehead = &pl->next;
|
||||||
|
numskyboxes--;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
port->mFlags |= PORTSF_INSKYBOX;
|
||||||
|
if (port->mPartner > 0) sectorPortals[port->mPartner].mFlags |= PORTSF_INSKYBOX;
|
||||||
|
camera = nullptr;
|
||||||
|
viewsector = port->mDestination;
|
||||||
|
assert(viewsector != nullptr);
|
||||||
|
R_SetViewAngle();
|
||||||
|
validcount++; // Make sure we see all sprites
|
||||||
|
|
||||||
|
R_ClearPlanes(false);
|
||||||
|
R_ClearClipSegs(pl->left, pl->right);
|
||||||
|
WindowLeft = pl->left;
|
||||||
|
WindowRight = pl->right;
|
||||||
|
|
||||||
|
for (i = pl->left; i < pl->right; i++)
|
||||||
|
{
|
||||||
|
if (pl->top[i] == 0x7fff)
|
||||||
|
{
|
||||||
|
ceilingclip[i] = viewheight;
|
||||||
|
floorclip[i] = -1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ceilingclip[i] = pl->top[i];
|
||||||
|
floorclip[i] = pl->bottom[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a drawseg to clip sprites to the sky plane
|
||||||
|
drawseg_t *draw_segment = R_AddDrawSegment();
|
||||||
|
draw_segment->CurrentPortalUniq = CurrentPortalUniq;
|
||||||
|
draw_segment->siz1 = INT_MAX;
|
||||||
|
draw_segment->siz2 = INT_MAX;
|
||||||
|
draw_segment->sz1 = 0;
|
||||||
|
draw_segment->sz2 = 0;
|
||||||
|
draw_segment->x1 = pl->left;
|
||||||
|
draw_segment->x2 = pl->right;
|
||||||
|
draw_segment->silhouette = SIL_BOTH;
|
||||||
|
draw_segment->sprbottomclip = R_NewOpening(pl->right - pl->left);
|
||||||
|
draw_segment->sprtopclip = R_NewOpening(pl->right - pl->left);
|
||||||
|
draw_segment->maskedtexturecol = ds_p->swall = -1;
|
||||||
|
draw_segment->bFogBoundary = false;
|
||||||
|
draw_segment->curline = nullptr;
|
||||||
|
draw_segment->fake = 0;
|
||||||
|
memcpy(openings + draw_segment->sprbottomclip, floorclip + pl->left, (pl->right - pl->left) * sizeof(short));
|
||||||
|
memcpy(openings + draw_segment->sprtopclip, ceilingclip + pl->left, (pl->right - pl->left) * sizeof(short));
|
||||||
|
|
||||||
|
firstvissprite = vissprite_p;
|
||||||
|
firstdrawseg = draw_segment;
|
||||||
|
FirstInterestingDrawseg = InterestingDrawsegs.Size();
|
||||||
|
|
||||||
|
interestingStack.Push(FirstInterestingDrawseg);
|
||||||
|
ptrdiff_t diffnum = firstdrawseg - drawsegs;
|
||||||
|
drawsegStack.Push(diffnum);
|
||||||
|
diffnum = firstvissprite - vissprites;
|
||||||
|
visspriteStack.Push(diffnum);
|
||||||
|
viewposStack.Push(ViewPos);
|
||||||
|
visplaneStack.Push(pl);
|
||||||
|
|
||||||
|
InSubsector = nullptr;
|
||||||
|
R_RenderBSPNode(nodes + numnodes - 1);
|
||||||
|
R_3D_ResetClip(); // reset clips (floor/ceiling)
|
||||||
|
R_DrawPlanes();
|
||||||
|
|
||||||
|
port->mFlags &= ~PORTSF_INSKYBOX;
|
||||||
|
if (port->mPartner > 0) sectorPortals[port->mPartner].mFlags &= ~PORTSF_INSKYBOX;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw all the masked textures in a second pass, in the reverse order they
|
||||||
|
// were added. This must be done separately from the previous step for the
|
||||||
|
// sake of nested skyboxes.
|
||||||
|
while (interestingStack.Pop(FirstInterestingDrawseg))
|
||||||
|
{
|
||||||
|
ptrdiff_t pd = 0;
|
||||||
|
|
||||||
|
drawsegStack.Pop(pd);
|
||||||
|
firstdrawseg = drawsegs + pd;
|
||||||
|
visspriteStack.Pop(pd);
|
||||||
|
firstvissprite = vissprites + pd;
|
||||||
|
|
||||||
|
// Masked textures and planes need the view coordinates restored for proper positioning.
|
||||||
|
viewposStack.Pop(ViewPos);
|
||||||
|
|
||||||
|
R_DrawMasked();
|
||||||
|
|
||||||
|
ds_p = firstdrawseg;
|
||||||
|
vissprite_p = firstvissprite;
|
||||||
|
|
||||||
|
visplaneStack.Pop(pl);
|
||||||
|
if (pl->Alpha > 0 && pl->picnum != skyflatnum)
|
||||||
|
{
|
||||||
|
R_DrawSinglePlane(pl, pl->Alpha, pl->Additive, true);
|
||||||
|
}
|
||||||
|
*freehead = pl;
|
||||||
|
freehead = &pl->next;
|
||||||
|
}
|
||||||
|
firstvissprite = vissprites;
|
||||||
|
vissprite_p = vissprites + savedvissprite_p;
|
||||||
|
firstdrawseg = drawsegs;
|
||||||
|
ds_p = drawsegs + savedds_p;
|
||||||
|
InterestingDrawsegs.Resize((unsigned int)FirstInterestingDrawseg);
|
||||||
|
FirstInterestingDrawseg = savedinteresting;
|
||||||
|
|
||||||
|
camera = savedcamera;
|
||||||
|
viewsector = savedsector;
|
||||||
|
ViewPos = savedpos;
|
||||||
|
R_SetVisibility(savedvisibility);
|
||||||
|
extralight = savedextralight;
|
||||||
|
ViewAngle = savedangle;
|
||||||
|
R_SetViewAngle();
|
||||||
|
|
||||||
|
CurrentPortalInSkybox = false;
|
||||||
|
R_3D_LeaveSkybox();
|
||||||
|
|
||||||
|
if (fakeActive) return;
|
||||||
|
|
||||||
|
for (*freehead = visplanes[MAXVISPLANES], visplanes[MAXVISPLANES] = nullptr; *freehead; )
|
||||||
|
freehead = &(*freehead)->next;
|
||||||
|
}
|
||||||
|
|
||||||
|
void R_DrawWallPortals()
|
||||||
|
{
|
||||||
|
// [RH] Walk through mirrors
|
||||||
|
// [ZZ] Merged with portals
|
||||||
|
size_t lastportal = WallPortals.Size();
|
||||||
|
for (unsigned int i = 0; i < lastportal; i++)
|
||||||
|
{
|
||||||
|
R_EnterPortal(&WallPortals[i], 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
CurrentPortal = nullptr;
|
||||||
|
CurrentPortalUniq = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void R_EnterPortal(PortalDrawseg* pds, int depth)
|
||||||
|
{
|
||||||
|
// [ZZ] check depth. fill portal with black if it's exceeding the visual recursion limit, and continue like nothing happened.
|
||||||
|
if (depth >= r_portal_recursions)
|
||||||
|
{
|
||||||
|
BYTE color = (BYTE)BestColor((DWORD *)GPalette.BaseColors, 0, 0, 0, 0, 255);
|
||||||
|
int spacing = RenderTarget->GetPitch();
|
||||||
|
for (int x = pds->x1; x < pds->x2; x++)
|
||||||
|
{
|
||||||
|
if (x < 0 || x >= RenderTarget->GetWidth())
|
||||||
|
continue;
|
||||||
|
|
||||||
|
int Ytop = pds->ceilingclip[x - pds->x1];
|
||||||
|
int Ybottom = pds->floorclip[x - pds->x1];
|
||||||
|
|
||||||
|
if (r_swtruecolor)
|
||||||
|
{
|
||||||
|
uint32_t *dest = (uint32_t*)RenderTarget->GetBuffer() + x + Ytop * spacing;
|
||||||
|
|
||||||
|
uint32_t c = GPalette.BaseColors[color].d;
|
||||||
|
for (int y = Ytop; y <= Ybottom; y++)
|
||||||
|
{
|
||||||
|
*dest = c;
|
||||||
|
dest += spacing;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
BYTE *dest = RenderTarget->GetBuffer() + x + Ytop * spacing;
|
||||||
|
|
||||||
|
for (int y = Ytop; y <= Ybottom; y++)
|
||||||
|
{
|
||||||
|
*dest = color;
|
||||||
|
dest += spacing;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (r_highlight_portals)
|
||||||
|
R_HighlightPortal(pds);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DAngle startang = ViewAngle;
|
||||||
|
DVector3 startpos = ViewPos;
|
||||||
|
DVector3 savedpath[2] = { ViewPath[0], ViewPath[1] };
|
||||||
|
ActorRenderFlags savedvisibility = camera ? camera->renderflags & RF_INVISIBLE : ActorRenderFlags::FromInt(0);
|
||||||
|
|
||||||
|
CurrentPortalUniq++;
|
||||||
|
|
||||||
|
unsigned int portalsAtStart = WallPortals.Size();
|
||||||
|
|
||||||
|
if (pds->mirror)
|
||||||
|
{
|
||||||
|
//vertex_t *v1 = ds->curline->v1;
|
||||||
|
vertex_t *v1 = pds->src->v1;
|
||||||
|
|
||||||
|
// Reflect the current view behind the mirror.
|
||||||
|
if (pds->src->Delta().X == 0)
|
||||||
|
{ // vertical mirror
|
||||||
|
ViewPos.X = v1->fX() - startpos.X + v1->fX();
|
||||||
|
}
|
||||||
|
else if (pds->src->Delta().Y == 0)
|
||||||
|
{ // horizontal mirror
|
||||||
|
ViewPos.Y = v1->fY() - startpos.Y + v1->fY();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{ // any mirror
|
||||||
|
vertex_t *v2 = pds->src->v2;
|
||||||
|
|
||||||
|
double dx = v2->fX() - v1->fX();
|
||||||
|
double dy = v2->fY() - v1->fY();
|
||||||
|
double x1 = v1->fX();
|
||||||
|
double y1 = v1->fY();
|
||||||
|
double x = startpos.X;
|
||||||
|
double y = startpos.Y;
|
||||||
|
|
||||||
|
// the above two cases catch len == 0
|
||||||
|
double r = ((x - x1)*dx + (y - y1)*dy) / (dx*dx + dy*dy);
|
||||||
|
|
||||||
|
ViewPos.X = (x1 + r * dx) * 2 - x;
|
||||||
|
ViewPos.Y = (y1 + r * dy) * 2 - y;
|
||||||
|
}
|
||||||
|
ViewAngle = pds->src->Delta().Angle() * 2 - startang;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
P_TranslatePortalXY(pds->src, ViewPos.X, ViewPos.Y);
|
||||||
|
P_TranslatePortalZ(pds->src, ViewPos.Z);
|
||||||
|
P_TranslatePortalAngle(pds->src, ViewAngle);
|
||||||
|
P_TranslatePortalXY(pds->src, ViewPath[0].X, ViewPath[0].Y);
|
||||||
|
P_TranslatePortalXY(pds->src, ViewPath[1].X, ViewPath[1].Y);
|
||||||
|
|
||||||
|
if (!r_showviewer && camera && P_PointOnLineSidePrecise(ViewPath[0], pds->dst) != P_PointOnLineSidePrecise(ViewPath[1], pds->dst))
|
||||||
|
{
|
||||||
|
double distp = (ViewPath[0] - ViewPath[1]).Length();
|
||||||
|
if (distp > EQUAL_EPSILON)
|
||||||
|
{
|
||||||
|
double dist1 = (ViewPos - ViewPath[0]).Length();
|
||||||
|
double dist2 = (ViewPos - ViewPath[1]).Length();
|
||||||
|
|
||||||
|
if (dist1 + dist2 < distp + 1)
|
||||||
|
{
|
||||||
|
camera->renderflags |= RF_INVISIBLE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ViewSin = ViewAngle.Sin();
|
||||||
|
ViewCos = ViewAngle.Cos();
|
||||||
|
|
||||||
|
ViewTanSin = FocalTangent * ViewSin;
|
||||||
|
ViewTanCos = FocalTangent * ViewCos;
|
||||||
|
|
||||||
|
R_CopyStackedViewParameters();
|
||||||
|
|
||||||
|
validcount++;
|
||||||
|
PortalDrawseg* prevpds = CurrentPortal;
|
||||||
|
CurrentPortal = pds;
|
||||||
|
|
||||||
|
R_ClearPlanes(false);
|
||||||
|
R_ClearClipSegs(pds->x1, pds->x2);
|
||||||
|
|
||||||
|
WindowLeft = pds->x1;
|
||||||
|
WindowRight = pds->x2;
|
||||||
|
|
||||||
|
// RF_XFLIP should be removed before calling the root function
|
||||||
|
int prevmf = MirrorFlags;
|
||||||
|
if (pds->mirror)
|
||||||
|
{
|
||||||
|
if (MirrorFlags & RF_XFLIP)
|
||||||
|
MirrorFlags &= ~RF_XFLIP;
|
||||||
|
else MirrorFlags |= RF_XFLIP;
|
||||||
|
}
|
||||||
|
|
||||||
|
// some portals have height differences, account for this here
|
||||||
|
R_3D_EnterSkybox(); // push 3D floor height map
|
||||||
|
CurrentPortalInSkybox = false; // first portal in a skybox should set this variable to false for proper clipping in skyboxes.
|
||||||
|
|
||||||
|
// first pass, set clipping
|
||||||
|
memcpy(ceilingclip + pds->x1, &pds->ceilingclip[0], pds->len * sizeof(*ceilingclip));
|
||||||
|
memcpy(floorclip + pds->x1, &pds->floorclip[0], pds->len * sizeof(*floorclip));
|
||||||
|
|
||||||
|
InSubsector = nullptr;
|
||||||
|
R_RenderBSPNode(nodes + numnodes - 1);
|
||||||
|
R_3D_ResetClip(); // reset clips (floor/ceiling)
|
||||||
|
if (!savedvisibility && camera) camera->renderflags &= ~RF_INVISIBLE;
|
||||||
|
|
||||||
|
PlaneCycles.Clock();
|
||||||
|
R_DrawPlanes();
|
||||||
|
R_DrawPortals();
|
||||||
|
PlaneCycles.Unclock();
|
||||||
|
|
||||||
|
double vzp = ViewPos.Z;
|
||||||
|
|
||||||
|
int prevuniq = CurrentPortalUniq;
|
||||||
|
// depth check is in another place right now
|
||||||
|
unsigned int portalsAtEnd = WallPortals.Size();
|
||||||
|
for (; portalsAtStart < portalsAtEnd; portalsAtStart++)
|
||||||
|
{
|
||||||
|
R_EnterPortal(&WallPortals[portalsAtStart], depth + 1);
|
||||||
|
}
|
||||||
|
int prevuniq2 = CurrentPortalUniq;
|
||||||
|
CurrentPortalUniq = prevuniq;
|
||||||
|
|
||||||
|
NetUpdate();
|
||||||
|
|
||||||
|
MaskedCycles.Clock(); // [ZZ] count sprites in portals/mirrors along with normal ones.
|
||||||
|
R_DrawMasked(); // this is required since with portals there often will be cases when more than 80% of the view is inside a portal.
|
||||||
|
MaskedCycles.Unclock();
|
||||||
|
|
||||||
|
NetUpdate();
|
||||||
|
|
||||||
|
R_3D_LeaveSkybox(); // pop 3D floor height map
|
||||||
|
CurrentPortalUniq = prevuniq2;
|
||||||
|
|
||||||
|
// draw a red line around a portal if it's being highlighted
|
||||||
|
if (r_highlight_portals)
|
||||||
|
R_HighlightPortal(pds);
|
||||||
|
|
||||||
|
CurrentPortal = prevpds;
|
||||||
|
MirrorFlags = prevmf;
|
||||||
|
ViewAngle = startang;
|
||||||
|
ViewPos = startpos;
|
||||||
|
ViewPath[0] = savedpath[0];
|
||||||
|
ViewPath[1] = savedpath[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
void R_HighlightPortal(PortalDrawseg* pds)
|
||||||
|
{
|
||||||
|
// [ZZ] NO OVERFLOW CHECKS HERE
|
||||||
|
// I believe it won't break. if it does, blame me. :(
|
||||||
|
|
||||||
|
if (r_swtruecolor) // Assuming this is just a debug function
|
||||||
|
return;
|
||||||
|
|
||||||
|
BYTE color = (BYTE)BestColor((DWORD *)GPalette.BaseColors, 255, 0, 0, 0, 255);
|
||||||
|
|
||||||
|
BYTE* pixels = RenderTarget->GetBuffer();
|
||||||
|
// top edge
|
||||||
|
for (int x = pds->x1; x < pds->x2; x++)
|
||||||
|
{
|
||||||
|
if (x < 0 || x >= RenderTarget->GetWidth())
|
||||||
|
continue;
|
||||||
|
|
||||||
|
int p = x - pds->x1;
|
||||||
|
int Ytop = pds->ceilingclip[p];
|
||||||
|
int Ybottom = pds->floorclip[p];
|
||||||
|
|
||||||
|
if (x == pds->x1 || x == pds->x2 - 1)
|
||||||
|
{
|
||||||
|
RenderTarget->DrawLine(x, Ytop, x, Ybottom + 1, color, 0);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
int YtopPrev = pds->ceilingclip[p - 1];
|
||||||
|
int YbottomPrev = pds->floorclip[p - 1];
|
||||||
|
|
||||||
|
if (abs(Ytop - YtopPrev) > 1)
|
||||||
|
RenderTarget->DrawLine(x, YtopPrev, x, Ytop, color, 0);
|
||||||
|
else *(pixels + Ytop * RenderTarget->GetPitch() + x) = color;
|
||||||
|
|
||||||
|
if (abs(Ybottom - YbottomPrev) > 1)
|
||||||
|
RenderTarget->DrawLine(x, YbottomPrev, x, Ybottom, color, 0);
|
||||||
|
else *(pixels + Ybottom * RenderTarget->GetPitch() + x) = color;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ADD_STAT(skyboxes)
|
||||||
|
{
|
||||||
|
FString out;
|
||||||
|
out.Format("%d skybox planes", swrenderer::numskyboxes);
|
||||||
|
return out;
|
||||||
|
}
|
||||||
12
src/swrenderer/scene/r_portal.h
Normal file
12
src/swrenderer/scene/r_portal.h
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "r_portal_segment.h"
|
||||||
|
|
||||||
|
namespace swrenderer
|
||||||
|
{
|
||||||
|
void R_DrawPortals();
|
||||||
|
void R_DrawWallPortals();
|
||||||
|
void R_EnterPortal(PortalDrawseg* pds, int depth);
|
||||||
|
void R_HighlightPortal(PortalDrawseg* pds);
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue