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

Changed map parser so V8 inherits from v6

Browse Source
This commit is contained in:
2017-04-12 00:18:29 -07:00
parent add1138a78
commit 8689f24329
7 changed files with 324 additions and 480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ReflexToQ3/Makefile
View File

@ -5,19 +5,19 @@ CFLAGS=-std=c++11 -I"includes" -I"/usr/include/eigen3"
all: v6 v8 all: v6 v8
v6: planes.o brushdef.o mapparser.o v6: planes.o brushdef.o v6mapparser.o
$(CC) $^ main.cpp $(CFLAGS) -o $(EXV6) 2>error6.log $(CC) $^ main.cpp $(CFLAGS) -DV6 -o $(EXV6) 2>error6.log
v8: planes.o brushdef.o v8mapparser.o v8: planes.o brushdef.o v6mapparser.o v8mapparser.o
$(CC) $^ main.cpp $(CFLAGS) -o $(EXV8) 2>error8.log $(CC) $^ main.cpp $(CFLAGS) -DV8 -o $(EXV8) 2>error8.log
mapparser.o: includes/mapparser.cpp
$(CC) -c $^ $(CFLAGS)
v8mapparser.o: includes/v8mapparser.cpp v8mapparser.o: includes/v8mapparser.cpp
$(CC) -c $^ $(CFLAGS) $(CC) -c $^ $(CFLAGS)
brushdef.o: planes.o includes/brushdef.cpp v6mapparser.o: includes/v6mapparser.cpp
$(CC) -c $^ $(CFLAGS)
brushdef.o: includes/brushdef.cpp
$(CC) -c $^ $(CFLAGS) $(CC) -c $^ $(CFLAGS)
planes.o: includes/planes.cpp planes.o: includes/planes.cpp

42
ReflexToQ3/includes/mapparser.h
View File

@ -1,42 +0,0 @@
//
// Author: Michael Cameron
// Email: chronokun@hotmail.com
//
#ifndef __MAPPARSER_H__
#define __MAPPARSER_H__
// Includes
#include "worldspawn.h"
// enums
enum EParserState
{
PARSERSTATE_UNKNOWN,
PARSERSTATE_ENTITY,
PARSERSTATE_WORLDSPAWN,
PARSERSTATE_BRUSH,
PARSERSTATE_VERTEX,
PARSERSTATE_FACE
};
class CMapParser
{
// Variables
public:
TWorldSpawn m_WorldSpawn;
// Functions
public:
const bool LoadMap(const char* _kpcFileName);
protected:
EParserState ParseEntity(const std::string _Line);
EParserState ParseWorldSpawn(const std::string _Line);
EParserState ParseBrush(const std::string _Line);
EParserState ParseVertex(const std::string _Line);
EParserState ParseFace(const std::string _Line);
};
#endif

125
ReflexToQ3/includes/mapparser.cpp → ReflexToQ3/includes/v6mapparser.cpp
View File

@ -3,10 +3,9 @@
// Email: chronokun@hotmail.com // Email: chronokun@hotmail.com
// //
// Libraries Include
#include "libraries.h" #include "libraries.h"
// This Include #include "v6mapparser.hpp"
#include "mapparser.h" using namespace std;
#ifndef _MSC_VER #ifndef _MSC_VER
/* /*
@ -15,7 +14,7 @@
additionally, old versions of mingw may not be ok with strtok_r at all. additionally, old versions of mingw may not be ok with strtok_r at all.
*/ */
inline char *strtok_s(char* s, const char* delm, char** context) { inline char *strtok_s(char* s, const char* delm, char** context) {
return strtok_r(s, delm, context); return strtok_r(s, delm, context);
} }
inline char *strcpy_s(char *dest, const char *src) { inline char *strcpy_s(char *dest, const char *src) {
@ -23,7 +22,7 @@ inline char *strcpy_s(char *dest, const char *src) {
} }
#endif #endif
const bool CMapParser::LoadMap(const char* _kpcFileName) const bool V6MapParser::LoadMap(const char* _kpcFileName)
{ {
std::ifstream InFile; std::ifstream InFile;
EParserState eState = PARSERSTATE_UNKNOWN; EParserState eState = PARSERSTATE_UNKNOWN;
@ -46,11 +45,13 @@ const bool CMapParser::LoadMap(const char* _kpcFileName)
bAdvance = true; bAdvance = true;
if(eState == PARSERSTATE_UNKNOWN) if(eState == PARSERSTATE_UNKNOWN)
{ {
if(strcmp(Line.c_str(), "entity") == 0) if(Line.find(KEYWORD_ENTITY) != string::npos)
{ {
eState = PARSERSTATE_ENTITY; eState = PARSERSTATE_ENTITY;
continue; continue;
} } else {
cout << "Warning: PARSERSTATE_UNKNOWN and no cases met." << endl;
}
} }
else if(eState == PARSERSTATE_ENTITY) else if(eState == PARSERSTATE_ENTITY)
{ {
@ -92,7 +93,7 @@ const bool CMapParser::LoadMap(const char* _kpcFileName)
return(true); return(true);
} }
EParserState CMapParser::ParseEntity(const std::string _Line) EParserState V6MapParser::ParseEntity(const std::string _Line)
{ {
const size_t kszLineSize = 256; const size_t kszLineSize = 256;
char pcLine[kszLineSize]; char pcLine[kszLineSize];
@ -103,6 +104,10 @@ EParserState CMapParser::ParseEntity(const std::string _Line)
strcpy_s(pcLine, _Line.c_str()); strcpy_s(pcLine, _Line.c_str());
pcToken = strtok_s(pcLine, kpcDelim, &pcContext); pcToken = strtok_s(pcLine, kpcDelim, &pcContext);
if (_Line.find(KEYWORD_BRUSH) != string::npos) {
m_WorldSpawn.m_Brushes.push_back(TBrush());
return PARSERSTATE_BRUSH;
}
while(pcToken != nullptr) while(pcToken != nullptr)
{ {
if(strcmp(pcToken, "\ttype") == 0) if(strcmp(pcToken, "\ttype") == 0)
@ -125,35 +130,35 @@ EParserState CMapParser::ParseEntity(const std::string _Line)
return(PARSERSTATE_UNKNOWN); return(PARSERSTATE_UNKNOWN);
} }
EParserState CMapParser::ParseWorldSpawn(const std::string _Line) EParserState V6MapParser::ParseWorldSpawn(const std::string _Line)
{ {
if(strcmp(_Line.c_str(), "brush") == 0) if(_Line.find(KEYWORD_BRUSH) != string::npos)
{ {
this->m_WorldSpawn.m_Brushes.push_back(TBrush()); m_WorldSpawn.m_Brushes.push_back(TBrush());
return(PARSERSTATE_BRUSH); return(PARSERSTATE_BRUSH);
} }
return(PARSERSTATE_WORLDSPAWN); return(PARSERSTATE_WORLDSPAWN);
} }
EParserState CMapParser::ParseBrush(const std::string _Line) EParserState V6MapParser::ParseBrush(const std::string _Line)
{ {
if(strcmp(_Line.c_str(), "brush") == 0) if(_Line.find(KEYWORD_BRUSH) != string::npos)
{ {
this->m_WorldSpawn.m_Brushes.push_back(TBrush()); m_WorldSpawn.m_Brushes.push_back(TBrush());
return(PARSERSTATE_BRUSH); return(PARSERSTATE_BRUSH);
} }
if(strcmp(_Line.c_str(), "\tvertices") == 0) if(_Line.find(KEYWORD_VERTICES) != string::npos)
{ {
return(PARSERSTATE_VERTEX); return(PARSERSTATE_VERTEX);
} }
else if(strcmp(_Line.c_str(), "\tfaces") == 0) else if(_Line.find(KEYWORD_FACES) != string::npos)
{ {
return(PARSERSTATE_FACE); return(PARSERSTATE_FACE);
} }
return(PARSERSTATE_BRUSH); return(PARSERSTATE_BRUSH);
} }
EParserState CMapParser::ParseVertex(const std::string _Line) EParserState V6MapParser::ParseVertex(const std::string _Line)
{ {
const size_t kszLineSize = 2048; const size_t kszLineSize = 2048;
char pcLine[kszLineSize]; char pcLine[kszLineSize];
@ -163,10 +168,9 @@ EParserState CMapParser::ParseVertex(const std::string _Line)
strcpy_s(pcLine, _Line.c_str()); strcpy_s(pcLine, _Line.c_str());
pcToken = strtok_s(pcLine, kpcDelim, &pcContext); pcToken = strtok_s(pcLine, kpcDelim, &pcContext);
Eigen::Vector3f Vert; Eigen::Vector3f Vert;
int iTokenNum = 0; int iTokenNum = 0;
while(pcToken != nullptr) while(pcToken != NULL)
{ {
if(std::isdigit(pcToken[0], std::locale()) || pcToken[0] == '-') if(std::isdigit(pcToken[0], std::locale()) || pcToken[0] == '-')
{ {
@ -190,62 +194,43 @@ EParserState CMapParser::ParseVertex(const std::string _Line)
return(PARSERSTATE_BRUSH); return(PARSERSTATE_BRUSH);
} }
pcToken = strtok_s(nullptr, kpcDelim, &pcContext); pcToken = strtok_s(NULL, kpcDelim, &pcContext);
} }
m_WorldSpawn.m_Brushes[m_WorldSpawn.m_Brushes.size()-1].m_Vertices.push_back(Vert);
this->m_WorldSpawn.m_Brushes[this->m_WorldSpawn.m_Brushes.size()-1].m_Vertices.push_back(Vert);
return(PARSERSTATE_VERTEX); return(PARSERSTATE_VERTEX);
} }
EParserState CMapParser::ParseFace(const std::string _Line) EParserState V6MapParser::ParseFace(const std::string _Line) {
{ stringstream ss(_Line);
const size_t kszLineSize = 2048; string material;
char pcLine[kszLineSize]; vector<int> Indices;
const char* kpcDelim = " \t"; TFace Face;
char* pcToken; float *f = &Face.m_fXOffset;
char* pcContext; string data;
unsigned int i = 0;
strcpy_s(pcLine, _Line.c_str()); // For a primitive in Reflex, there is at least 9 and at most 10 fields.
pcToken = strtok_s(pcLine, kpcDelim, &pcContext); while (ss >> data) {
if (i < 5) {
int iTokenNum = 0; if (isdigit(data[0], std::locale()) || data[0] == '-') {
double dvalue = stod(data);
std::string material; *f = (float)dvalue;
f++;
std::vector<int> Indices; } else {
while(pcToken != nullptr) return PARSERSTATE_BRUSH;
{ }
if(iTokenNum < 5) } else if (i == 9) {
{ ;
if(std::isdigit(pcToken[0], std::locale()) || pcToken[0] == '-') } else {
{ if (isdigit(data[0], std::locale()) || data[0] == '-') {
double dValue = std::stod(pcToken); Indices.push_back(stoi(data));
} } else {
else material = data;
{ }
return(PARSERSTATE_BRUSH); }
} i++;
} }
else
{
if(std::isdigit(pcToken[0], std::locale()) || pcToken[0] == '-')
{
int iValue = std::stoi(pcToken);
Indices.push_back(iValue);
}
else
{
material = pcToken;
}
}
iTokenNum++;
pcToken = strtok_s(nullptr, kpcDelim, &pcContext);
}
TFace Face;
Face.m_Indices = Indices; Face.m_Indices = Indices;
Face.m_Material = material; Face.m_Material = material;
this->m_WorldSpawn.m_Brushes[this->m_WorldSpawn.m_Brushes.size()-1].m_Faces.push_back(Face); m_WorldSpawn.m_Brushes[m_WorldSpawn.m_Brushes.size()-1].m_Faces.push_back(Face);
return(PARSERSTATE_FACE); return(PARSERSTATE_FACE);
} }

42
ReflexToQ3/includes/v6mapparser.hpp Normal file
View File

@ -0,0 +1,42 @@
#ifndef __V6MAPPARSER_H__
#define __V6MAPPARSER_H__
#include "worldspawn.h"
#define KEYWORD_ENTITY "entity"
#define KEYWORD_BRUSH "brush"
#define KEYWORD_VERTICES "vertices"
#define KEYWORD_FACES "faces"
// Map Parser States
enum EParserState
{
PARSERSTATE_UNKNOWN, // 0
PARSERSTATE_ENTITY, // 1
PARSERSTATE_WORLDSPAWN, // 2
PARSERSTATE_BRUSH, // 3
PARSERSTATE_VERTEX, // 4
PARSERSTATE_FACE, // 5
PARSERSTATE_PREFAB // 6 - Only in V8
};
class V6MapParser
{
// Variables
public:
TWorldSpawn m_WorldSpawn;
// Functions
public:
const bool LoadMap(const char* _kpcFileName);
protected:
EParserState ParseEntity(const std::string _Line);
EParserState ParseWorldSpawn(const std::string _Line);
EParserState ParseBrush(const std::string _Line);
EParserState ParseVertex(const std::string _Line);
EParserState ParseFace(const std::string _Line);
};
#endif

181
ReflexToQ3/includes/v8mapparser.cpp
View File

@ -1,36 +1,9 @@
// #include "v8mapparser.hpp"
// Author: Michael Cameron #include <string>
// Email: chronokun@hotmail.com #include <iostream>
// #include <fstream>
#include "libraries.h"
#include "v8mapparser.h"
using namespace std; using namespace std;
const bool V8MapParser::LoadMap(const char* _kpcFileName) {
#ifndef _MSC_VER
/*
str*_s functions are microsoft only extensions of C string manip.
mingw is ok with strtok_r, but is not ok with strcpy_r
additionally, old versions of mingw may not be ok with strtok_r at all.
*/
inline char *strtok_s(char* s, const char* delm, char** context) {
return strtok_r(s, delm, context);
}
inline char *strcpy_s(char *dest, const char *src) {
return strcpy(dest, src);
}
#endif
#define KEYWORD_GLOBAL "\tglobal"
#define KEYWORD_PREFAB "\tprefab"
#define KEYWORD_ENTITY "\tentity"
#define KEYWORD_BRUSH "\tbrush"
#define KEYWORD_VERTICES "\tvertices"
#define KEYWORD_FACES "\tfaces"
const bool CMapParser::LoadMap(const char* _kpcFileName)
{
std::ifstream InFile; std::ifstream InFile;
EParserState eState = PARSERSTATE_UNKNOWN; EParserState eState = PARSERSTATE_UNKNOWN;
@ -107,7 +80,7 @@ const bool CMapParser::LoadMap(const char* _kpcFileName)
return(true); return(true);
} }
EParserState CMapParser::ParsePrefab(const std::string _Line) { EParserState V8MapParser::ParsePrefab(const std::string _Line) {
// this is going with the idea that its possible to correctly parse the map file // this is going with the idea that its possible to correctly parse the map file
// if prefabs are simply broken and de-indented. // if prefabs are simply broken and de-indented.
@ -118,145 +91,3 @@ EParserState CMapParser::ParsePrefab(const std::string _Line) {
return PARSERSTATE_BRUSH; return PARSERSTATE_BRUSH;
} }
} }
EParserState CMapParser::ParseEntity(const std::string _Line)
{
const size_t kszLineSize = 256;
char pcLine[kszLineSize];
const char* kpcDelim = " ";
char* pcToken;
char* pcContext;
strcpy_s(pcLine, _Line.c_str());
pcToken = strtok_s(pcLine, kpcDelim, &pcContext);
if (_Line.find(KEYWORD_BRUSH) != string::npos) {
m_WorldSpawn.m_Brushes.push_back(TBrush());
return PARSERSTATE_BRUSH;
}
while(pcToken != nullptr)
{
if(strcmp(pcToken, "\ttype") == 0)
{
pcToken = strtok_s(nullptr, kpcDelim, &pcContext);
if(strcmp(pcToken, "WorldSpawn") == 0)
{
return(PARSERSTATE_WORLDSPAWN);
}
else
{
return(PARSERSTATE_UNKNOWN);
}
}
else
{
return(PARSERSTATE_ENTITY);
}
}
return(PARSERSTATE_UNKNOWN);
}
EParserState CMapParser::ParseWorldSpawn(const std::string _Line)
{
if(_Line.find(KEYWORD_BRUSH) != string::npos)
{
m_WorldSpawn.m_Brushes.push_back(TBrush());
return(PARSERSTATE_BRUSH);
}
return(PARSERSTATE_WORLDSPAWN);
}
EParserState CMapParser::ParseBrush(const std::string _Line)
{
if(_Line.find(KEYWORD_BRUSH) != string::npos)
{
m_WorldSpawn.m_Brushes.push_back(TBrush());
return(PARSERSTATE_BRUSH);
}
if(_Line.find(KEYWORD_VERTICES) != string::npos)
{
return(PARSERSTATE_VERTEX);
}
else if(_Line.find(KEYWORD_FACES) != string::npos)
{
return(PARSERSTATE_FACE);
}
return(PARSERSTATE_BRUSH);
}
EParserState CMapParser::ParseVertex(const std::string _Line)
{
const size_t kszLineSize = 2048;
char pcLine[kszLineSize];
const char* kpcDelim = " \t";
char* pcToken;
char* pcContext;
strcpy_s(pcLine, _Line.c_str());
pcToken = strtok_s(pcLine, kpcDelim, &pcContext);
Eigen::Vector3f Vert;
int iTokenNum = 0;
while(pcToken != NULL)
{
if(std::isdigit(pcToken[0], std::locale()) || pcToken[0] == '-')
{
double dValue = std::stod(pcToken);
if(iTokenNum == 0)
{
Vert[X] = (float)dValue;
}
else if(iTokenNum == 1)
{
Vert[Y] = (float)dValue;
}
else if(iTokenNum == 2)
{
Vert[Z] = (float)dValue;
}
iTokenNum++;
}
else
{
return(PARSERSTATE_BRUSH);
}
pcToken = strtok_s(NULL, kpcDelim, &pcContext);
}
m_WorldSpawn.m_Brushes[m_WorldSpawn.m_Brushes.size()-1].m_Vertices.push_back(Vert);
return(PARSERSTATE_VERTEX);
}
EParserState CMapParser::ParseFace(const std::string _Line) {
stringstream ss(_Line);
string material;
vector<int> Indices;
TFace Face;
float *f = &Face.m_fXOffset;
string data;
unsigned int i = 0;
// For a primitive in Reflex, there is at least 9 and at most 10 fields.
while (ss >> data) {
if (i < 5) {
if (isdigit(data[0], std::locale()) || data[0] == '-') {
double dvalue = stod(data);
*f = (float)dvalue;
f++;
} else {
return PARSERSTATE_BRUSH;
}
} else if (i == 9) {
;
} else {
if (isdigit(data[0], std::locale()) || data[0] == '-') {
Indices.push_back(stoi(data));
} else {
material = data;
}
}
i++;
}
Face.m_Indices = Indices;
Face.m_Material = material;
m_WorldSpawn.m_Brushes[m_WorldSpawn.m_Brushes.size()-1].m_Faces.push_back(Face);
return(PARSERSTATE_FACE);
}

19
ReflexToQ3/includes/v8mapparser.hpp Normal file
View File

@ -0,0 +1,19 @@
#ifndef __V8MAPPARSER_HPP__
#define __V8MAPPARSER_HPP__
#include "v6mapparser.hpp"
#define KEYWORD_GLOBAL "global"
#define KEYWORD_PREFAB "prefab"
class V8MapParser : public V6MapParser {
public:
const bool LoadMap(const char *);
protected:
EParserState ParsePrefab(const std::string);
};
#endif

17
ReflexToQ3/main.cpp
View File

@ -3,10 +3,19 @@
// Email: chronokun@hotmail.com // Email: chronokun@hotmail.com
// //
// Libraries Include
#include "libraries.h" #include <vector>
// Local Includes #include <string>
#include "mapparser.h" #include <sstream>
#include <fstream>
#include <iostream>
#ifdef V8
#include "v8mapparser.hpp"
typedef V8MapParser CMapParser;
#else
#include "v6mapparser.hpp"
typedef V6MapParser CMapParser;
#endif
#include "brushdef.hpp" #include "brushdef.hpp"
using namespace std; using namespace std;