Move GameObject to objects directory

rwengine/include/objects/CharacterObject.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #ifndef _CHARACTEROBJECT_HPP_
 #define _CHARACTEROBJECT_HPP_
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <bullet/BulletDynamics/Character/btKinematicCharacterController.h>
 #include <bullet/btBulletCollisionCommon.h>
 #include <BulletCollision/CollisionDispatch/btGhostObject.h>

rwengine/include/objects/CutsceneObject.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #ifndef _CUTSCENEOBJECT_HPP_
 #define _CUTSCENEOBJECT_HPP_
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 
 /**
  * @brief Object type used for cutscene animations.

rwengine/include/objects/InstanceObject.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #ifndef _OBJECTINSTANCE_HPP_
 #define _OBJECTINSTANCE_HPP_
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <btBulletDynamicsCommon.h>
 
 class CollisionInstance;

rwengine/include/objects/PickupObject.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #ifndef _PICKUPOBJECT_HPP_
 #define _PICKUPOBJECT_HPP_
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <bullet/btBulletCollisionCommon.h>
 #include <BulletCollision/CollisionDispatch/btGhostObject.h>
 #include <glm/glm.hpp>

rwengine/include/objects/ProjectileObject.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #ifndef _PROJECTILEOBJECT_HPP_
 #define _PROJECTILEOBJECT_HPP_
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <data/WeaponData.hpp>
 #include <bullet/btBulletDynamicsCommon.h>
 #include <BulletCollision/CollisionDispatch/btGhostObject.h>

rwengine/include/objects/VehicleObject.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #ifndef _VEHICLEOBJECT_HPP_
 #define _VEHICLEOBJECT_HPP_
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <map>
 #include <objects/VehicleInfo.hpp>
 #include <dynamics/CollisionInstance.hpp>

rwengine/src/ai/AIGraph.cpp

@@ -1,5 +1,5 @@
 #include "ai/AIGraph.hpp"
-#include "engine/GameObject.hpp"
+#include <objects/GameObject.hpp>
 #include <ai/AIGraphNode.hpp>
 #include <glm/gtx/norm.hpp>
 #include <iostream>

rwengine/src/ai/TrafficDirector.cpp

@@ -2,7 +2,7 @@
 #include <ai/AIGraphNode.hpp>
 #include <ai/CharacterController.hpp>
 #include <engine/GameWorld.hpp>
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <objects/CharacterObject.hpp>
 #include <core/Logger.hpp>
 

rwengine/src/dynamics/CollisionInstance.cpp

@@ -1,6 +1,6 @@
 #include <dynamics/CollisionInstance.hpp>
 
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <engine/GameWorld.hpp>
 #include <engine/GameData.hpp>
 

rwengine/src/objects/GameObject.cpp

@@ -1,4 +1,4 @@
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <loaders/LoaderIFP.hpp>
 #include <loaders/LoaderDFF.hpp>
 #include <engine/Animator.hpp>

rwengine/src/script/modules/GameModule.cpp

@@ -11,8 +11,6 @@
 #include <engine/Animator.hpp>
 #include <engine/GameState.hpp>
 #include <engine/GameData.hpp>
-#include <engine/GameWorld.hpp>
-#include <engine/GameWorld.hpp>
 #include <ai/PlayerController.hpp>
 #include <ai/DefaultAIController.hpp>
 

rwengine/src/script/modules/ObjectModule.cpp

@@ -11,8 +11,6 @@
 #include <render/Model.hpp>
 #include <render/GameRenderer.hpp>
 #include <engine/Animator.hpp>
-#include <engine/GameWorld.hpp>
-#include <engine/GameWorld.hpp>
 #include <ai/PlayerController.hpp>
 #include <ai/DefaultAIController.hpp>
 

rwgame/RWGame.cpp

@@ -5,7 +5,7 @@
 #include "ingamestate.hpp"
 #include "menustate.hpp"
 
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <engine/GameState.hpp>
 #include <engine/GameWorld.hpp>
 #include <render/GameRenderer.hpp>

rwgame/game.hpp

@@ -3,7 +3,7 @@
 
 #include <SFML/Window.hpp>
 #include <SFML/Graphics.hpp>
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <engine/GameWorld.hpp>
 
 constexpr double PiOver180 = 3.1415926535897932384626433832795028/180;

rwviewer/ViewerWidget.cpp

@@ -4,7 +4,7 @@
 #include <render/OpenGLRenderer.hpp>
 #include <glm/gtc/type_ptr.hpp>
 #include <QMouseEvent>
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <engine/Animator.hpp>
 #include <QFileDialog>
 #include <algorithm>

rwviewer/views/ModelViewer.cpp

@@ -2,7 +2,7 @@
 #include <widgets/ModelFramesWidget.hpp>
 #include "ViewerWidget.hpp"
 #include <data/Skeleton.hpp>
-#include <engine/GameObject.hpp>
+#include <objects/GameObject.hpp>
 #include <QDebug>
 
 ModelViewer::ModelViewer(ViewerWidget* viewer, QWidget* parent, Qt::WindowFlags f)