Clean up & headers no longer include libraries.h

This commit is contained in:
2017-04-12 00:24:54 -07:00
parent 8689f24329
commit d55de51b94
3 changed files with 6 additions and 46 deletions

View File

@ -1,4 +1,5 @@
#include "brushdef.hpp" #include "brushdef.hpp"
#include "libraries.h"
using namespace std; using namespace std;
// e.g GTK Radiant or older level editors. // e.g GTK Radiant or older level editors.

View File

@ -1,45 +0,0 @@
//
// Author: Michael Cameron
// Email: chronokun@hotmail.com
//
#pragma once
#ifndef __V8MAPPARSER_H__
#define __V8MAPPARSER_H__
// Includes
#include "worldspawn.h"
#include "libraries.h"
// enums
enum EParserState
{
PARSERSTATE_UNKNOWN, // 0
PARSERSTATE_ENTITY, // 1
PARSERSTATE_WORLDSPAWN, // 2
PARSERSTATE_BRUSH, // 3
PARSERSTATE_VERTEX, // 4
PARSERSTATE_FACE, // 5
PARSERSTATE_PREFAB // 6
};
class CMapParser
{
// Variables
public:
TWorldSpawn m_WorldSpawn;
// Functions
public:
const bool LoadMap(const char* _kpcFileName);
protected:
EParserState ParsePrefab(const std::string _Line);
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

View File

@ -5,7 +5,11 @@
#ifndef __WORLDSPAWN_H__ #ifndef __WORLDSPAWN_H__
#define __WORLDSPAWN_H__ #define __WORLDSPAWN_H__
#include "libraries.h"
#include <vector>
#include <string>
#include <Eigen/Core>
struct TFace struct TFace
{ {
float m_fXOffset; float m_fXOffset;