scuti/reflex2q3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

Added robust program options & prepared for entity conversion

Browse Source
This commit is contained in:
2017-06-18 07:44:42 -07:00
parent 728f6fba8b
commit ff1f57fdaa
3 changed files with 86 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ReflexToQ3/includes/oopless-parser.cpp
View File

@@ -103,32 +103,26 @@ vector<string> get_entity(ifstream &f) {
void parse_prefab(ifstream &f,
ofstream &out,
void (*b) (stringstream &, const vector<TPlanePoints> &),
EntityConverter &e) {
queue<vector<string> > &entities) {
string l;
getline(f, l);
if (l.find(KEYWORD_BRUSH) != string::npos) {
write(parse_brush<ifstream>(f), out, b);
} else if (l.find(KEYWORD_ENTITY) != string::npos) {
write(get_entity(f), out, b, e);
entities.push(get_entity(f));
}
}
bool convertmap(const char * const infile,
const char * const outfile,
void (*brushdef) (stringstream &, const vector<TPlanePoints> &),
const char * const entfile) {
queue<vector<string> > &entities) {
ifstream fin;
fin.open(infile);
if (!fin.good()){
cerr << "error: failed to open input file" << endl;
return false;
}
EntityConverter ec;
if (entfile != NULL) {
string ef(entfile);
string in(infile);
ec = EntityConverter(ef, in);
}
ofstream fout;
fout.open(outfile);
if (!fout.good()) {
@@ -141,9 +135,9 @@ bool convertmap(const char * const infile,
while (getline(fin, line)) {
if (line.find(KEYWORD_PREFAB) != string::npos ||
line.find(KEYWORD_GLOBAL) != string::npos) {
parse_prefab(fin, fout, brushdef, ec);
parse_prefab(fin, fout, brushdef, entities);
} else if (line.find(KEYWORD_ENTITY) != string::npos) {
write(get_entity(fin), fout, brushdef, ec);
entities.push(get_entity(fin));
} else if (line.find(KEYWORD_BRUSH) != string::npos) {
write(parse_brush<ifstream>(fin), fout, brushdef);
}