src/graphics moved to src/graphics/core

src/frontend/BlocksPreview.cpp

@@ -3,12 +3,13 @@
 #include <glm/ext.hpp>
 
 #include "../assets/Assets.h"
-#include "../graphics/Viewport.h"
-#include "../graphics/Texture.h"
-#include "../graphics/Atlas.h"
-#include "../graphics/Batch3D.h"
-#include "../graphics/Framebuffer.h"
-#include "../graphics/GfxContext.h"
+#include "../graphics/core/Viewport.h"
+#include "../graphics/core/Texture.h"
+#include "../graphics/core/Atlas.h"
+#include "../graphics/core/Batch3D.h"
+#include "../graphics/core/Framebuffer.h"
+#include "../graphics/core/GfxContext.h"
+#include "../graphics/core/Shader.h"
 #include "../window/Window.h"
 #include "../window/Camera.h"
 #include "../voxels/Block.h"

src/frontend/BlocksPreview.h

@@ -2,7 +2,6 @@
 #define FRONTEND_BLOCKS_PREVIEW_H_
 
 #include "../typedefs.h"
-#include "../graphics/Shader.h"
 #include <glm/glm.hpp>
 #include <memory>
 
@@ -13,6 +12,7 @@ class Framebuffer;
 class Batch3D;
 class Block;
 class Content;
+class Shader;
 class ContentGfxCache;
 
 class BlocksPreview {

src/frontend/ContentGfxCache.cpp

@@ -5,7 +5,8 @@
 #include "../assets/Assets.h"
 #include "../content/Content.h"
 #include "../content/ContentPack.h"
-#include "../graphics/Atlas.h"
+#include "../graphics/core/Atlas.h"
+#include "../graphics/core/UVRegion.h"
 #include "../voxels/Block.h"
 #include "../core_defs.h"
 #include "UiDocument.h"

src/frontend/ContentGfxCache.h

@@ -4,12 +4,12 @@
 #include <memory>
 #include <string>
 #include <unordered_map>
-#include "../graphics/UVRegion.h"
 #include "../typedefs.h"
 
 class Content;
 class Assets;
 class UiDocument;
+class UVRegion;
 
 using uidocuments_map = std::unordered_map<std::string, std::shared_ptr<UiDocument>>;
 

src/frontend/InventoryView.cpp

@@ -8,11 +8,11 @@
 #include "../window/Events.h"
 #include "../window/input.h"
 #include "../assets/Assets.h"
-#include "../graphics/Atlas.h"
-#include "../graphics/Shader.h"
-#include "../graphics/Batch2D.h"
-#include "../graphics/GfxContext.h"
-#include "../graphics/Font.h"
+#include "../graphics/core/Atlas.h"
+#include "../graphics/core/Shader.h"
+#include "../graphics/core/Batch2D.h"
+#include "../graphics/core/GfxContext.h"
+#include "../graphics/core/Font.h"
 #include "../content/Content.h"
 #include "../items/ItemDef.h"
 #include "../items/Inventory.h"

src/frontend/LevelFrontend.cpp

@@ -7,7 +7,7 @@
 #include "../world/Level.h"
 #include "../voxels/Block.h"
 #include "../assets/Assets.h"
-#include "../graphics/Atlas.h"
+#include "../graphics/core/Atlas.h"
 #include "../content/Content.h"
 
 #include "../logic/LevelController.h"

src/frontend/WorldRenderer.cpp

@@ -8,13 +8,14 @@
 #include "../window/Window.h"
 #include "../window/Camera.h"
 #include "../content/Content.h"
-#include "../graphics/Mesh.h"
-#include "../graphics/Atlas.h"
-#include "../graphics/Shader.h"
-#include "../graphics/Batch3D.h"
-#include "../graphics/Texture.h"
-#include "../graphics/LineBatch.h"
-#include "../graphics/PostProcessing.h"
+#include "../graphics/core/Mesh.h"
+#include "../graphics/core/Atlas.h"
+#include "../graphics/core/Shader.h"
+#include "../graphics/core/Batch3D.h"
+#include "../graphics/core/Texture.h"
+#include "../graphics/core/LineBatch.h"
+#include "../graphics/core/PostProcessing.h"
+#include "../graphics/core/GfxContext.h"
 #include "../voxels/Chunks.h"
 #include "../voxels/Chunk.h"
 #include "../voxels/Block.h"

src/frontend/WorldRenderer.h

@@ -11,8 +11,6 @@
 #include <glm/ext.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 
-#include "../graphics/GfxContext.h"
-
 class Level;
 class Player;
 class Camera;
@@ -26,6 +24,8 @@ class Chunks;
 class LevelFrontend;
 class Skybox;
 class PostProcessing;
+class GfxContext;
+struct EngineSettings;
 
 class WorldRenderer {
     Engine* engine;

src/frontend/debug_panel.cpp

@@ -4,7 +4,7 @@
 
 #include "gui/controls.h"
 #include "../audio/audio.h"
-#include "../graphics/Mesh.h"
+#include "../graphics/core/Mesh.h"
 #include "../objects/Player.h"
 #include "../physics/Hitbox.h"
 #include "../world/Level.h"

src/frontend/graphics/BlocksRenderer.cpp

@@ -2,8 +2,8 @@
 
 #include <glm/glm.hpp>
 
-#include "../../graphics/Mesh.h"
-#include "../../graphics/UVRegion.h"
+#include "../../graphics/core/Mesh.h"
+#include "../../graphics/core/UVRegion.h"
 #include "../../constants.h"
 #include "../../content/Content.h"
 #include "../../voxels/Block.h"

src/frontend/graphics/BlocksRenderer.h

@@ -4,7 +4,6 @@
 #include <stdlib.h>
 #include <vector>
 #include <glm/glm.hpp>
-#include "../../graphics/UVRegion.h"
 #include "../../voxels/voxel.h"
 #include "../../typedefs.h"
 #include "../../settings.h"
@@ -17,6 +16,7 @@ class Chunks;
 class VoxelsVolume;
 class ChunksStorage;
 class ContentGfxCache;
+class UVRegion;
 
 class BlocksRenderer {
     static const glm::vec3 SUN_VECTOR;

src/frontend/graphics/ChunksRenderer.cpp

@@ -1,6 +1,6 @@
 #include "ChunksRenderer.h"
 
-#include "../../graphics/Mesh.h"
+#include "../../graphics/core/Mesh.h"
 #include "BlocksRenderer.h"
 #include "../../voxels/Chunk.h"
 #include "../../world/Level.h"

src/frontend/graphics/Skybox.cpp

@@ -5,12 +5,13 @@
 #include <glm/glm.hpp>
 
 #include "../../assets/Assets.h"
-#include "../../graphics/Shader.h"
-#include "../../graphics/Mesh.h"
-#include "../../graphics/Batch3D.h"
-#include "../../graphics/Texture.h"
-#include "../../graphics/Cubemap.h"
-#include "../../graphics/Framebuffer.h"
+#include "../../graphics/core/Shader.h"
+#include "../../graphics/core/Mesh.h"
+#include "../../graphics/core/Batch3D.h"
+#include "../../graphics/core/Texture.h"
+#include "../../graphics/core/Cubemap.h"
+#include "../../graphics/core/Framebuffer.h"
+#include "../../graphics/core/GfxContext.h"
 #include "../../window/Window.h"
 #include "../../window/Camera.h"
 

src/frontend/graphics/Skybox.h

@@ -6,7 +6,6 @@
 #include <vector>
 #include "../../typedefs.h"
 #include "../../maths/fastmaths.h"
-#include "../../graphics/GfxContext.h"
 
 class Mesh;
 class Shader;
@@ -14,6 +13,7 @@ class Assets;
 class Camera;
 class Batch3D;
 class Framebuffer;
+class GfxContext;
 
 struct skysprite {
     std::string texture;

src/frontend/gui/GUI.cpp

@@ -6,9 +6,9 @@
 #include <algorithm>
 
 #include "../../assets/Assets.h"
-#include "../../graphics/Batch2D.h"
-#include "../../graphics/Shader.h"
-#include "../../graphics/GfxContext.h"
+#include "../../graphics/core/Batch2D.h"
+#include "../../graphics/core/Shader.h"
+#include "../../graphics/core/GfxContext.h"
 #include "../../window/Events.h"
 #include "../../window/input.h"
 #include "../../window/Camera.h"

src/frontend/gui/UINode.cpp

@@ -1,6 +1,6 @@
 #include "UINode.h"
 
-#include "../../graphics/Batch2D.h"
+#include "../../graphics/core/Batch2D.h"
 
 using gui::UINode;
 using gui::Align;

src/frontend/gui/containers.cpp

@@ -5,8 +5,8 @@
 
 #include "../../window/Window.h"
 #include "../../assets/Assets.h"
-#include "../../graphics/Batch2D.h"
-#include "../../graphics/GfxContext.h"
+#include "../../graphics/core/Batch2D.h"
+#include "../../graphics/core/GfxContext.h"
 
 using namespace gui;
 

src/frontend/gui/controls.cpp

@@ -7,10 +7,10 @@
 
 #include "../../window/Events.h"
 #include "../../assets/Assets.h"
-#include "../../graphics/Batch2D.h"
-#include "../../graphics/Font.h"
-#include "../../graphics/Texture.h"
-#include "../../graphics/GfxContext.h"
+#include "../../graphics/core/Batch2D.h"
+#include "../../graphics/core/Font.h"
+#include "../../graphics/core/Texture.h"
+#include "../../graphics/core/GfxContext.h"
 #include "../../util/stringutil.h"
 #include "GUI.h"
 

src/frontend/hud.cpp

@@ -12,13 +12,14 @@
 #include "../util/stringutil.h"
 #include "../util/timeutil.h"
 #include "../assets/Assets.h"
-#include "../graphics/Shader.h"
-#include "../graphics/Batch2D.h"
-#include "../graphics/Batch3D.h"
-#include "../graphics/Font.h"
-#include "../graphics/Atlas.h"
-#include "../graphics/Mesh.h"
-#include "../graphics/Texture.h"
+#include "../graphics/core/Shader.h"
+#include "../graphics/core/Batch2D.h"
+#include "../graphics/core/Batch3D.h"
+#include "../graphics/core/Font.h"
+#include "../graphics/core/Atlas.h"
+#include "../graphics/core/Mesh.h"
+#include "../graphics/core/Texture.h"
+#include "../graphics/core/GfxContext.h"
 #include "../window/Camera.h"
 #include "../window/Window.h"
 #include "../window/Events.h"

src/frontend/hud.h

@@ -1,13 +1,13 @@
 #ifndef SRC_HUD_H_
 #define SRC_HUD_H_
 
+#include "../typedefs.h"
+
 #include <string>
 #include <memory>
-
+#include <vector>
 #include <glm/glm.hpp>
 
-#include "../graphics/GfxContext.h"
-
 class Camera;
 class Block;
 class Assets;
@@ -19,6 +19,8 @@ class InventoryView;
 class LevelFrontend;
 class UiDocument;
 class InventoryInteraction;
+class GfxContext;
+class Viewport;
 
 namespace gui {
     class GUI;

src/frontend/screens.cpp

@@ -12,10 +12,10 @@
 #include "../window/Camera.h"
 #include "../window/Events.h"
 #include "../window/input.h"
-#include "../graphics/Shader.h"
-#include "../graphics/Batch2D.h"
-#include "../graphics/GfxContext.h"
-#include "../graphics/TextureAnimation.h"
+#include "../graphics/core/Shader.h"
+#include "../graphics/core/Batch2D.h"
+#include "../graphics/core/GfxContext.h"
+#include "../graphics/core/TextureAnimation.h"
 #include "../assets/Assets.h"
 #include "../world/Level.h"
 #include "../world/World.h"