zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-04 06:55:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed the viewpoint from the clipper as we don't need this.

Browse source 
ClipWindow will go elsewhere, it has no place here.
This commit is contained in:
Christoph Oelckers 2021-12-15 23:16:46 +01:00
parent 83000fab77
commit 0e6242626c
3 changed files with 2 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/core/rendering/scene/hw_bunchdrawer.cpp
View file

@ -64,7 +64,6 @@ void BunchDrawer::Init(HWDrawInfo *_di, Clipper* c, vec2_t& view, binangle a1, b
viewy = view.y * -(1/ 16.f);
iview = view;
StartScene();
clipper->SetViewpoint(view);
gcosang = bamang(di->Viewpoint.RotAngle).fcos();
gsinang = bamang(di->Viewpoint.RotAngle).fsin();
@ -72,7 +71,8 @@ void BunchDrawer::Init(HWDrawInfo *_di, Clipper* c, vec2_t& view, binangle a1, b
for (int i = 0; i < numwalls; i++)
{
// Precalculate the clip angles to avoid doing this repeatedly during level traversal.
wall[i].clipangle = clipper->PointToAngle(wall[i].pos);
auto vv = wall[i].pos - view;
wall[i].clipangle = bvectangbam(vv.x, vv.y);
}
memset(sectionstartang.Data(), -1, sectionstartang.Size() * sizeof(sectionstartang[0]));
memset(sectionendang.Data(), -1, sectionendang.Size() * sizeof(sectionendang[0]));

46
source/core/rendering/scene/hw_clipper.h
View file

@ -8,38 +8,6 @@
#include "binaryangle.h"
#include "intvec.h"
class ClipWindow
{
FVector2 left, right; // left and right edge of the window in 2D
FAngle leftang, rightang; // view angles of the window edges
Plane planes[2]; // top and bottom plane of the window
// The inside is behind the plane defined by p1 - p4, the sides are defined by p0, pn and pn+1 respectively.
// p1 is lower left, p2 upper left, p3 upper right and p4 lower right.
void build(const FVector3& p0, const FVector3& p1, const FVector3& p2, const FVector3& p3, const FVector3& p4, DAngle la, DAngle ra)
{
left = p1.XY();
right = p4.XY();
planes[0].Init(p0, p2, p3); // top plane - must point inside.
planes[1].Init(p0, p4, p1); // bottom plane - must point inside.
}
bool polyInWindow(const TArrayView<FVector3>& points)
{
for (auto& plane : planes)
{
for (auto& point : points)
{
if (!plane.PointOnSide(point)) goto nextplane; // Too bad that C++ still has no option to continue an outer loop from here...
}
return false;
nextplane:;
}
return true;
}
};
class ClipNode
{
friend class Clipper;
@ -61,7 +29,6 @@ class Clipper
ClipNode * clipnodes = nullptr;
ClipNode * cliphead = nullptr;
vec2_t viewpoint;
void RemoveRange(ClipNode* cn);
binangle visibleStart, visibleEnd;
@ -104,11 +71,6 @@ private:
public:
void SetViewpoint(const vec2_t &vp)
{
viewpoint = vp;
}
void SetVisibleRange(angle_t a1, angle_t a2)
{
if (a2 != 0xffffffff)
@ -134,14 +96,6 @@ public:
}
void DumpClipper();
binangle PointToAngle(const vec2_t& pos)
{
vec2_t vec = pos - viewpoint;
return bvectangbam(vec.x, vec.y);
}
};
#endif

1
source/core/rendering/scene/hw_drawinfo.cpp
View file

@ -146,7 +146,6 @@ void HWDrawInfo::StartScene(FRenderViewpoint& parentvp, HWViewpointUniforms* uni
VPUniforms.mShadowmapFilter = gl_shadowmap_filter;
}
vec2_t view = { int(Viewpoint.Pos.X * 16), int(Viewpoint.Pos.Y * -16) };
mClipper->SetViewpoint(view);
ClearBuffers();