zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-18 00:22:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- do not abort on unclosed sections.

Browse source 
Apparently they can indeed happen with broken map setups like isolated linedefs somewhere in the wild (see Strife MAP08.)
Although they are a problem for triangulation, this isn't what sections get used for currently so it's of no real concern.
In case this is needed later their work data gets marked as 'bad' for the time being.
This commit is contained in:
Christoph Oelckers 2018-11-11 10:08:13 +01:00
parent 094afdfd5f
commit d3aa9c6af1
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/r_data/r_sections.cpp
View file

@ -64,6 +64,7 @@ struct WorkSection
int sectorindex; int sectorindex;
int mapsection; int mapsection;
bool hasminisegs; bool hasminisegs;
bool bad; // Did not produce a proper area and cannot be triangulated by tesselation.
TArray<WorkSectionLine*>segments; TArray<WorkSectionLine*>segments;
TArray<side_t *> originalSides; // The segs will lose some of these while working on them. TArray<side_t *> originalSides; // The segs will lose some of these while working on them.
TArray<int> subsectors; TArray<int> subsectors;
@ -307,6 +308,7 @@ public:
TArray<seg_t *> outersegs; TArray<seg_t *> outersegs;
TArray<seg_t *> loopedsegs; TArray<seg_t *> loopedsegs;
bool hasminisegs = false; bool hasminisegs = false;
bool bad = false;
// Collect all the segs that make up the outline of this section. // Collect all the segs that make up the outline of this section.
for (auto j : rawsection) for (auto j : rawsection)
@ -397,7 +399,8 @@ public:
{ {
// Did not find another one but have an unclosed loop. This should never happen and would indicate broken nodes. // Did not find another one but have an unclosed loop. This should never happen and would indicate broken nodes.
// Error out and let the calling code deal with it. // Error out and let the calling code deal with it.
I_Error("Unclosed loop in sector %d at position (%d, %d)\n", loopedsegs[0]->Subsector->render_sector->Index(), (int)loopedsegs[0]->v1->fX(), (int)loopedsegs[0]->v1->fY()); DPrintf(DMSG_NOTIFY, "Unclosed loop in sector %d at position (%d, %d)\n", loopedsegs[0]->Subsector->render_sector->Index(), (int)loopedsegs[0]->v1->fX(), (int)loopedsegs[0]->v1->fY());
bad = true;
} }
seg = nullptr; seg = nullptr;
loopedsegs.Push(nullptr); // A separator is not really needed but useful for debugging. loopedsegs.Push(nullptr); // A separator is not really needed but useful for debugging.
@ -428,6 +431,7 @@ public:
section.sectorindex = sector; section.sectorindex = sector;
section.mapsection = mapsec; section.mapsection = mapsec;
section.hasminisegs = hasminisegs; section.hasminisegs = hasminisegs;
section.bad = bad;
section.originalSides = std::move(foundsides); section.originalSides = std::move(foundsides);
section.segments = std::move(sectionlines); section.segments = std::move(sectionlines);
section.subsectors = std::move(rawsection); section.subsectors = std::move(rawsection);