Cleanup

include/Engine/Entity/Camera.h

@@ -2,6 +2,6 @@
 #include "Entity.h"
 #pragma once
 
-class Camera : public Entity {
+class Camera : public Engine::Entity {
 
 };

include/Engine/Entity/Entity.h

@@ -2,7 +2,11 @@
 #include <J3ML/LinearAlgebra/Vector2.hpp>
 #include <vector>
 
-class Entity {
+namespace Engine {
+    class Entity;
+}
+
+class Engine::Entity {
 protected:
     std::vector<Entity*> children{};
     Vector2 position = {0, 0};

include/Engine/Entity/Hud.h

@@ -1,7 +1,11 @@
 #pragma once
-#include "Renderable.h"
+#include <Engine/Entity/Renderable.h>
 
-class Hud : public Renderable {
+namespace Engine {
+    class Hud;
+}
+
+class Engine::Hud : public Engine::Renderable {
 public:
     Hud() : Renderable({0, 0}, 0) {};
 };

include/Engine/Entity/Renderable.h

@@ -3,7 +3,11 @@
 #include <Engine/Entity/Entity.h>
 #include <JGL/JGL.h>
 
-class Renderable : public Entity {
+namespace Engine {
+    class Renderable;
+}
+
+class Engine::Renderable : public Entity {
 public:
     virtual void Render() {}
 public:

include/Engine/GameWindow.h

@@ -1,8 +1,10 @@
 #include <rewindow/types/window.h>
 #pragma once
 
-class Camera;
-class DemoGameWindow : public ReWindow::RWindow {
+namespace Engine {
+    class DemoGameWindow;
+}
+class Engine::DemoGameWindow : public ReWindow::RWindow {
 public:
     void InitGL();
     void Display();

include/Engine/Globals.h

@@ -4,6 +4,8 @@
 #include <Engine/GameWindow.h>
 
 namespace Globals {
+    using namespace Engine;
+
     inline std::vector<Scene*> SceneList{};
     inline Scene* CurrentScene = nullptr;
     inline DemoGameWindow* Window = nullptr;

include/Engine/Level/Fixed.h

@@ -7,9 +7,13 @@
 using J3ML::LinearAlgebra::Vector2i;
 using JGL::Texture;
 
+namespace Engine {
+    class Fixed;
+}
+
 // Things that are considered non-movable parts of the level.
 // TODO instanced textures.
-class Fixed {
+class Engine::Fixed {
 private:
     void GenerateCollision();
 protected:

include/Engine/Level/Scene.h

@@ -5,7 +5,11 @@
 #include <Engine/Entity/Hud.h>
 #include <Engine/Level/Fixed.h>
 
-class Scene {
+namespace Engine {
+    class Scene;
+}
+
+class Engine::Scene {
 protected:
     std::string name;
     Hud* HeadsUpDisplay = nullptr;

include/Game/Entity/Box.h

@@ -1,8 +1,13 @@
 #pragma once
 
 #include <Engine/Entity/Renderable.h>
-#include "Engine/Globals.h"
-class Box final : public Renderable {
+#include <Engine/Globals.h>
+
+namespace Game {
+    class Box;
+}
+
+class Game::Box final : public Engine::Renderable {
 public:
     void Render() final;
     void Update() final;

include/Game/Entity/DemoGameHud.h

@@ -1,6 +1,10 @@
 #include <Engine/Entity/Hud.h>
 
-class DemoGameHud : public Hud {
+namespace Game {
+    class DemoGameHud;
+}
+
+class Game::DemoGameHud : public Engine::Hud {
 public:
     void Render() override;
 public:

include/Game/Scene/ControllableBox.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <Engine/Level/Scene.h>
 
-class ControllableBox final : public Scene {
+class ControllableBox final : public Engine::Scene {
 public:
     void Init() final;
 public:

include/Game/Scene/Loading.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <Engine/Level/Scene.h>
 
-class LoadingScreen final : public Scene {
+class LoadingScreen final : public Engine::Scene {
 protected:
     float elapsed = 0.0f;
     float angle = 0.0f;