From 5dc40cb07b97d4c196d822e3e62fc65688ddd938 Mon Sep 17 00:00:00 2001 From: Daniel Evans Date: Fri, 20 Dec 2013 14:03:32 +0000 Subject: [PATCH] Removed redundant include dirs for framework2 --- analyzer/main.cpp | 4 ++-- datadump/main.cpp | 8 ++++---- .../include/{renderwure => }/BinaryStream.hpp | 0 .../{renderwure => }/TextureArchive.hpp | 2 +- .../include/{renderwure => }/ai/AIGraph.hpp | 2 +- .../{renderwure => }/ai/GTAAIController.hpp | 0 .../include/{renderwure => }/ai/GTAAINode.hpp | 0 .../ai/GTADefaultAIController.hpp | 2 +- .../ai/GTAPlayerAIController.hpp | 2 +- .../{renderwure => }/data/CollisionModel.hpp | 0 .../{renderwure => }/data/InstanceData.hpp | 0 .../{renderwure => }/data/ObjectData.hpp | 0 .../include/{renderwure => }/data/PathData.hpp | 0 .../{renderwure => }/engine/Animator.hpp | 0 .../{renderwure => }/engine/GTAData.hpp | 18 +++++++++--------- .../{renderwure => }/engine/GTAEngine.hpp | 10 +++++----- .../{renderwure => }/engine/GTAObject.hpp | 6 +++--- .../{renderwure => }/engine/GTATypes.hpp | 0 .../{renderwure => }/loaders/LoaderCOL.hpp | 2 +- .../{renderwure => }/loaders/LoaderDFF.hpp | 2 +- .../{renderwure => }/loaders/LoaderIDE.hpp | 4 ++-- .../{renderwure => }/loaders/LoaderIFP.hpp | 0 .../{renderwure => }/loaders/LoaderIMG.hpp | 0 .../{renderwure => }/loaders/LoaderIPL.hpp | 2 +- .../{renderwure => }/loaders/TextureLoader.hpp | 2 +- .../{renderwure => }/loaders/WeatherLoader.hpp | 2 +- .../{renderwure => }/loaders/rwbinarystream.h | 0 .../{renderwure => }/objects/GTACharacter.hpp | 2 +- .../{renderwure => }/objects/GTAInstance.hpp | 2 +- .../{renderwure => }/objects/GTAVehicle.hpp | 4 ++-- .../{renderwure => }/objects/VehicleInfo.hpp | 0 .../{renderwure => }/render/DebugDraw.hpp | 0 .../{renderwure => }/render/GTARenderer.hpp | 2 +- .../include/{renderwure => }/render/Model.hpp | 2 +- .../{renderwure => }/render/TextureAtlas.hpp | 0 .../{renderwure => }/render/ViewCamera.hpp | 0 .../{renderwure => }/render/ViewFrustum.hpp | 0 framework2/src/BinaryStream.cpp | 2 +- framework2/src/TextureArchive.cpp | 2 +- framework2/src/ai/AIGraph.cpp | 6 +++--- framework2/src/ai/GTAAIController.cpp | 4 ++-- framework2/src/ai/GTAAINode.cpp | 2 +- framework2/src/ai/GTADefaultAIController.cpp | 10 +++++----- framework2/src/ai/GTAPlayerAIController.cpp | 8 ++++---- framework2/src/engine/Animator.cpp | 8 ++++---- framework2/src/engine/GTAData.cpp | 14 +++++++------- framework2/src/engine/GTAEngine.cpp | 16 ++++++++-------- framework2/src/engine/GTAObject.cpp | 8 ++++---- framework2/src/loaders/LoaderCOL.cpp | 2 +- framework2/src/loaders/LoaderDFF.cpp | 6 +++--- framework2/src/loaders/LoaderIDE.cpp | 2 +- framework2/src/loaders/LoaderIFP.cpp | 2 +- framework2/src/loaders/LoaderIMG.cpp | 2 +- framework2/src/loaders/LoaderIPL.cpp | 2 +- framework2/src/loaders/TextureLoader.cpp | 6 +++--- framework2/src/loaders/WeatherLoader.cpp | 2 +- framework2/src/objects/GTACharacter.cpp | 10 +++++----- framework2/src/objects/GTAInstance.cpp | 6 +++--- framework2/src/objects/GTAVehicle.cpp | 8 ++++---- framework2/src/render/DebugDraw.cpp | 2 +- framework2/src/render/GTARenderer.cpp | 18 +++++++++--------- framework2/src/render/Model.cpp | 2 +- framework2/src/render/TextureAtlas.cpp | 2 +- game/main.cpp | 14 +++++++------- tests/test_atlas.cpp | 2 +- tests/test_globals.hpp | 2 +- tests/test_object.cpp | 4 ++-- tests/test_world.cpp | 2 +- viewer/main.cpp | 14 +++++++------- 69 files changed, 135 insertions(+), 135 deletions(-) rename framework2/include/{renderwure => }/BinaryStream.hpp (100%) rename framework2/include/{renderwure => }/TextureArchive.hpp (95%) rename framework2/include/{renderwure => }/ai/AIGraph.hpp (88%) rename framework2/include/{renderwure => }/ai/GTAAIController.hpp (100%) rename framework2/include/{renderwure => }/ai/GTAAINode.hpp (100%) rename framework2/include/{renderwure => }/ai/GTADefaultAIController.hpp (93%) rename framework2/include/{renderwure => }/ai/GTAPlayerAIController.hpp (92%) rename framework2/include/{renderwure => }/data/CollisionModel.hpp (100%) rename framework2/include/{renderwure => }/data/InstanceData.hpp (100%) rename framework2/include/{renderwure => }/data/ObjectData.hpp (100%) rename framework2/include/{renderwure => }/data/PathData.hpp (100%) rename framework2/include/{renderwure => }/engine/Animator.hpp (100%) rename framework2/include/{renderwure => }/engine/GTAData.hpp (91%) rename framework2/include/{renderwure => }/engine/GTAEngine.hpp (93%) rename framework2/include/{renderwure => }/engine/GTAObject.hpp (91%) rename framework2/include/{renderwure => }/engine/GTATypes.hpp (100%) rename framework2/include/{renderwure => }/loaders/LoaderCOL.hpp (90%) rename framework2/include/{renderwure => }/loaders/LoaderDFF.hpp (89%) rename framework2/include/{renderwure => }/loaders/LoaderIDE.hpp (86%) rename framework2/include/{renderwure => }/loaders/LoaderIFP.hpp (100%) rename framework2/include/{renderwure => }/loaders/LoaderIMG.hpp (100%) rename framework2/include/{renderwure => }/loaders/LoaderIPL.hpp (95%) rename framework2/include/{renderwure => }/loaders/TextureLoader.hpp (87%) rename framework2/include/{renderwure => }/loaders/WeatherLoader.hpp (96%) rename framework2/include/{renderwure => }/loaders/rwbinarystream.h (100%) rename framework2/include/{renderwure => }/objects/GTACharacter.hpp (97%) rename framework2/include/{renderwure => }/objects/GTAInstance.hpp (93%) rename framework2/include/{renderwure => }/objects/GTAVehicle.hpp (94%) rename framework2/include/{renderwure => }/objects/VehicleInfo.hpp (100%) rename framework2/include/{renderwure => }/render/DebugDraw.hpp (100%) rename framework2/include/{renderwure => }/render/GTARenderer.hpp (97%) rename framework2/include/{renderwure => }/render/Model.hpp (97%) rename framework2/include/{renderwure => }/render/TextureAtlas.hpp (100%) rename framework2/include/{renderwure => }/render/ViewCamera.hpp (100%) rename framework2/include/{renderwure => }/render/ViewFrustum.hpp (100%) diff --git a/analyzer/main.cpp b/analyzer/main.cpp index cf6987c9..65d1fd9b 100644 --- a/analyzer/main.cpp +++ b/analyzer/main.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include diff --git a/datadump/main.cpp b/datadump/main.cpp index c137a0fe..06bd9d3e 100644 --- a/datadump/main.cpp +++ b/datadump/main.cpp @@ -2,10 +2,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include using RW::BSSectionHeader; using RW::BSFrameList; diff --git a/framework2/include/renderwure/BinaryStream.hpp b/framework2/include/BinaryStream.hpp similarity index 100% rename from framework2/include/renderwure/BinaryStream.hpp rename to framework2/include/BinaryStream.hpp diff --git a/framework2/include/renderwure/TextureArchive.hpp b/framework2/include/TextureArchive.hpp similarity index 95% rename from framework2/include/renderwure/TextureArchive.hpp rename to framework2/include/TextureArchive.hpp index bd689b03..c30bfc4f 100644 --- a/framework2/include/renderwure/TextureArchive.hpp +++ b/framework2/include/TextureArchive.hpp @@ -2,7 +2,7 @@ #ifndef _TEXTUREARCHIVE_HPP_ #define _TEXTUREARCHIVE_HPP_ -#include +#include #include diff --git a/framework2/include/renderwure/ai/AIGraph.hpp b/framework2/include/ai/AIGraph.hpp similarity index 88% rename from framework2/include/renderwure/ai/AIGraph.hpp rename to framework2/include/ai/AIGraph.hpp index 7802da83..09d344e9 100644 --- a/framework2/include/renderwure/ai/AIGraph.hpp +++ b/framework2/include/ai/AIGraph.hpp @@ -3,7 +3,7 @@ #define _AIGRAPH_HPP_ #include #include -#include +#include struct GTAInstance; struct GTAAINode; diff --git a/framework2/include/renderwure/ai/GTAAIController.hpp b/framework2/include/ai/GTAAIController.hpp similarity index 100% rename from framework2/include/renderwure/ai/GTAAIController.hpp rename to framework2/include/ai/GTAAIController.hpp diff --git a/framework2/include/renderwure/ai/GTAAINode.hpp b/framework2/include/ai/GTAAINode.hpp similarity index 100% rename from framework2/include/renderwure/ai/GTAAINode.hpp rename to framework2/include/ai/GTAAINode.hpp diff --git a/framework2/include/renderwure/ai/GTADefaultAIController.hpp b/framework2/include/ai/GTADefaultAIController.hpp similarity index 93% rename from framework2/include/renderwure/ai/GTADefaultAIController.hpp rename to framework2/include/ai/GTADefaultAIController.hpp index a7d1531b..e89e2ab0 100644 --- a/framework2/include/renderwure/ai/GTADefaultAIController.hpp +++ b/framework2/include/ai/GTADefaultAIController.hpp @@ -1,7 +1,7 @@ #pragma once #ifndef _GTADEFAULTAICONTROLLER_HPP_ #define _GTADEFAULTAICONTROLLER_HPP_ -#include "renderwure/ai/GTAAIController.hpp" +#include "ai/GTAAIController.hpp" #include struct GTAAINode; diff --git a/framework2/include/renderwure/ai/GTAPlayerAIController.hpp b/framework2/include/ai/GTAPlayerAIController.hpp similarity index 92% rename from framework2/include/renderwure/ai/GTAPlayerAIController.hpp rename to framework2/include/ai/GTAPlayerAIController.hpp index ef5e8685..7c5fb046 100644 --- a/framework2/include/renderwure/ai/GTAPlayerAIController.hpp +++ b/framework2/include/ai/GTAPlayerAIController.hpp @@ -1,7 +1,7 @@ #pragma once #ifndef _GTAPLAYERAICONTROLLER_HPP_ #define _GTAPLAYERAICONTROLLER_HPP_ -#include "renderwure/ai/GTAAIController.hpp" +#include "ai/GTAAIController.hpp" class GTAPlayerAIController : public GTAAIController { diff --git a/framework2/include/renderwure/data/CollisionModel.hpp b/framework2/include/data/CollisionModel.hpp similarity index 100% rename from framework2/include/renderwure/data/CollisionModel.hpp rename to framework2/include/data/CollisionModel.hpp diff --git a/framework2/include/renderwure/data/InstanceData.hpp b/framework2/include/data/InstanceData.hpp similarity index 100% rename from framework2/include/renderwure/data/InstanceData.hpp rename to framework2/include/data/InstanceData.hpp diff --git a/framework2/include/renderwure/data/ObjectData.hpp b/framework2/include/data/ObjectData.hpp similarity index 100% rename from framework2/include/renderwure/data/ObjectData.hpp rename to framework2/include/data/ObjectData.hpp diff --git a/framework2/include/renderwure/data/PathData.hpp b/framework2/include/data/PathData.hpp similarity index 100% rename from framework2/include/renderwure/data/PathData.hpp rename to framework2/include/data/PathData.hpp diff --git a/framework2/include/renderwure/engine/Animator.hpp b/framework2/include/engine/Animator.hpp similarity index 100% rename from framework2/include/renderwure/engine/Animator.hpp rename to framework2/include/engine/Animator.hpp diff --git a/framework2/include/renderwure/engine/GTAData.hpp b/framework2/include/engine/GTAData.hpp similarity index 91% rename from framework2/include/renderwure/engine/GTAData.hpp rename to framework2/include/engine/GTAData.hpp index 7555e9a8..ca6987c2 100644 --- a/framework2/include/renderwure/engine/GTAData.hpp +++ b/framework2/include/engine/GTAData.hpp @@ -2,15 +2,15 @@ #ifndef _GTADATA_HPP_ #define _GTADATA_HPP_ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/framework2/include/renderwure/engine/GTAEngine.hpp b/framework2/include/engine/GTAEngine.hpp similarity index 93% rename from framework2/include/renderwure/engine/GTAEngine.hpp rename to framework2/include/engine/GTAEngine.hpp index d06df3d5..dd472ea5 100644 --- a/framework2/include/renderwure/engine/GTAEngine.hpp +++ b/framework2/include/engine/GTAEngine.hpp @@ -2,11 +2,11 @@ #ifndef _GTAENGINE_HPP_ #define _GTAENGINE_HPP_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class GTAObject; class GTACharacter; diff --git a/framework2/include/renderwure/engine/GTAObject.hpp b/framework2/include/engine/GTAObject.hpp similarity index 91% rename from framework2/include/renderwure/engine/GTAObject.hpp rename to framework2/include/engine/GTAObject.hpp index 6337ab49..69441a00 100644 --- a/framework2/include/renderwure/engine/GTAObject.hpp +++ b/framework2/include/engine/GTAObject.hpp @@ -2,9 +2,9 @@ #ifndef _GTAOBJECT_HPP_ #define _GTAOBJECT_HPP_ -#include -#include -#include +#include +#include +#include #include #include diff --git a/framework2/include/renderwure/engine/GTATypes.hpp b/framework2/include/engine/GTATypes.hpp similarity index 100% rename from framework2/include/renderwure/engine/GTATypes.hpp rename to framework2/include/engine/GTATypes.hpp diff --git a/framework2/include/renderwure/loaders/LoaderCOL.hpp b/framework2/include/loaders/LoaderCOL.hpp similarity index 90% rename from framework2/include/renderwure/loaders/LoaderCOL.hpp rename to framework2/include/loaders/LoaderCOL.hpp index 20d22038..62cb57d7 100644 --- a/framework2/include/renderwure/loaders/LoaderCOL.hpp +++ b/framework2/include/loaders/LoaderCOL.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include /** * @class LoaderCOL diff --git a/framework2/include/renderwure/loaders/LoaderDFF.hpp b/framework2/include/loaders/LoaderDFF.hpp similarity index 89% rename from framework2/include/renderwure/loaders/LoaderDFF.hpp rename to framework2/include/loaders/LoaderDFF.hpp index fbf1bff0..b788972b 100644 --- a/framework2/include/renderwure/loaders/LoaderDFF.hpp +++ b/framework2/include/loaders/LoaderDFF.hpp @@ -5,7 +5,7 @@ #define GLEW_STATIC #include -#include +#include #include #include diff --git a/framework2/include/renderwure/loaders/LoaderIDE.hpp b/framework2/include/loaders/LoaderIDE.hpp similarity index 86% rename from framework2/include/renderwure/loaders/LoaderIDE.hpp rename to framework2/include/loaders/LoaderIDE.hpp index 488ca83e..e2afeb4f 100644 --- a/framework2/include/renderwure/loaders/LoaderIDE.hpp +++ b/framework2/include/loaders/LoaderIDE.hpp @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include class LoaderIDE { diff --git a/framework2/include/renderwure/loaders/LoaderIFP.hpp b/framework2/include/loaders/LoaderIFP.hpp similarity index 100% rename from framework2/include/renderwure/loaders/LoaderIFP.hpp rename to framework2/include/loaders/LoaderIFP.hpp diff --git a/framework2/include/renderwure/loaders/LoaderIMG.hpp b/framework2/include/loaders/LoaderIMG.hpp similarity index 100% rename from framework2/include/renderwure/loaders/LoaderIMG.hpp rename to framework2/include/loaders/LoaderIMG.hpp diff --git a/framework2/include/renderwure/loaders/LoaderIPL.hpp b/framework2/include/loaders/LoaderIPL.hpp similarity index 95% rename from framework2/include/renderwure/loaders/LoaderIPL.hpp rename to framework2/include/loaders/LoaderIPL.hpp index 28fd722b..b1232c52 100644 --- a/framework2/include/renderwure/loaders/LoaderIPL.hpp +++ b/framework2/include/loaders/LoaderIPL.hpp @@ -1,6 +1,6 @@ #ifndef _LOADERIPL_HPP_ #define _LOADERIPL_HPP_ -#include +#include #include #include diff --git a/framework2/include/renderwure/loaders/TextureLoader.hpp b/framework2/include/loaders/TextureLoader.hpp similarity index 87% rename from framework2/include/renderwure/loaders/TextureLoader.hpp rename to framework2/include/loaders/TextureLoader.hpp index e7bc2700..22f3addf 100644 --- a/framework2/include/renderwure/loaders/TextureLoader.hpp +++ b/framework2/include/loaders/TextureLoader.hpp @@ -5,7 +5,7 @@ #define GLEW_STATIC #include -#include +#include #include #include diff --git a/framework2/include/renderwure/loaders/WeatherLoader.hpp b/framework2/include/loaders/WeatherLoader.hpp similarity index 96% rename from framework2/include/renderwure/loaders/WeatherLoader.hpp rename to framework2/include/loaders/WeatherLoader.hpp index fa3097c8..88034df5 100644 --- a/framework2/include/renderwure/loaders/WeatherLoader.hpp +++ b/framework2/include/loaders/WeatherLoader.hpp @@ -2,7 +2,7 @@ #ifndef _WEATHERLOADER_HPP_ #define _WEATHERLOADER_HPP_ -#include +#include #include #include diff --git a/framework2/include/renderwure/loaders/rwbinarystream.h b/framework2/include/loaders/rwbinarystream.h similarity index 100% rename from framework2/include/renderwure/loaders/rwbinarystream.h rename to framework2/include/loaders/rwbinarystream.h diff --git a/framework2/include/renderwure/objects/GTACharacter.hpp b/framework2/include/objects/GTACharacter.hpp similarity index 97% rename from framework2/include/renderwure/objects/GTACharacter.hpp rename to framework2/include/objects/GTACharacter.hpp index b8787277..a2e66448 100644 --- a/framework2/include/renderwure/objects/GTACharacter.hpp +++ b/framework2/include/objects/GTACharacter.hpp @@ -1,7 +1,7 @@ #pragma once #ifndef _GTACHARACTER_HPP_ #define _GTACHARACTER_HPP_ -#include +#include #include #include #include diff --git a/framework2/include/renderwure/objects/GTAInstance.hpp b/framework2/include/objects/GTAInstance.hpp similarity index 93% rename from framework2/include/renderwure/objects/GTAInstance.hpp rename to framework2/include/objects/GTAInstance.hpp index 153f59dd..63be185b 100644 --- a/framework2/include/renderwure/objects/GTAInstance.hpp +++ b/framework2/include/objects/GTAInstance.hpp @@ -1,7 +1,7 @@ #pragma once #ifndef _GTAINSTANCE_HPP_ #define _GTAINSTANCE_HPP_ -#include +#include /** * @struct GTAInstance diff --git a/framework2/include/renderwure/objects/GTAVehicle.hpp b/framework2/include/objects/GTAVehicle.hpp similarity index 94% rename from framework2/include/renderwure/objects/GTAVehicle.hpp rename to framework2/include/objects/GTAVehicle.hpp index ebbe38e7..b54332dc 100644 --- a/framework2/include/renderwure/objects/GTAVehicle.hpp +++ b/framework2/include/objects/GTAVehicle.hpp @@ -1,10 +1,10 @@ #pragma once #ifndef _GTAVEHICLE_HPP_ #define _GTAVEHICLE_HPP_ -#include +#include #include #include -#include +#include /** * @class GTAVehicle diff --git a/framework2/include/renderwure/objects/VehicleInfo.hpp b/framework2/include/objects/VehicleInfo.hpp similarity index 100% rename from framework2/include/renderwure/objects/VehicleInfo.hpp rename to framework2/include/objects/VehicleInfo.hpp diff --git a/framework2/include/renderwure/render/DebugDraw.hpp b/framework2/include/render/DebugDraw.hpp similarity index 100% rename from framework2/include/renderwure/render/DebugDraw.hpp rename to framework2/include/render/DebugDraw.hpp diff --git a/framework2/include/renderwure/render/GTARenderer.hpp b/framework2/include/render/GTARenderer.hpp similarity index 97% rename from framework2/include/renderwure/render/GTARenderer.hpp rename to framework2/include/render/GTARenderer.hpp index a71f8a03..dee142a3 100644 --- a/framework2/include/renderwure/render/GTARenderer.hpp +++ b/framework2/include/render/GTARenderer.hpp @@ -6,7 +6,7 @@ #include #include -#include +#include class Model; class GTAEngine; diff --git a/framework2/include/renderwure/render/Model.hpp b/framework2/include/render/Model.hpp similarity index 97% rename from framework2/include/renderwure/render/Model.hpp rename to framework2/include/render/Model.hpp index 9bb4b74c..25205099 100644 --- a/framework2/include/renderwure/render/Model.hpp +++ b/framework2/include/render/Model.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include class Model { diff --git a/framework2/include/renderwure/render/TextureAtlas.hpp b/framework2/include/render/TextureAtlas.hpp similarity index 100% rename from framework2/include/renderwure/render/TextureAtlas.hpp rename to framework2/include/render/TextureAtlas.hpp diff --git a/framework2/include/renderwure/render/ViewCamera.hpp b/framework2/include/render/ViewCamera.hpp similarity index 100% rename from framework2/include/renderwure/render/ViewCamera.hpp rename to framework2/include/render/ViewCamera.hpp diff --git a/framework2/include/renderwure/render/ViewFrustum.hpp b/framework2/include/render/ViewFrustum.hpp similarity index 100% rename from framework2/include/renderwure/render/ViewFrustum.hpp rename to framework2/include/render/ViewFrustum.hpp diff --git a/framework2/src/BinaryStream.cpp b/framework2/src/BinaryStream.cpp index 23bf9b8d..8678a95f 100644 --- a/framework2/src/BinaryStream.cpp +++ b/framework2/src/BinaryStream.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/framework2/src/TextureArchive.cpp b/framework2/src/TextureArchive.cpp index 755af5dc..2a1c197c 100644 --- a/framework2/src/TextureArchive.cpp +++ b/framework2/src/TextureArchive.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/framework2/src/ai/AIGraph.cpp b/framework2/src/ai/AIGraph.cpp index f6843ec6..dcec36b1 100644 --- a/framework2/src/ai/AIGraph.cpp +++ b/framework2/src/ai/AIGraph.cpp @@ -1,6 +1,6 @@ -#include "renderwure/ai/AIGraph.hpp" -#include "renderwure/objects/GTAInstance.hpp" -#include "renderwure/ai/GTAAINode.hpp" +#include "ai/AIGraph.hpp" +#include "objects/GTAInstance.hpp" +#include "ai/GTAAINode.hpp" void AIGraph::createPathNodes(const glm::vec3& position, const glm::quat& rotation, PathData& path) { diff --git a/framework2/src/ai/GTAAIController.cpp b/framework2/src/ai/GTAAIController.cpp index 5c503058..4e11fee1 100644 --- a/framework2/src/ai/GTAAIController.cpp +++ b/framework2/src/ai/GTAAIController.cpp @@ -1,5 +1,5 @@ -#include "renderwure/ai/GTAAIController.hpp" -#include +#include +#include GTAAIController::GTAAIController(GTACharacter* character) : character(character) diff --git a/framework2/src/ai/GTAAINode.cpp b/framework2/src/ai/GTAAINode.cpp index 0e9b325f..004ee63c 100644 --- a/framework2/src/ai/GTAAINode.cpp +++ b/framework2/src/ai/GTAAINode.cpp @@ -1 +1 @@ -#include "renderwure/ai/GTAAINode.hpp" +#include "ai/GTAAINode.hpp" diff --git a/framework2/src/ai/GTADefaultAIController.cpp b/framework2/src/ai/GTADefaultAIController.cpp index 596c8714..eb411adf 100644 --- a/framework2/src/ai/GTADefaultAIController.cpp +++ b/framework2/src/ai/GTADefaultAIController.cpp @@ -1,8 +1,8 @@ -#include "renderwure/ai/GTADefaultAIController.hpp" -#include -#include -#include -#include +#include "ai/GTADefaultAIController.hpp" +#include +#include +#include +#include void GTADefaultAIController::update(float dt) { diff --git a/framework2/src/ai/GTAPlayerAIController.cpp b/framework2/src/ai/GTAPlayerAIController.cpp index e230c065..6586f076 100644 --- a/framework2/src/ai/GTAPlayerAIController.cpp +++ b/framework2/src/ai/GTAPlayerAIController.cpp @@ -1,7 +1,7 @@ -#include "renderwure/ai/GTAPlayerAIController.hpp" -#include -#include -#include +#include "ai/GTAPlayerAIController.hpp" +#include +#include +#include #include GTAPlayerAIController::GTAPlayerAIController(GTACharacter* character) diff --git a/framework2/src/engine/Animator.cpp b/framework2/src/engine/Animator.cpp index c063bd38..b990a18c 100644 --- a/framework2/src/engine/Animator.cpp +++ b/framework2/src/engine/Animator.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include Animator::Animator() : animation(nullptr), model(nullptr), time(0.f), serverTime(0.f), lastServerTime(0.f), repeat(true) diff --git a/framework2/src/engine/GTAData.cpp b/framework2/src/engine/GTAData.cpp index bda0d0d3..cd7d2481 100644 --- a/framework2/src/engine/GTAData.cpp +++ b/framework2/src/engine/GTAData.cpp @@ -1,10 +1,10 @@ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/framework2/src/engine/GTAEngine.cpp b/framework2/src/engine/GTAEngine.cpp index 80ef8d13..e4e489a0 100644 --- a/framework2/src/engine/GTAEngine.cpp +++ b/framework2/src/engine/GTAEngine.cpp @@ -1,14 +1,14 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include // 3 isn't enough to cause a factory. -#include -#include -#include +#include +#include +#include GTAEngine::GTAEngine(const std::string& path) : gameTime(0.f), gameData(path), renderer(this), randomEngine(rand()) diff --git a/framework2/src/engine/GTAObject.cpp b/framework2/src/engine/GTAObject.cpp index 80dac727..9fecc697 100644 --- a/framework2/src/engine/GTAObject.cpp +++ b/framework2/src/engine/GTAObject.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include void GTAObject::setPosition(const glm::vec3& pos) { diff --git a/framework2/src/loaders/LoaderCOL.cpp b/framework2/src/loaders/LoaderCOL.cpp index 86347a33..cd5d654a 100644 --- a/framework2/src/loaders/LoaderCOL.cpp +++ b/framework2/src/loaders/LoaderCOL.cpp @@ -1,4 +1,4 @@ -#include "renderwure/loaders/LoaderCOL.hpp" +#include "loaders/LoaderCOL.hpp" #include #include diff --git a/framework2/src/loaders/LoaderDFF.cpp b/framework2/src/loaders/LoaderDFF.cpp index bca488b0..49766bf7 100644 --- a/framework2/src/loaders/LoaderDFF.cpp +++ b/framework2/src/loaders/LoaderDFF.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include #include diff --git a/framework2/src/loaders/LoaderIDE.cpp b/framework2/src/loaders/LoaderIDE.cpp index fd1e3129..164941da 100644 --- a/framework2/src/loaders/LoaderIDE.cpp +++ b/framework2/src/loaders/LoaderIDE.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/framework2/src/loaders/LoaderIFP.cpp b/framework2/src/loaders/LoaderIFP.cpp index c2bd33b7..58df503e 100644 --- a/framework2/src/loaders/LoaderIFP.cpp +++ b/framework2/src/loaders/LoaderIFP.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/framework2/src/loaders/LoaderIMG.cpp b/framework2/src/loaders/LoaderIMG.cpp index 1a0e817a..e63bebb0 100644 --- a/framework2/src/loaders/LoaderIMG.cpp +++ b/framework2/src/loaders/LoaderIMG.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/framework2/src/loaders/LoaderIPL.cpp b/framework2/src/loaders/LoaderIPL.cpp index c57e90bb..ee85a8a5 100644 --- a/framework2/src/loaders/LoaderIPL.cpp +++ b/framework2/src/loaders/LoaderIPL.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/framework2/src/loaders/TextureLoader.cpp b/framework2/src/loaders/TextureLoader.cpp index 02524f53..60252703 100644 --- a/framework2/src/loaders/TextureLoader.cpp +++ b/framework2/src/loaders/TextureLoader.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include #include diff --git a/framework2/src/loaders/WeatherLoader.cpp b/framework2/src/loaders/WeatherLoader.cpp index 0ba2ac2c..f240652f 100644 --- a/framework2/src/loaders/WeatherLoader.cpp +++ b/framework2/src/loaders/WeatherLoader.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/framework2/src/objects/GTACharacter.cpp b/framework2/src/objects/GTACharacter.cpp index 1391ec5e..ef7bbbf6 100644 --- a/framework2/src/objects/GTACharacter.cpp +++ b/framework2/src/objects/GTACharacter.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include GTACharacter::GTACharacter(GTAEngine* engine, const glm::vec3& pos, const glm::quat& rot, Model* model, std::shared_ptr data) diff --git a/framework2/src/objects/GTAInstance.cpp b/framework2/src/objects/GTAInstance.cpp index 6f5510cc..e3f476d2 100644 --- a/framework2/src/objects/GTAInstance.cpp +++ b/framework2/src/objects/GTAInstance.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include GTAInstance::GTAInstance( GTAEngine* engine, diff --git a/framework2/src/objects/GTAVehicle.cpp b/framework2/src/objects/GTAVehicle.cpp index 51064da9..745d4958 100644 --- a/framework2/src/objects/GTAVehicle.cpp +++ b/framework2/src/objects/GTAVehicle.cpp @@ -1,9 +1,9 @@ -#include -#include -#include +#include +#include +#include #include #include -#include +#include GTAVehicle::GTAVehicle(GTAEngine* engine, const glm::vec3& pos, const glm::quat& rot, Model* model, std::shared_ptr data, const VehicleInfo& info, const glm::vec3& prim, const glm::vec3& sec) : GTAObject(engine, pos, rot, model), diff --git a/framework2/src/render/DebugDraw.cpp b/framework2/src/render/DebugDraw.cpp index d350763c..2041f54e 100644 --- a/framework2/src/render/DebugDraw.cpp +++ b/framework2/src/render/DebugDraw.cpp @@ -1,4 +1,4 @@ -#include "renderwure/render/DebugDraw.hpp" +#include "render/DebugDraw.hpp" #define GLEW_STATIC #include diff --git a/framework2/src/render/GTARenderer.cpp b/framework2/src/render/GTARenderer.cpp index 47cc1a16..885a5d43 100644 --- a/framework2/src/render/GTARenderer.cpp +++ b/framework2/src/render/GTARenderer.cpp @@ -1,13 +1,13 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/framework2/src/render/Model.cpp b/framework2/src/render/Model.cpp index f143a1da..43ef007e 100644 --- a/framework2/src/render/Model.cpp +++ b/framework2/src/render/Model.cpp @@ -1,4 +1,4 @@ -#include "renderwure/render/Model.hpp" +#include "render/Model.hpp" #include Model::Geometry::Geometry() diff --git a/framework2/src/render/TextureAtlas.cpp b/framework2/src/render/TextureAtlas.cpp index ed290213..88ba5f7c 100644 --- a/framework2/src/render/TextureAtlas.cpp +++ b/framework2/src/render/TextureAtlas.cpp @@ -1,4 +1,4 @@ -#include +#include #include TextureAtlas::TextureAtlas(size_t w, size_t h) diff --git a/game/main.cpp b/game/main.cpp index 98810549..92555b6a 100644 --- a/game/main.cpp +++ b/game/main.cpp @@ -1,13 +1,13 @@ #define GLEW_STATIC #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/test_atlas.cpp b/tests/test_atlas.cpp index 958cc9a8..6e782f20 100644 --- a/tests/test_atlas.cpp +++ b/tests/test_atlas.cpp @@ -1,5 +1,5 @@ #include -#include +#include /*BOOST_AUTO_TEST_SUITE(TextureAtlasTests) diff --git a/tests/test_globals.hpp b/tests/test_globals.hpp index 0b0c65f6..231a9183 100644 --- a/tests/test_globals.hpp +++ b/tests/test_globals.hpp @@ -2,7 +2,7 @@ #define _TESTGLOBABLS_HPP_ #include -#include +#include // Many tests require OpenGL be functional, seems like a reasonable solution. diff --git a/tests/test_object.cpp b/tests/test_object.cpp index 44af9eb9..7258917f 100644 --- a/tests/test_object.cpp +++ b/tests/test_object.cpp @@ -1,7 +1,7 @@ #include #include "test_globals.hpp" -#include -#include +#include +#include BOOST_AUTO_TEST_SUITE(ObjectUnitTests) diff --git a/tests/test_world.cpp b/tests/test_world.cpp index a83d8e52..7b82046e 100644 --- a/tests/test_world.cpp +++ b/tests/test_world.cpp @@ -1,5 +1,5 @@ #include -#include +#include BOOST_AUTO_TEST_SUITE(WorldTests) diff --git a/viewer/main.cpp b/viewer/main.cpp index 5518d52e..ac8e28b9 100644 --- a/viewer/main.cpp +++ b/viewer/main.cpp @@ -1,13 +1,13 @@ #define GLEW_STATIC #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include