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

Remove unused functions & tests 

Fix test harness
This commit is contained in:
Jonathan 2022-01-17 14:35:18 -05:00
parent 53b4f640e2
commit 63b8608799
3 changed files with 4 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/qbsp/brush.hh
View File

@ -36,8 +36,6 @@ class mapbrush_t;
qplane3d Face_Plane(const face_t *face); qplane3d Face_Plane(const face_t *face);
int Brush_NumFaces(const brush_t *brush);
enum class rotation_t enum class rotation_t
{ {
none, none,
@ -51,4 +49,3 @@ void FreeBrushes(mapentity_t *ent);
int FindPlane(const qplane3d &plane, int *side); int FindPlane(const qplane3d &plane, int *side);
void FreeBrush(brush_t *brush);

15
qbsp/brush.cc
View File

@ -442,16 +442,6 @@ void FreeBrushes(mapentity_t *ent)
ent->brushes.clear(); ent->brushes.clear();
} }
/*
=====================
FreeBrush
=====================
*/
void FreeBrush(brush_t *brush)
{
delete brush;
}
/* /*
============================================================================== ==============================================================================
@ -789,11 +779,6 @@ std::optional<brush_t> LoadBrush(const mapentity_t *src, const mapbrush_t *mapbr
//============================================================================= //=============================================================================
int Brush_NumFaces(const brush_t *brush)
{
return brush->faces.size();
}
// temporary brush lists to hold sorting data // temporary brush lists to hold sorting data
struct brush_types_t struct brush_types_t
{ {

80
qbsp/test_qbsp.cc
View File

@ -7,15 +7,6 @@
// FIXME: Clear global data (planes, etc) between each test // FIXME: Clear global data (planes, etc) between each test
static face_t *Brush_FirstFaceWithTextureName(brush_t *brush, const char *texname)
{
for (face_t *face = brush->faces; face; face = face->next) {
if (map.texinfoTextureName(face->texinfo) == texname)
return face;
}
return nullptr;
}
static const mapface_t *Mapbrush_FirstFaceWithTextureName(const mapbrush_t *brush, const std::string &texname) static const mapface_t *Mapbrush_FirstFaceWithTextureName(const mapbrush_t *brush, const std::string &texname)
{ {
for (int i = 0; i < brush->numfaces; i++) { for (int i = 0; i < brush->numfaces; i++) {
@ -118,75 +109,12 @@ TEST(qbsp, duplicatePlanes)
mapentity_t worldspawn = LoadMap(mapWithDuplicatePlanes); mapentity_t worldspawn = LoadMap(mapWithDuplicatePlanes);
ASSERT_EQ(1, worldspawn.nummapbrushes); ASSERT_EQ(1, worldspawn.nummapbrushes);
EXPECT_EQ(0, worldspawn.numbrushes); EXPECT_EQ(0, worldspawn.brushes.size());
EXPECT_EQ(6, worldspawn.mapbrush(0).numfaces); EXPECT_EQ(6, worldspawn.mapbrush(0).numfaces);
brush_t *brush = LoadBrush(&worldspawn, &worldspawn.mapbrush(0), {CONTENTS_SOLID}, {}, rotation_t::none, 0); std::optional<brush_t> brush = LoadBrush(&worldspawn, &worldspawn.mapbrush(0), {CONTENTS_SOLID}, {}, rotation_t::none, 0);
ASSERT_NE(nullptr, brush); ASSERT_NE(std::nullopt, brush);
EXPECT_EQ(6, Brush_NumFaces(brush)); EXPECT_EQ(6, brush->faces.size());
FreeBrush(brush);
}
static brush_t *load128x128x32Brush()
{
/* 128x128x32 rectangular brush */
const char *map = R"(
{
"classname" "worldspawn"
{
( -64 -64 -16 ) ( -64 -63 -16 ) ( -64 -64 -15 ) __TB_empty 0 0 0 1 1
( 64 64 16 ) ( 64 64 17 ) ( 64 65 16 ) __TB_empty 0 0 0 1 1
( -64 -64 -16 ) ( -64 -64 -15 ) ( -63 -64 -16 ) __TB_empty 0 0 0 1 1
( 64 64 16 ) ( 65 64 16 ) ( 64 64 17 ) __TB_empty 0 0 0 1 1
( 64 64 16 ) ( 64 65 16 ) ( 65 64 16 ) __TB_empty 0 0 0 1 1
( -64 -64 -16 ) ( -63 -64 -16 ) ( -64 -63 -16 ) __TB_empty 0 0 0 1 1
}
}
)";
mapentity_t worldspawn = LoadMap(map);
Q_assert(1 == worldspawn.nummapbrushes);
brush_t *brush = LoadBrush(&worldspawn, &worldspawn.mapbrush(0), {CONTENTS_SOLID}, {}, rotation_t::none, 0);
Q_assert(nullptr != brush);
brush->contents = {CONTENTS_SOLID};
return brush;
}
static void checkForAllCubeNormals(const brush_t *brush)
{
const qvec3d wanted[6] = {{-1, 0, 0}, {1, 0, 0}, {0, -1, 0}, {0, 1, 0}, {0, 0, -1}, {0, 0, 1}};
bool found[6];
for (int i = 0; i < 6; i++) {
found[i] = false;
}
for (const face_t *face = brush->faces; face; face = face->next) {
const qplane3d faceplane = Face_Plane(face);
for (int i = 0; i < 6; i++) {
if (qv::epsilonEqual(wanted[i], faceplane.normal, NORMAL_EPSILON)) {
EXPECT_FALSE(found[i]);
found[i] = true;
}
}
}
for (int i = 0; i < 6; i++) {
EXPECT_TRUE(found[i]);
}
}
static void checkCube(const brush_t *brush)
{
EXPECT_EQ(6, Brush_NumFaces(brush));
checkForAllCubeNormals(brush);
EXPECT_EQ(contentflags_t{CONTENTS_SOLID}, brush->contents);
} }
/** /**