stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move reading of extra vertices into separate function

Browse source
This commit is contained in:
MascaraSnake 2019-12-29 18:07:44 +01:00
parent 45ca959f97
commit 3839e95d63
1 changed files with 42 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/p_setup.c
View file

@ -1522,6 +1522,46 @@ static nodetype_t P_GetNodetype(const virtres_t *virt, virtlump_t *virtnodes)
return supported[nodetype] ? nodetype : NT_UNSUPPORTED; return supported[nodetype] ? nodetype : NT_UNSUPPORTED;
} }
// Extended node formats feature additional vertices; useful for OpenGL, but totally useless in gamelogic.
static boolean P_LoadExtraVertices(UINT8 *data)
{
UINT32 origvrtx = READUINT32(data);
UINT32 xtrvrtx = READUINT32(data);
line_t* ld = lines;
vertex_t *oldpos = vertexes;
ssize_t offset;
size_t i;
if (numvertexes != origvrtx) // If native vertex count doesn't match node original vertex count, bail out (broken data?).
{
CONS_Alert(CONS_WARNING, "Vertex count in map data and nodes differ!\n");
return false;
}
if (!xtrvrtx)
return true;
// If extra vertexes were generated, reallocate the vertex array and fix the pointers.
numvertexes += xtrvrtx;
vertexes = Z_Realloc(vertexes, numvertexes*sizeof(*vertexes), PU_LEVEL, NULL);
offset = (size_t)(vertexes - oldpos);
for (i = 0, ld = lines; i < numlines; i++, ld++)
{
ld->v1 += offset;
ld->v2 += offset;
}
// Read extra vertex data.
for (i = origvrtx; i < numvertexes; i++)
{
vertexes[i].x = READFIXED(data);
vertexes[i].y = READFIXED(data);
}
return true;
}
// Auxiliary function: Shrink node ID from 32-bit to 16-bit. // Auxiliary function: Shrink node ID from 32-bit to 16-bit.
static UINT16 ShrinkNodeID(UINT32 x) { static UINT16 ShrinkNodeID(UINT32 x) {
UINT16 mask = (x >> 16) & 0xC000; UINT16 mask = (x >> 16) & 0xC000;
@ -1555,41 +1595,11 @@ static void P_LoadExtendedNodes(UINT8 *data, boolean xgl3)
static void P_LoadExtendedBSP(UINT8 *data, nodetype_t nodetype) static void P_LoadExtendedBSP(UINT8 *data, nodetype_t nodetype)
{ {
size_t i, j, k; size_t i, k;
INT16 m; INT16 m;
// Extended node formats feature additional vertexes; useful for OpenGL, but totally useless in gamelogic. if (!P_LoadExtraVertices(data))
UINT32 origvrtx = READUINT32(data);
UINT32 xtrvrtx = READUINT32(data);
if (numvertexes != origvrtx) // If native vertex count doesn't match node original vertex count, bail out (broken data?).
{
CONS_Alert(CONS_WARNING, "Vertex count in map data and nodes differ!\n");
return; return;
}
if (xtrvrtx) // If extra vertexes were generated, reallocate the vertex array and fix the pointers.
{
line_t *ld = lines;
size_t oldpos = (size_t)vertexes;
ssize_t offset;
numvertexes += xtrvrtx;
vertexes = Z_Realloc(vertexes, numvertexes*sizeof(*vertexes), PU_LEVEL, NULL);
offset = ((size_t)vertexes) - oldpos;
for (i = 0, ld = lines; i < numlines; i++, ld++)
{
ld->v1 = (vertex_t*)((size_t)ld->v1 + offset);
ld->v2 = (vertex_t*)((size_t)ld->v2 + offset);
}
}
// Read vertex data.
for (i = origvrtx; i < numvertexes; i++)
{
vertexes[i].x = READFIXED(data);
vertexes[i].y = READFIXED(data);
}
// Subsectors // Subsectors
numsubsectors = READUINT32(data); numsubsectors = READUINT32(data);