Renamed to Renderwüre, fixed HPPness and inclusion protection things, etc

analyzer/main.cpp

@@ -1,5 +1,5 @@
-#include <renderware/BinaryStream.hpp>
+#include <renderwure/BinaryStream.hpp>
-#include <renderware/TextureArchive.hpp>
+#include <renderwure/TextureArchive.hpp>
 
 #include <SFML/Graphics.hpp>
 

framework2/BinaryStream.cpp

@@ -1,4 +1,4 @@
-#include <renderware/BinaryStream.hpp>
+#include <renderwure/BinaryStream.hpp>
 
 #include <cstring>
 #include <iostream>

framework2/GTAData.cpp

@@ -1,6 +1,7 @@
-#include "engine/GTAData.h"
+#include <renderwure/engine/GTAData.hpp>
-#include "loaders/LoaderIPL.h"
+#include <renderwure/loaders/LoaderIPL.hpp>
-#include <loaders/LoaderDFF.h>
+#include <renderwure/loaders/LoaderDFF.hpp>
+
 #include <iostream>
 #include <fstream>
 #include <bits/algorithmfwd.h>

framework2/GTAEngine.cpp

@@ -1,5 +1,5 @@
-#include "engine/GTAEngine.h"
+#include <renderwure/engine/GTAEngine.hpp>
-#include "loaders/LoaderIPL.h"
+#include <renderwure/loaders/LoaderIPL.hpp>
 
 GTAEngine::GTAEngine(const std::string& path)
 : gameData(path)

framework2/LoaderCOL.cpp

@@ -1,4 +1,5 @@
-#include "loaders/LoaderCOL.h"
+#include <renderwure/loaders/LoaderCOL.hpp>
+
 #include <string>
 #include <fstream>
 

framework2/LoaderDFF.cpp

@@ -1,4 +1,4 @@
-#include "loaders/LoaderDFF.h"
+#include <renderwure/loaders/LoaderDFF.hpp>
 
 #include <iostream>
 

framework2/LoaderIMG.cpp

@@ -1,4 +1,5 @@
-#include "loaders/LoaderIMG.h"
+#include <renderwure/loaders/LoaderIMG.hpp>
+
 #include <cstring>
 
 LoaderIMG::LoaderIMG()

framework2/LoaderIPL.cpp

@@ -1,4 +1,4 @@
-#include "loaders/LoaderIPL.h"
+#include <renderwure/loaders/LoaderIPL.hpp>
 
 #include <fstream>
 #include <string>

framework2/TextureArchive.cpp

@@ -1,4 +1,4 @@
-#include <renderware/TextureArchive.hpp>
+#include <renderwure/TextureArchive.hpp>
 
 #include <cstring>
 #include <iostream>

framework2/TextureLoader.cpp

@@ -1,4 +1,4 @@
-#include "loaders/TextureLoader.h"
+#include <renderwure/loaders/TextureLoader.hpp>
 
 #include <fstream>
 #include <iostream>

framework2/include/renderwure/BinaryStream.hpp

@@ -1,4 +1,6 @@
 #pragma once
+#ifndef _BINARYSTREAM_HPP_
+#define _BINARYSTREAM_HPP_
 
 #include <string>
 #include <memory>
@@ -37,4 +39,6 @@ public:
 	static std::string sectionIdString(uint32_t id);
 };
 
-}
+}
+
+#endif

framework2/include/renderwure/TextureArchive.hpp

@@ -1,6 +1,8 @@
 #pragma once
+#ifndef _TEXTUREARCHIVE_HPP_
+#define _TEXTUREARCHIVE_HPP_
 
-#include <renderware/BinaryStream.hpp>
+#include <renderwure/BinaryStream.hpp>
 
 #include <vector>
 
@@ -43,4 +45,6 @@ public:
 	static std::unique_ptr<TextureArchive> create(BinaryStream &binaryStream);
 };
 
-}
+}
+
+#endif

framework2/include/renderwure/engine/GTAData.hpp

@@ -1,11 +1,14 @@
-#ifndef _GTADATA_H_
+#pragma once
-#define _GTADATA_H_
+#ifndef _GTADATA_HPP_
+#define _GTADATA_HPP_
+
+#include <renderwure/loaders/LoaderIMG.hpp>
+#include <renderwure/loaders/TextureLoader.hpp>
+#include <renderwure/loaders/LoaderDFF.hpp>
+
 #include <string>
 #include <map>
 #include <memory>
-#include <loaders/LoaderIMG.h>
-#include <loaders/TextureLoader.h>
-#include <loaders/LoaderDFF.h>
 
 /**
  * Handles loading and management of the Game's DAT

framework2/include/renderwure/engine/GTAEngine.hpp

@@ -1,10 +1,14 @@
-#ifndef _GTAENGINE_H_
+#pragma once
-#define _GTAENGINE_H_
+#ifndef _GTAENGINE_HPP_
-#include "GTAData.h"
+#define _GTAENGINE_HPP_
-#include <loaders/LoaderIPL.h>
+
-#include <vector>
+#include <renderwure/engine/GTAData.hpp>
+#include <renderwure/loaders/LoaderIPL.hpp>
+
 #include <glm/glm.hpp>
 
+#include <vector>
+
 /**
  * @class GTAEngine
  *  Provides a simple interface to the framework's internals

framework2/include/renderwure/loaders/LoaderCOL.hpp

@@ -1,5 +1,7 @@
-#ifndef _LOADERCOL_H_
+#pragma once
-#define _LOADERCOL_H_
+#ifndef _LOADERCOL_HPP_
+#define _LOADERCOL_HPP_
+
 #include <string>
 #include <vector>
 #include <glm/glm.hpp>

framework2/include/renderwure/loaders/LoaderDFF.hpp

@@ -1,4 +1,6 @@
 #pragma once
+#ifndef _LOADERDFF_HPP_
+#define _LOADERDFF_HPP_
 
 #define GLEW_STATIC
 #include <GL/glew.h>
@@ -55,3 +57,5 @@ private:
 public:
 	std::unique_ptr<Model> loadFromMemory(char *data);
 };
+
+#endif

framework2/include/renderwure/loaders/LoaderIMG.hpp

@@ -1,5 +1,6 @@
-#ifndef LoaderIMG_h__
+#pragma once
-#define LoaderIMG_h__
+#ifndef _LOADERIMG_HPP_
+#define _LOADERIMG_HPP_
 
 #include <iostream>
 #include <vector>

framework2/include/renderwure/loaders/LoaderIPL.hpp

@@ -1,5 +1,6 @@
-#ifndef LoaderIPL_h__
+#pragma once
-#define LoaderIPL_h__
+#ifndef _LOADERIPL_HPP_
+#define _LOADERIPL_HPP_
 
 #include <iostream>
 #include <vector>

framework2/include/renderwure/loaders/TextureLoader.hpp

@@ -1,4 +1,6 @@
 #pragma once
+#ifndef _TEXTURELOADER_HPP_
+#define _TEXTURELOADER_HPP_
 
 #define GLEW_STATIC
 #include <GL/glew.h>
@@ -17,3 +19,5 @@ public:
 
 	std::map<std::string, GLuint> textures;
 };
+
+#endif

viewer/main.cpp

@@ -1,8 +1,8 @@
 #define GLEW_STATIC
 #include <GL/glew.h>
 
-#include <engine/GTAEngine.h>
+#include <renderwure/engine/GTAEngine.hpp>
-#include <loaders/LoaderDFF.h>
+#include <renderwure/loaders/LoaderDFF.hpp>
 
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>