olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qbsp: move BSPX BRUSHLIST struct types out to bspfile.hh

This commit is contained in:
Eric Wasylishen 2021-09-25 15:42:42 -06:00
parent f7c0c80a26
commit f1744118e2
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/common/bspfile.hh
View File

@ -714,6 +714,27 @@ typedef struct bspxentry_s
struct bspxentry_s *next;
} bspxentry_t;
// BRUSHLIST BSPX lump
struct bspxbrushes_permodel {
int32_t ver;
int32_t modelnum;
int32_t numbrushes;
int32_t numfaces;
};
struct bspxbrushes_perbrush {
float mins[3];
float maxs[3];
int16_t contents;
uint16_t numfaces;
};
struct bspxbrushes_perface {
float normal[3];
float dist;
};
/* ========================================================================= */
struct bsp29_t {
int nummodels;
dmodelq1_t *dmodels_q;

23
qbsp/qbsp.cc
View File

@ -515,26 +515,7 @@ void BSPX_Brushes_AddModel(struct bspxbrushes_s *ctx, int modelnum, brush_t *bru
brush_t *b;
face_t *f;
struct
{
int ver;
int modelnum;
int numbrushes;
int numfaces;
} permodel;
struct
{
float mins[3];
float maxs[3];
short contents;
unsigned short numfaces;
} perbrush;
struct
{
float normal[3];
float dist;
} perface;
bspxbrushes_permodel permodel;
permodel.numbrushes = 0;
permodel.numfaces = 0;
for (b = brushes; b; b = b->next)
@ -559,6 +540,7 @@ void BSPX_Brushes_AddModel(struct bspxbrushes_s *ctx, int modelnum, brush_t *bru
for (b = brushes; b; b = b->next)
{
bspxbrushes_perbrush perbrush;
perbrush.numfaces = 0;
for (f = b->faces; f; f = f->next)
{
@ -605,6 +587,7 @@ void BSPX_Brushes_AddModel(struct bspxbrushes_s *ctx, int modelnum, brush_t *bru
for (f = b->faces; f; f = f->next)
{
bspxbrushes_perface perface;
/*skip axial*/
if (fabs(map.planes[f->planenum].normal[0]) == 1 ||
fabs(map.planes[f->planenum].normal[1]) == 1 ||