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

- fixed interpolation issues with sector objects in SW.

Browse source 
SO's vertex interpolation does not use the common framework so it got missed by the sector retriangulation checks.
We need to check two wall positions as well to make sure that sector movement is properly detected.
This commit is contained in:
Christoph Oelckers 2021-03-29 09:25:26 +02:00
parent 389d61d086
commit e0fe8d2ed9
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/core/intvec.h
View file

@ -18,6 +18,7 @@ struct vec2_t
vec2_t operator-(const vec2_t& other) const { return { x - other.x, y - other.y }; } vec2_t operator-(const vec2_t& other) const { return { x - other.x, y - other.y }; }
vec2_t& operator+=(const vec2_t& other) { x += other.x; y += other.y; return *this; }; vec2_t& operator+=(const vec2_t& other) { x += other.x; y += other.y; return *this; };
vec2_t& operator-=(const vec2_t& other) { x -= other.x; y -= other.y; return *this; }; vec2_t& operator-=(const vec2_t& other) { x -= other.x; y -= other.y; return *this; };
bool operator == (const vec2_t& other) const { return x == other.x && y == other.y; };
}; };
struct vec3_t struct vec3_t

5
source/core/sectorgeometry.cpp
View file

@ -304,6 +304,8 @@ void SectorGeometry::ValidateSector(unsigned int secnum, int plane)
sec->floorxpan_ == compare->floorxpan_ && sec->floorxpan_ == compare->floorxpan_ &&
sec->floorypan_ == compare->floorypan_ && sec->floorypan_ == compare->floorypan_ &&
sec->floorz == compare->floorz && sec->floorz == compare->floorz &&
wall[sec->wallptr].pos == data[secnum].poscompare &&
wall[wall[sec->wallptr].point2].pos == data[secnum].poscompare &&
!(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;
@ -316,10 +318,13 @@ void SectorGeometry::ValidateSector(unsigned int secnum, int plane)
sec->ceilingxpan_ == compare->ceilingxpan_ && sec->ceilingxpan_ == compare->ceilingxpan_ &&
sec->ceilingypan_ == compare->ceilingypan_ && sec->ceilingypan_ == compare->ceilingypan_ &&
sec->ceilingz == compare->ceilingz && sec->ceilingz == compare->ceilingz &&
wall[wall[sec->wallptr].point2].pos == data[secnum].poscompare &&
!(sec->dirty & 2) && data[secnum].planes[plane].vertices.Size()) return; !(sec->dirty & 2) && data[secnum].planes[plane].vertices.Size()) return;
sec->dirty &= ~2; sec->dirty &= ~2;
} }
*compare = *sec; *compare = *sec;
data[secnum].poscompare == wall[sec->wallptr].pos;
data[secnum].poscompare2 == wall[wall[sec->wallptr].point2].pos;
MakeVertices(secnum, plane); MakeVertices(secnum, plane);
} }

2
source/core/sectorgeometry.h
View file

@ -15,6 +15,8 @@ struct SectorGeometryData
{ {
SectorGeometryPlane planes[2]; SectorGeometryPlane planes[2];
sectortype compare{}; sectortype compare{};
vec2_t poscompare{ };
vec2_t poscompare2{ };
}; };
class SectorGeometry class SectorGeometry