From c7755040bd76828e654b830887de5ca8cc3a1031 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 22:42:44 +0300 Subject: [PATCH] voxels/ --- src/assets/AssetsLoader.cpp | 2 +- src/content/Content.cpp | 2 +- src/content/ContentBuilder.hpp | 2 +- src/content/ContentLUT.cpp | 2 +- src/content/ContentLoader.cpp | 2 +- src/core_defs.cpp | 2 +- src/engine.cpp | 4 ++-- src/files/WorldConverter.cpp | 2 +- src/files/WorldFiles.cpp | 6 +++--- src/files/WorldFiles.hpp | 2 +- src/files/WorldRegions.hpp | 2 +- src/frontend/ContentGfxCache.cpp | 2 +- src/frontend/LevelFrontend.cpp | 2 +- src/frontend/debug_panel.cpp | 6 +++--- src/frontend/hud.cpp | 6 +++--- src/frontend/screens/LevelScreen.cpp | 2 +- src/graphics/render/BlocksPreview.cpp | 2 +- src/graphics/render/BlocksRenderer.cpp | 8 ++++---- src/graphics/render/BlocksRenderer.hpp | 2 +- src/graphics/render/ChunksRenderer.cpp | 2 +- src/graphics/render/ChunksRenderer.hpp | 4 ++-- src/graphics/render/ModelBatch.cpp | 2 +- src/graphics/render/WorldRenderer.cpp | 6 +++--- src/graphics/ui/elements/InventoryView.cpp | 2 +- src/lighting/LightSolver.cpp | 8 ++++---- src/lighting/Lighting.cpp | 8 ++++---- src/logic/BlocksController.cpp | 8 ++++---- src/logic/BlocksController.hpp | 2 +- src/logic/ChunksController.cpp | 10 +++++----- src/logic/PlayerController.cpp | 6 +++--- src/logic/scripting/lua/libblock.cpp | 8 ++++---- src/logic/scripting/lua/libentity.cpp | 2 +- src/logic/scripting/lua/libhud.cpp | 6 +++--- src/logic/scripting/scripting.cpp | 2 +- src/objects/Player.cpp | 2 +- src/objects/Player.hpp | 2 +- src/physics/PhysicsSolver.cpp | 6 +++--- src/physics/PhysicsSolver.hpp | 2 +- src/voxels/DefaultWorldGenerator.hpp | 2 +- src/voxels/FlatWorldGenerator.hpp | 2 +- src/world/Level.cpp | 6 +++--- src/world/LevelEvents.cpp | 2 +- src/world/World.cpp | 6 +++--- src/world/WorldGenerators.cpp | 4 ++-- src/world/WorldGenerators.hpp | 2 +- 45 files changed, 85 insertions(+), 85 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index e824762b..e7389ac6 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -16,7 +16,7 @@ #include "../logic/scripting/scripting.hpp" #include #include -#include "../voxels/Block.hpp" +#include #include "Assets.hpp" #include "assetload_funcs.hpp" diff --git a/src/content/Content.cpp b/src/content/Content.cpp index 8fb6a0e8..ab3de75f 100644 --- a/src/content/Content.cpp +++ b/src/content/Content.cpp @@ -9,7 +9,7 @@ #include "../logic/scripting/scripting.hpp" #include #include -#include "../voxels/Block.hpp" +#include #include "ContentPack.hpp" ContentIndices::ContentIndices( diff --git a/src/content/ContentBuilder.hpp b/src/content/ContentBuilder.hpp index 335236ab..f27bd8f8 100644 --- a/src/content/ContentBuilder.hpp +++ b/src/content/ContentBuilder.hpp @@ -9,7 +9,7 @@ #include "ContentPack.hpp" #include #include -#include "../voxels/Block.hpp" +#include template class ContentUnitBuilder { diff --git a/src/content/ContentLUT.cpp b/src/content/ContentLUT.cpp index f6bacab1..c1c4c960 100644 --- a/src/content/ContentLUT.cpp +++ b/src/content/ContentLUT.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "../voxels/Block.hpp" +#include #include "Content.hpp" ContentLUT::ContentLUT( diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index 932e8c14..a34f13fd 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "../voxels/Block.hpp" +#include #include "Content.hpp" #include "ContentBuilder.hpp" #include "ContentPack.hpp" diff --git a/src/core_defs.cpp b/src/core_defs.cpp index b1ad11cb..4f4b2773 100644 --- a/src/core_defs.cpp +++ b/src/core_defs.cpp @@ -8,7 +8,7 @@ #include "window/Window.hpp" #include "window/Events.hpp" #include "window/input.hpp" -#include "voxels/Block.hpp" +#include // All in-game definitions (blocks, items, etc..) void corecontent::setup(EnginePaths* paths, ContentBuilder* builder) { diff --git a/src/engine.cpp b/src/engine.cpp index 5451856a..74fdc23d 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -30,8 +30,8 @@ #include "logic/scripting/scripting.hpp" #include #include -#include "voxels/DefaultWorldGenerator.hpp" -#include "voxels/FlatWorldGenerator.hpp" +#include +#include #include "window/Camera.hpp" #include "window/Events.hpp" #include "window/input.hpp" diff --git a/src/files/WorldConverter.cpp b/src/files/WorldConverter.cpp index 2f07f7a9..1fc30a20 100644 --- a/src/files/WorldConverter.cpp +++ b/src/files/WorldConverter.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "../voxels/Chunk.hpp" +#include #include "WorldFiles.hpp" namespace fs = std::filesystem; diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index 1c884014..ede07851 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -25,9 +25,9 @@ #include #include #include -#include "../voxels/Block.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/voxel.hpp" +#include +#include +#include #include "../window/Camera.hpp" #include "../world/World.hpp" diff --git a/src/files/WorldFiles.hpp b/src/files/WorldFiles.hpp index c63ecff6..2ba543b8 100644 --- a/src/files/WorldFiles.hpp +++ b/src/files/WorldFiles.hpp @@ -9,7 +9,7 @@ #include #include -#include "../voxels/Chunk.hpp" +#include #include "WorldRegions.hpp" #include "files.hpp" #define GLM_ENABLE_EXPERIMENTAL diff --git a/src/files/WorldRegions.hpp b/src/files/WorldRegions.hpp index 2477ff61..22d6ff3a 100644 --- a/src/files/WorldRegions.hpp +++ b/src/files/WorldRegions.hpp @@ -12,7 +12,7 @@ #include "../data/dynamic_fwd.hpp" #include #include -#include "../voxels/Chunk.hpp" +#include #include "files.hpp" #define GLM_ENABLE_EXPERIMENTAL #include "glm/gtx/hash.hpp" diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index 8c0eb8ed..0a61c023 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -8,7 +8,7 @@ #include #include #include "../maths/UVRegion.hpp" -#include "../voxels/Block.hpp" +#include #include diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp index 70bf0f6f..f8145d61 100644 --- a/src/frontend/LevelFrontend.cpp +++ b/src/frontend/LevelFrontend.cpp @@ -10,7 +10,7 @@ #include "../logic/LevelController.hpp" #include "../logic/PlayerController.hpp" #include -#include "../voxels/Block.hpp" +#include #include "../world/Level.hpp" LevelFrontend::LevelFrontend( diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index d7461237..48c01cd8 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -15,9 +15,9 @@ #include #include "../physics/Hitbox.hpp" #include -#include "../voxels/Block.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/Chunks.hpp" +#include +#include +#include #include "../world/Level.hpp" #include "../world/World.hpp" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index d056a3b1..10317fa2 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -34,9 +34,9 @@ #include "../physics/Hitbox.hpp" #include #include -#include "../voxels/Block.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/Chunks.hpp" +#include +#include +#include #include "../window/Camera.hpp" #include "../window/Events.hpp" #include "../window/input.hpp" diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 3e936db0..4a253b8f 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -20,7 +20,7 @@ #include "../../logic/scripting/scripting_hud.hpp" #include #include "../../physics/Hitbox.hpp" -#include "../../voxels/Chunks.hpp" +#include #include "../../window/Camera.hpp" #include "../../window/Events.hpp" #include "../../window/Window.hpp" diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp index 515d99c3..c5d3d844 100644 --- a/src/graphics/render/BlocksPreview.cpp +++ b/src/graphics/render/BlocksPreview.cpp @@ -4,7 +4,7 @@ #include #include #include "../../frontend/ContentGfxCache.hpp" -#include "../../voxels/Block.hpp" +#include #include "../../window/Camera.hpp" #include "../../window/Window.hpp" #include diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp index ae079515..28e06fdb 100644 --- a/src/graphics/render/BlocksRenderer.cpp +++ b/src/graphics/render/BlocksRenderer.cpp @@ -4,10 +4,10 @@ #include "../../maths/UVRegion.hpp" #include #include -#include "../../voxels/Block.hpp" -#include "../../voxels/Chunk.hpp" -#include "../../voxels/VoxelsVolume.hpp" -#include "../../voxels/ChunksStorage.hpp" +#include +#include +#include +#include #include "../../lighting/Lightmap.hpp" #include "../../frontend/ContentGfxCache.hpp" #include diff --git a/src/graphics/render/BlocksRenderer.hpp b/src/graphics/render/BlocksRenderer.hpp index f3430fce..b37e4b7a 100644 --- a/src/graphics/render/BlocksRenderer.hpp +++ b/src/graphics/render/BlocksRenderer.hpp @@ -5,7 +5,7 @@ #include #include #include -#include "../../voxels/voxel.hpp" +#include #include class Content; diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp index f69aa793..9ad50f27 100644 --- a/src/graphics/render/ChunksRenderer.cpp +++ b/src/graphics/render/ChunksRenderer.cpp @@ -2,7 +2,7 @@ #include "BlocksRenderer.hpp" #include #include -#include "../../voxels/Chunk.hpp" +#include #include "../../world/Level.hpp" #include diff --git a/src/graphics/render/ChunksRenderer.hpp b/src/graphics/render/ChunksRenderer.hpp index 5789510f..bb03c09e 100644 --- a/src/graphics/render/ChunksRenderer.hpp +++ b/src/graphics/render/ChunksRenderer.hpp @@ -7,8 +7,8 @@ #include #include -#include "../../voxels/Block.hpp" -#include "../../voxels/ChunksStorage.hpp" +#include +#include #include class Mesh; diff --git a/src/graphics/render/ModelBatch.cpp b/src/graphics/render/ModelBatch.cpp index e523a295..7e3bbf96 100644 --- a/src/graphics/render/ModelBatch.cpp +++ b/src/graphics/render/ModelBatch.cpp @@ -6,7 +6,7 @@ #include #include #include "../../window/Window.hpp" -#include "../../voxels/Chunks.hpp" +#include #include "../../lighting/Lightmap.hpp" #define GLM_ENABLE_EXPERIMENTAL diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index bd43f582..4262f66b 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -22,9 +22,9 @@ #include #include #include -#include "../../voxels/Block.hpp" -#include "../../voxels/Chunk.hpp" -#include "../../voxels/Chunks.hpp" +#include +#include +#include #include "../../window/Camera.hpp" #include "../../window/Window.hpp" #include "../../world/Level.hpp" diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index 50ec2c87..10fdce52 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -12,7 +12,7 @@ #include "../../../maths/voxmaths.hpp" #include #include -#include "../../../voxels/Block.hpp" +#include #include "../../../window/Events.hpp" #include "../../../window/input.hpp" #include "../../../world/Level.hpp" diff --git a/src/lighting/LightSolver.cpp b/src/lighting/LightSolver.cpp index bc110aa1..7c7d5c4a 100644 --- a/src/lighting/LightSolver.cpp +++ b/src/lighting/LightSolver.cpp @@ -3,10 +3,10 @@ #include "LightSolver.hpp" #include "Lightmap.hpp" #include -#include "../voxels/Chunks.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/voxel.hpp" -#include "../voxels/Block.hpp" +#include +#include +#include +#include LightSolver::LightSolver(const ContentIndices* contentIds, Chunks* chunks, int channel) : contentIds(contentIds), diff --git a/src/lighting/Lighting.cpp b/src/lighting/Lighting.cpp index 52f54c49..285d244e 100644 --- a/src/lighting/Lighting.cpp +++ b/src/lighting/Lighting.cpp @@ -2,10 +2,10 @@ #include "LightSolver.hpp" #include "Lightmap.hpp" #include -#include "../voxels/Chunks.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/voxel.hpp" -#include "../voxels/Block.hpp" +#include +#include +#include +#include #include #include diff --git a/src/logic/BlocksController.cpp b/src/logic/BlocksController.cpp index 97360164..27117cf0 100644 --- a/src/logic/BlocksController.cpp +++ b/src/logic/BlocksController.cpp @@ -6,10 +6,10 @@ #include "../lighting/Lighting.hpp" #include "../maths/fastmaths.hpp" #include -#include "../voxels/Block.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/Chunks.hpp" -#include "../voxels/voxel.hpp" +#include +#include +#include +#include #include "../world/Level.hpp" #include "../world/World.hpp" #include "scripting/scripting.hpp" diff --git a/src/logic/BlocksController.hpp b/src/logic/BlocksController.hpp index d2760703..80971870 100644 --- a/src/logic/BlocksController.hpp +++ b/src/logic/BlocksController.hpp @@ -7,7 +7,7 @@ #include "../maths/fastmaths.hpp" #include #include -#include "../voxels/voxel.hpp" +#include class Player; class Block; diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp index 8d35a5b3..45d9287a 100644 --- a/src/logic/ChunksController.cpp +++ b/src/logic/ChunksController.cpp @@ -11,11 +11,11 @@ #include "../lighting/Lighting.hpp" #include "../maths/voxmaths.hpp" #include -#include "../voxels/Block.hpp" -#include "../voxels/Chunk.hpp" -#include "../voxels/Chunks.hpp" -#include "../voxels/ChunksStorage.hpp" -#include "../voxels/WorldGenerator.hpp" +#include +#include +#include +#include +#include #include "../world/Level.hpp" #include "../world/World.hpp" #include "../world/WorldGenerators.hpp" diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index 11adefcd..f3e364b5 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -15,9 +15,9 @@ #include "../physics/Hitbox.hpp" #include "../physics/PhysicsSolver.hpp" #include -#include "../voxels/Block.hpp" -#include "../voxels/Chunks.hpp" -#include "../voxels/voxel.hpp" +#include +#include +#include #include "../window/Camera.hpp" #include "../window/Events.hpp" #include "../window/Window.hpp" diff --git a/src/logic/scripting/lua/libblock.cpp b/src/logic/scripting/lua/libblock.cpp index f6360db9..96eed6f5 100644 --- a/src/logic/scripting/lua/libblock.cpp +++ b/src/logic/scripting/lua/libblock.cpp @@ -2,10 +2,10 @@ #include "../../../lighting/Lighting.hpp" #include "../../../logic/BlocksController.hpp" #include "../../../logic/LevelController.hpp" -#include "../../../voxels/Block.hpp" -#include "../../../voxels/Chunk.hpp" -#include "../../../voxels/Chunks.hpp" -#include "../../../voxels/voxel.hpp" +#include +#include +#include +#include #include "../../../world/Level.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libentity.cpp b/src/logic/scripting/lua/libentity.cpp index 9e92c3f7..b93bbb7c 100644 --- a/src/logic/scripting/lua/libentity.cpp +++ b/src/logic/scripting/lua/libentity.cpp @@ -7,7 +7,7 @@ #include #include #include "../../../physics/Hitbox.hpp" -#include "../../../voxels/Chunks.hpp" +#include #include "../../../window/Camera.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp index cf5beae4..290a0fd9 100644 --- a/src/logic/scripting/lua/libhud.cpp +++ b/src/logic/scripting/lua/libhud.cpp @@ -11,9 +11,9 @@ #include "../../../logic/BlocksController.hpp" #include #include -#include "../../../voxels/Block.hpp" -#include "../../../voxels/Chunks.hpp" -#include "../../../voxels/voxel.hpp" +#include +#include +#include #include "../../../world/Level.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index d0d43ff7..30f93c63 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -19,7 +19,7 @@ #include #include #include -#include "../../voxels/Block.hpp" +#include #include "../../world/Level.hpp" #include "lua/lua_engine.hpp" diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp index a9f3a9a7..525aa54e 100644 --- a/src/objects/Player.cpp +++ b/src/objects/Player.cpp @@ -10,7 +10,7 @@ #include "rigging.hpp" #include "../physics/Hitbox.hpp" #include "../physics/PhysicsSolver.hpp" -#include "../voxels/Chunks.hpp" +#include #include "../window/Camera.hpp" #include "../window/Events.hpp" #include "../world/Level.hpp" diff --git a/src/objects/Player.hpp b/src/objects/Player.hpp index a0bc88bf..4037356c 100644 --- a/src/objects/Player.hpp +++ b/src/objects/Player.hpp @@ -9,7 +9,7 @@ #include "../interfaces/Object.hpp" #include "../interfaces/Serializable.hpp" #include -#include "../voxels/voxel.hpp" +#include class Camera; class Inventory; diff --git a/src/physics/PhysicsSolver.cpp b/src/physics/PhysicsSolver.cpp index aafb6a37..89dd89e4 100644 --- a/src/physics/PhysicsSolver.cpp +++ b/src/physics/PhysicsSolver.cpp @@ -2,9 +2,9 @@ #include "Hitbox.hpp" #include "../maths/aabb.hpp" -#include "../voxels/Block.hpp" -#include "../voxels/Chunks.hpp" -#include "../voxels/voxel.hpp" +#include +#include +#include #include #define GLM_ENABLE_EXPERIMENTAL diff --git a/src/physics/PhysicsSolver.hpp b/src/physics/PhysicsSolver.hpp index f4239f9d..b50a751a 100644 --- a/src/physics/PhysicsSolver.hpp +++ b/src/physics/PhysicsSolver.hpp @@ -4,7 +4,7 @@ #include "Hitbox.hpp" #include -#include "../voxels/voxel.hpp" +#include #include #include diff --git a/src/voxels/DefaultWorldGenerator.hpp b/src/voxels/DefaultWorldGenerator.hpp index 28721eb7..2e1070f9 100644 --- a/src/voxels/DefaultWorldGenerator.hpp +++ b/src/voxels/DefaultWorldGenerator.hpp @@ -2,7 +2,7 @@ #define VOXELS_DEFAULTWORLDGENERATOR_HPP_ #include -#include "../voxels/WorldGenerator.hpp" +#include "WorldGenerator.hpp" struct voxel; class Content; diff --git a/src/voxels/FlatWorldGenerator.hpp b/src/voxels/FlatWorldGenerator.hpp index 7e0d9220..33b9edae 100644 --- a/src/voxels/FlatWorldGenerator.hpp +++ b/src/voxels/FlatWorldGenerator.hpp @@ -2,7 +2,7 @@ #define VOXELS_FLATWORLDGENERATOR_HPP_ #include -#include "../voxels/WorldGenerator.hpp" +#include "WorldGenerator.hpp" struct voxel; class Content; diff --git a/src/world/Level.cpp b/src/world/Level.cpp index e28fb386..f7aa062b 100644 --- a/src/world/Level.cpp +++ b/src/world/Level.cpp @@ -10,9 +10,9 @@ #include "../physics/Hitbox.hpp" #include "../physics/PhysicsSolver.hpp" #include -#include "../voxels/Chunk.hpp" -#include "../voxels/Chunks.hpp" -#include "../voxels/ChunksStorage.hpp" +#include +#include +#include #include "../window/Camera.hpp" #include "LevelEvents.hpp" #include "World.hpp" diff --git a/src/world/LevelEvents.cpp b/src/world/LevelEvents.cpp index 12bedc1a..9139dc37 100644 --- a/src/world/LevelEvents.cpp +++ b/src/world/LevelEvents.cpp @@ -1,6 +1,6 @@ #include "LevelEvents.hpp" -#include "../voxels/Chunk.hpp" +#include using std::vector; diff --git a/src/world/World.cpp b/src/world/World.cpp index c0acc907..b9dfa908 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -12,9 +12,9 @@ #include #include #include -#include "../voxels/Chunk.hpp" -#include "../voxels/Chunks.hpp" -#include "../voxels/ChunksStorage.hpp" +#include +#include +#include #include "../world/WorldGenerators.hpp" #include "Level.hpp" diff --git a/src/world/WorldGenerators.cpp b/src/world/WorldGenerators.cpp index feba8d52..caa0174b 100644 --- a/src/world/WorldGenerators.cpp +++ b/src/world/WorldGenerators.cpp @@ -3,8 +3,8 @@ #include #include -#include "../voxels/FlatWorldGenerator.hpp" -#include "../voxels/WorldGenerator.hpp" +#include +#include std::vector WorldGenerators::getGeneratorsIDs() { std::vector ids; diff --git a/src/world/WorldGenerators.hpp b/src/world/WorldGenerators.hpp index e21ddb12..49afce15 100644 --- a/src/world/WorldGenerators.hpp +++ b/src/world/WorldGenerators.hpp @@ -5,7 +5,7 @@ #include #include -#include "../voxels/WorldGenerator.hpp" +#include class Content;