teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-20 16:10:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Change BunchDrawer::ang1, BunchDrawer::ang2 and BunchDrawer::angrange from binangle to angle_t.

Browse source
This commit is contained in:
Mitchell Richters 2022-08-27 19:38:37 +10:00 committed by Christoph Oelckers
parent e17d24ce0b
commit 914930ff9a
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,8 +55,8 @@
void BunchDrawer::Init(HWDrawInfo *_di, Clipper* c, vec2_t& view, binangle a1, binangle a2) void BunchDrawer::Init(HWDrawInfo *_di, Clipper* c, vec2_t& view, binangle a1, binangle a2)
{ {
ang1 = a1; ang1 = a1.asbam();
ang2 = a2; ang2 = a2.asbam();
angrange = ang2 - ang1; angrange = ang2 - ang1;
di = _di; di = _di;
clipper = c; clipper = c;
@ -120,7 +120,7 @@ bool BunchDrawer::StartBunch(int sectnum, int linenum, binangle startan, binangl
bunch->endangle = endan.asbam(); bunch->endangle = endan.asbam();
bunch->portal = portal; bunch->portal = portal;
assert(bunch->endangle >= bunch->startangle); assert(bunch->endangle >= bunch->startangle);
return bunch->endangle != angrange.asbam(); return bunch->endangle != angrange;
} }
//========================================================================== //==========================================================================
@ -135,7 +135,7 @@ bool BunchDrawer::AddLineToBunch(int line, binangle newan)
assert(newan.asbam() > Bunches[LastBunch].endangle); assert(newan.asbam() > Bunches[LastBunch].endangle);
Bunches[LastBunch].endangle = newan.asbam(); Bunches[LastBunch].endangle = newan.asbam();
assert(Bunches[LastBunch].endangle > Bunches[LastBunch].startangle); assert(Bunches[LastBunch].endangle > Bunches[LastBunch].startangle);
return Bunches[LastBunch].endangle != angrange.asbam(); return Bunches[LastBunch].endangle != angrange;
} }
//========================================================================== //==========================================================================
@ -241,7 +241,7 @@ int BunchDrawer::ClipLine(int aline, bool portal)
int startAngle = startAngleBam.asbam(); int startAngle = startAngleBam.asbam();
int endAngle = endAngleBam.asbam(); int endAngle = endAngleBam.asbam();
if (startAngle < 0) startAngle = 0; if (startAngle < 0) startAngle = 0;
if (endAngle < 0 || endAngle > (int)angrange.asbam()) endAngle = angrange.asbam(); if (endAngle < 0 || endAngle > (int)angrange) endAngle = angrange;
// since these values are derived from previous calls of this function they cannot be out of range. // since these values are derived from previous calls of this function they cannot be out of range.
int sectStartAngle = sectionstartang[section]; int sectStartAngle = sectionstartang[section];
@ -715,15 +715,15 @@ void BunchDrawer::ProcessSection(int sectionnum, bool portal)
binangle walang2 = ClipAngle(thisline->endpoint); binangle walang2 = ClipAngle(thisline->endpoint);
// outside the visible area or seen from the backside. // outside the visible area or seen from the backside.
if ((walang1.asbam() > angrange.asbam() && walang2.asbam() > angrange.asbam() && walang1.asbam() < walang2.asbam()) || if ((walang1.asbam() > angrange && walang2.asbam() > angrange && walang1.asbam() < walang2.asbam()) ||
(walang1.asbam() - walang2.asbam() < ANGLE_180)) (walang1.asbam() - walang2.asbam() < ANGLE_180))
{ {
inbunch = false; inbunch = false;
} }
else else
{ {
if (walang1.asbam() >= angrange.asbam()) { walang1 = bamang(0); inbunch = false; } if (walang1.asbam() >= angrange) { walang1 = bamang(0); inbunch = false; }
if (walang2.asbam() >= angrange.asbam()) walang2 = angrange; if (walang2.asbam() >= angrange) walang2 = bamang(angrange);
if (section->lines[i] >= (int)wall.Size()) inbunch = false; if (section->lines[i] >= (int)wall.Size()) inbunch = false;
if (!inbunch) if (!inbunch)
{ {
@ -751,14 +751,14 @@ void BunchDrawer::RenderScene(const int* viewsectors, unsigned sectcount, bool p
//Printf("----------------------------------------- \nstart at sector %d, z = %2.3f\n", viewsectors[0], viewz); //Printf("----------------------------------------- \nstart at sector %d, z = %2.3f\n", viewsectors[0], viewz);
auto process = [&]() auto process = [&]()
{ {
clipper->Clear(ang1); clipper->Clear(bamang(ang1));
for (unsigned i = 0; i < sectcount; i++) for (unsigned i = 0; i < sectcount; i++)
{ {
for (auto j : sectionsPerSector[viewsectors[i]]) for (auto j : sectionsPerSector[viewsectors[i]])
{ {
sectionstartang[j] = 0; sectionstartang[j] = 0;
sectionendang[j] = int(angrange.asbam()); sectionendang[j] = int(angrange);
} }
} }
for (unsigned i = 0; i < sectcount; i++) for (unsigned i = 0; i < sectcount; i++)
@ -777,7 +777,7 @@ void BunchDrawer::RenderScene(const int* viewsectors, unsigned sectcount, bool p
}; };
Bsp.Clock(); Bsp.Clock();
if (ang1.asbam() != 0 || ang2.asbam() != 0) if (ang1 != 0 || ang2 != 0)
{ {
process(); process();
} }
@ -786,13 +786,13 @@ void BunchDrawer::RenderScene(const int* viewsectors, unsigned sectcount, bool p
// with a 360° field of view we need to split the scene into two halves. // with a 360° field of view we need to split the scene into two halves.
// The BunchInFront check can fail with angles that may wrap around. // The BunchInFront check can fail with angles that may wrap around.
auto rotang = di->Viewpoint.RotAngle; auto rotang = di->Viewpoint.RotAngle;
ang1 = bamang(rotang - ANGLE_90); ang1 = rotang - ANGLE_90;
ang2 = bamang(rotang + ANGLE_90 - 1); ang2 = rotang + ANGLE_90 - 1;
angrange = ang2 - ang1; angrange = ang2 - ang1;
process(); process();
gotsection2.Zero(); gotsection2.Zero();
ang1 = bamang(rotang + ANGLE_90); ang1 = rotang + ANGLE_90;
ang2 = bamang(rotang - ANGLE_90 - 1); ang2 = rotang - ANGLE_90 - 1;
angrange = ang2 - ang1; angrange = ang2 - ang1;
process(); process();
} }

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

@ -31,7 +31,7 @@ class BunchDrawer
BitArray gotsection2; BitArray gotsection2;
BitArray gotwall; BitArray gotwall;
BitArray blockwall; BitArray blockwall;
binangle ang1, ang2, angrange; angle_t ang1, ang2, angrange;
float viewz; float viewz;
TArray<int> sectionstartang, sectionendang; TArray<int> sectionstartang, sectionendang;
@ -45,7 +45,7 @@ private:
CL_Pass = 2, CL_Pass = 2,
}; };
binangle ClipAngle(int wal) { return bamang(wall[wal].clipangle) - ang1; } binangle ClipAngle(int wal) { return bamang(wall[wal].clipangle - ang1); }
void StartScene(); void StartScene();
bool StartBunch(int sectnum, int linenum, binangle startan, binangle endan, bool portal); bool StartBunch(int sectnum, int linenum, binangle startan, binangle endan, bool portal);
bool AddLineToBunch(int line, binangle newan); bool AddLineToBunch(int line, binangle newan);