Skip to content

TrenchBroom portal file (.prt) support #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

TrenchBroom portal file (.prt) support #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions src/sdhlt/sdHLVIS/vis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,7 +1326,7 @@ int VisLeafnumForPoint(const vec3_t point)
// FixPrt
// Imports portal file to vector, erases vis cache lines, overwrites portal file
// =====================================================================================
void FixPrt(const char* portalfile)
void FixPrt(const char* portalfile, bool tb_fix)
{
Log("\nReading portal file '%s'\n", portalfile);

Expand All @@ -1338,7 +1338,7 @@ void FixPrt(const char* portalfile)

if (!inputFileStream) //If import fails
{
Log("Failed reading portal file '%s', skipping optimization for J.A.C.K. map editor\n", portalfile);
Log("Failed reading portal file '%s', skipping optimization for J.A.C.K./TrenchBroom map editor\n", portalfile);
return;
}

Expand Down Expand Up @@ -1380,13 +1380,19 @@ void FixPrt(const char* portalfile)
}
if (skipFix)
{
Log("Skipping optimization for J.A.C.K. map editor\n");
Log("Skipping optimization for J.A.C.K./TrenchBroom map editor\n");
return;
}
prtVector.erase( //Deletes from string 3 until string before portal coordinates
prtVector.begin() + 2,
itPortalCoords);

if (tb_fix) // TB prt file format
{
prtVector[0] = PORTALFILE; // header
prtVector.insert(prtVector.begin() + 1, "0");
}

optimizedPortalFileLines = prtVector.size(); //Count lines after optimization

Log("Reduced %i lines to %i\n", portalFileLines, optimizedPortalFileLines);
Expand All @@ -1408,12 +1414,18 @@ void FixPrt(const char* portalfile)
outputFileStream << prtVector[i] << "\n"; //Print each string as a new line
}
outputFileStream.close();

Log("Optimization for J.A.C.K. map editor successful, writing portal file '%s'\n", portalfile);
if (tb_fix)
{
Log("Optimization for TrenchBroom map editor successful, writing portal file '%s'\n", portalfile);
}
else
{
Log("Optimization for J.A.C.K. map editor successful, writing portal file '%s'\n", portalfile);
}
}
else //If open fails
{
Log("Failed writing portal file '%s', skipping optimization for J.A.C.K. map editor\n", portalfile);
Log("Failed writing portal file '%s', skipping optimization for J.A.C.K./TrenchBroom map editor\n", portalfile);
return;
}

Expand All @@ -1429,6 +1441,7 @@ int main(const int argc, char** argv)
int i;
double start, end;
const char* mapname_from_arg = NULL;
bool tb_prt = false;

#ifdef ZHLT_NETVIS
g_Program = "netvis";
Expand Down Expand Up @@ -1659,6 +1672,10 @@ int main(const int argc, char** argv)
Usage();
}
}
else if (!strcasecmp (argv[i], "-tbprt"))
{
tb_prt = true;
}

else if (argv[i][0] == '-')
{
Expand Down Expand Up @@ -1983,7 +2000,7 @@ int main(const int argc, char** argv)

if (!g_nofixprt) //seedee
{
FixPrt(portalfile);
FixPrt(portalfile, tb_prt);
}

if (g_chart)
Expand Down
2 changes: 1 addition & 1 deletion src/sdhlt/sdHLVIS/vis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#define RVIS_LEVEL_1
#define RVIS_LEVEL_2

#define PORTALFILE "PRT1" // WTF?
#define PORTALFILE "PRT1" // Quake portal file header, required for TrenchBroom prt file

#define MAX_POINTS_ON_FIXED_WINDING 32

Expand Down