zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- keep separate sector compare data for floor and ceiling.

Browse source 
Otherwise there can be problems if floor and ceiling change at the same time.
This commit is contained in:
Christoph Oelckers 2021-03-30 20:43:21 +02:00
parent 9cccd6f89b
commit a4174352c7
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/core/sectorgeometry.cpp
View file

@ -299,7 +299,7 @@ void SectorGeometry::MakeVertices(unsigned int secnum, int plane)
void SectorGeometry::ValidateSector(unsigned int secnum, int plane) void SectorGeometry::ValidateSector(unsigned int secnum, int plane)
{ {
auto sec = &sector[secnum]; auto sec = &sector[secnum];
auto compare = &data[secnum].compare; auto compare = &data[secnum].compare[plane];
if (plane == 0) if (plane == 0)
{ {
if (sec->floorheinum == compare->floorheinum && if (sec->floorheinum == compare->floorheinum &&
@ -307,8 +307,8 @@ void SectorGeometry::ValidateSector(unsigned int secnum, int plane)
((sec->floorstat ^ compare->floorstat) & (CSTAT_SECTOR_ALIGN | CSTAT_SECTOR_YFLIP | CSTAT_SECTOR_XFLIP | CSTAT_SECTOR_TEXHALF | CSTAT_SECTOR_SWAPXY)) == 0 && ((sec->floorstat ^ compare->floorstat) & (CSTAT_SECTOR_ALIGN | CSTAT_SECTOR_YFLIP | CSTAT_SECTOR_XFLIP | CSTAT_SECTOR_TEXHALF | CSTAT_SECTOR_SWAPXY)) == 0 &&
sec->floorxpan_ == compare->floorxpan_ && sec->floorxpan_ == compare->floorxpan_ &&
sec->floorypan_ == compare->floorypan_ && sec->floorypan_ == compare->floorypan_ &&
wall[sec->wallptr].pos == data[secnum].poscompare && wall[sec->wallptr].pos == data[secnum].poscompare[0] &&
wall[wall[sec->wallptr].point2].pos == data[secnum].poscompare2 && wall[wall[sec->wallptr].point2].pos == data[secnum].poscompare2[0] &&
!(sec->dirty & 1) && data[secnum].planes[plane].vertices.Size() ) return; !(sec->dirty & 1) && data[secnum].planes[plane].vertices.Size() ) return;
sec->dirty &= ~1; sec->dirty &= ~1;
@ -320,14 +320,14 @@ void SectorGeometry::ValidateSector(unsigned int secnum, int plane)
((sec->ceilingstat ^ compare->ceilingstat) & (CSTAT_SECTOR_ALIGN | CSTAT_SECTOR_YFLIP | CSTAT_SECTOR_XFLIP | CSTAT_SECTOR_TEXHALF | CSTAT_SECTOR_SWAPXY)) == 0 && ((sec->ceilingstat ^ compare->ceilingstat) & (CSTAT_SECTOR_ALIGN | CSTAT_SECTOR_YFLIP | CSTAT_SECTOR_XFLIP | CSTAT_SECTOR_TEXHALF | CSTAT_SECTOR_SWAPXY)) == 0 &&
sec->ceilingxpan_ == compare->ceilingxpan_ && sec->ceilingxpan_ == compare->ceilingxpan_ &&
sec->ceilingypan_ == compare->ceilingypan_ && sec->ceilingypan_ == compare->ceilingypan_ &&
wall[sec->wallptr].pos == data[secnum].poscompare && wall[sec->wallptr].pos == data[secnum].poscompare[1] &&
wall[wall[sec->wallptr].point2].pos == data[secnum].poscompare2 && wall[wall[sec->wallptr].point2].pos == data[secnum].poscompare2[1] &&
!(sec->dirty & 2) && data[secnum].planes[plane].vertices.Size()) return; !(sec->dirty & 2) && data[secnum].planes[1].vertices.Size()) return;
sec->dirty &= ~2; sec->dirty &= ~2;
} }
*compare = *sec; *compare = *sec;
data[secnum].poscompare = wall[sec->wallptr].pos; data[secnum].poscompare[plane] = wall[sec->wallptr].pos;
data[secnum].poscompare2 = wall[wall[sec->wallptr].point2].pos; data[secnum].poscompare2[plane] = wall[wall[sec->wallptr].point2].pos;
MakeVertices(secnum, plane); MakeVertices(secnum, plane);
} }

6
source/core/sectorgeometry.h
View file

@ -14,9 +14,9 @@ struct SectorGeometryPlane
struct SectorGeometryData struct SectorGeometryData
{ {
SectorGeometryPlane planes[2]; SectorGeometryPlane planes[2];
sectortype compare{}; sectortype compare[2] = {};
vec2_t poscompare{ }; vec2_t poscompare[2] = {};
vec2_t poscompare2{ }; vec2_t poscompare2[2] = {};
}; };
class SectorGeometry class SectorGeometry