zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

This commit is contained in:
Christoph Oelckers 2016-06-19 11:53:17 +02:00
parent 2813a22740 cebd877191
commit b364926e93
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/p_setup.cpp
View File

@ -3194,7 +3194,7 @@ static void P_GroupLines (bool buildmap)
{ {
I_Error("P_GroupLines: miscounted"); I_Error("P_GroupLines: miscounted");
} }
if (sector->linecount != 0) if (sector->linecount > 3)
{ {
bbox.ClearBox(); bbox.ClearBox();
for (j = 0; j < sector->linecount; ++j) for (j = 0; j < sector->linecount; ++j)
@ -3203,40 +3203,22 @@ static void P_GroupLines (bool buildmap)
bbox.AddToBox(li->v1->fPos()); bbox.AddToBox(li->v1->fPos());
bbox.AddToBox(li->v2->fPos()); bbox.AddToBox(li->v2->fPos());
} }
}
// set the center to the middle of the bounding box // set the center to the middle of the bounding box
sector->centerspot.X = (bbox.Right() + bbox.Left()) / 2; sector->centerspot.X = (bbox.Right() + bbox.Left()) / 2;
sector->centerspot.Y = (bbox.Top() + bbox.Bottom()) / 2; sector->centerspot.Y = (bbox.Top() + bbox.Bottom()) / 2;
}
else if (sector->linecount > 0)
{
// For triangular sectors the above does not calculate good points unless the longest of the triangle's lines is perfectly horizontal and vertical // For triangular sectors the above does not calculate good points unless the longest of the triangle's lines is perfectly horizontal and vertical
if (sector->linecount == 3) DVector2 pos = { 0,0 };
for (int i = 0; i < sector->linecount; i++)
{ {
vertex_t *Triangle[2]; pos += sector->lines[i]->v1->fPos() + sector->lines[i]->v2->fPos();
Triangle[0] = sector->lines[0]->v1;
Triangle[1] = sector->lines[0]->v2;
if (sector->linecount > 1)
{
double dx = Triangle[1]->fX() - Triangle[0]->fX();
double dy = Triangle[1]->fY() - Triangle[0]->fY();
// Find another point in the sector that does not lie
// on the same line as the first two points.
for (j = 0; j < 2; ++j)
{
vertex_t *v;
v = (j == 1) ? sector->lines[1]->v1 : sector->lines[1]->v2;
if ( (v->fY() - Triangle[0]->fY()) * dx + (Triangle[0]->fX() - v->fX() * dy) != 0)
{
sector->centerspot.X = (Triangle[0]->fX() / 3 + Triangle[1]->fX() / 3 + v->fX() / 3);
sector->centerspot.Y = (Triangle[0]->fY() / 3 + Triangle[1]->fY() / 3 + v->fY() / 3);
break;
} }
sector->centerspot = pos / (2 * sector->linecount);
} }
} }
}
}
delete[] linesDoneInEachSector; delete[] linesDoneInEachSector;
times[3].Unclock(); times[3].Unclock();