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

Fixed bug that added an extra index for a 3 vertex face.

Browse Source
This commit is contained in:
2017-05-05 18:08:44 -07:00
parent 9eb48c8ff8
commit 64c5032c93
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ReflexToQ3/wip/oopless-parser.cpp
View File

@ -92,6 +92,7 @@ vector<Eigen::Vector3f> parse_vertices(ifstream &f) {
vector<struct TFace> parse_face(ifstream &f) { vector<struct TFace> parse_face(ifstream &f) {
#define FIRSTCH(x) x[0] #define FIRSTCH(x) x[0]
#define SECONDCH(x) x[1]
// it is possible for the next line to be unrelated to faces // it is possible for the next line to be unrelated to faces
// so it is needed to reset the stream prior to reading // so it is needed to reset the stream prior to reading
// the new label, e.g '\tbrush'. // the new label, e.g '\tbrush'.
@ -102,7 +103,8 @@ vector<struct TFace> parse_face(ifstream &f) {
if (line.find(KEYWORD_VERTICES) != string::npos || if (line.find(KEYWORD_VERTICES) != string::npos ||
line.find(KEYWORD_BRUSH) != string::npos || line.find(KEYWORD_BRUSH) != string::npos ||
line.find(KEYWORD_ENTITY) != string::npos || line.find(KEYWORD_ENTITY) != string::npos ||
line.find(KEYWORD_PREFAB) != string::npos) { line.find(KEYWORD_PREFAB) != string::npos ||
line.find(KEYWORD_GLOBAL) != string::npos) {
f.seekg(pos); f.seekg(pos);
return output; return output;
} else { } else {
@ -110,6 +112,7 @@ vector<struct TFace> parse_face(ifstream &f) {
float *f = &x.m_fXOffset;; float *f = &x.m_fXOffset;;
stringstream ss(line); stringstream ss(line);
string fdata; string fdata;
bool hex = false;
unsigned int i = 0; unsigned int i = 0;
while (ss >> fdata) { while (ss >> fdata) {
if (i < 5) { if (i < 5) {
@ -120,14 +123,24 @@ vector<struct TFace> parse_face(ifstream &f) {
} }
// note: if there is a non-digit in the first 5 fields // note: if there is a non-digit in the first 5 fields
// then it qualifies as an illegal line. // then it qualifies as an illegal line.
} else if (i == 9) { } else if (4 < i && i < 8) {
;
} else {
if (isdigit(FIRSTCH(fdata)) || FIRSTCH(fdata) == '-') {
x.m_Indices.push_back(stoi(fdata)); x.m_Indices.push_back(stoi(fdata));
} else if (i == 8) {
// field #8 may either be the unidentified hex digit
// i.e there are 3 indices only,
// or it could be another index.
if (fdata.length() > 1 && SECONDCH(fdata) == 'x') {
// this is the unidentified hex digit.
// just it signify the texture at the end.
hex = true;
} else { } else {
x.m_Material = fdata; x.m_Indices.push_back(stoi(fdata));
} }
} else if ((i == 9 && hex) || i == 10) {
// it is a texture if it is field #9
// and the hex digit is already encountered
// or it is field #10.
x.m_Material = fdata;
} }
i++; i++;
} // end, per field iteration } // end, per field iteration
@ -186,7 +199,6 @@ bool convertmap(const char * const infile,
<< "\"classname\" \"worldspawn\"" << endl; << "\"classname\" \"worldspawn\"" << endl;
string line; string line;
while (getline(fin, line)) { while (getline(fin, line)) {
cout << line << endl;
if (line.find(KEYWORD_PREFAB) != string::npos || if (line.find(KEYWORD_PREFAB) != string::npos ||
line.find(KEYWORD_GLOBAL) != string::npos) { line.find(KEYWORD_GLOBAL) != string::npos) {
parse_prefab(fin, fout, brushdef); parse_prefab(fin, fout, brushdef);