update project includes format
This commit is contained in:
@@ -2,13 +2,13 @@
|
||||
|
||||
#include "UiDocument.hpp"
|
||||
|
||||
#include <assets/Assets.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <content/ContentPack.hpp>
|
||||
#include <core_defs.hpp>
|
||||
#include <graphics/core/Atlas.hpp>
|
||||
#include <maths/UVRegion.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include "assets/Assets.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "content/ContentPack.hpp"
|
||||
#include "core_defs.hpp"
|
||||
#include "graphics/core/Atlas.hpp"
|
||||
#include "maths/UVRegion.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef FRONTEND_BLOCKS_GFX_CACHE_HPP_
|
||||
#define FRONTEND_BLOCKS_GFX_CACHE_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
#include <memory>
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
#include "ContentGfxCache.hpp"
|
||||
|
||||
#include <assets/Assets.hpp>
|
||||
#include <audio/audio.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <graphics/core/Atlas.hpp>
|
||||
#include <graphics/render/BlocksPreview.hpp>
|
||||
#include <logic/LevelController.hpp>
|
||||
#include <logic/PlayerController.hpp>
|
||||
#include <objects/Player.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include <world/Level.hpp>
|
||||
#include "assets/Assets.hpp"
|
||||
#include "audio/audio.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "graphics/core/Atlas.hpp"
|
||||
#include "graphics/render/BlocksPreview.hpp"
|
||||
#include "logic/LevelController.hpp"
|
||||
#include "logic/PlayerController.hpp"
|
||||
#include "objects/Player.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "world/Level.hpp"
|
||||
|
||||
LevelFrontend::LevelFrontend(
|
||||
Player* currentPlayer, LevelController* controller, Assets* assets
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
#include <utility>
|
||||
|
||||
#include <files/files.hpp>
|
||||
#include <graphics/ui/elements/UINode.hpp>
|
||||
#include <graphics/ui/elements/InventoryView.hpp>
|
||||
#include <graphics/ui/gui_xml.hpp>
|
||||
#include <logic/scripting/scripting.hpp>
|
||||
#include "files/files.hpp"
|
||||
#include "graphics/ui/elements/UINode.hpp"
|
||||
#include "graphics/ui/elements/InventoryView.hpp"
|
||||
#include "graphics/ui/gui_xml.hpp"
|
||||
#include "logic/scripting/scripting.hpp"
|
||||
|
||||
UiDocument::UiDocument(
|
||||
std::string id,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef FRONTEND_UI_DOCUMENT_HPP_
|
||||
#define FRONTEND_UI_DOCUMENT_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <memory>
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
#include <audio/audio.hpp>
|
||||
#include <delegates.hpp>
|
||||
#include <engine.hpp>
|
||||
#include <settings.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <graphics/core/Mesh.hpp>
|
||||
#include <graphics/ui/elements/CheckBox.hpp>
|
||||
#include <graphics/ui/elements/TextBox.hpp>
|
||||
#include <graphics/ui/elements/TrackBar.hpp>
|
||||
#include <graphics/ui/elements/InputBindBox.hpp>
|
||||
#include <graphics/render/WorldRenderer.hpp>
|
||||
#include <logic/scripting/scripting.hpp>
|
||||
#include <objects/Player.hpp>
|
||||
#include <objects/Entities.hpp>
|
||||
#include <objects/EntityDef.hpp>
|
||||
#include <physics/Hitbox.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include <voxels/Chunks.hpp>
|
||||
#include <world/Level.hpp>
|
||||
#include <world/World.hpp>
|
||||
#include "audio/audio.hpp"
|
||||
#include "delegates.hpp"
|
||||
#include "engine.hpp"
|
||||
#include "settings.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "graphics/core/Mesh.hpp"
|
||||
#include "graphics/ui/elements/CheckBox.hpp"
|
||||
#include "graphics/ui/elements/TextBox.hpp"
|
||||
#include "graphics/ui/elements/TrackBar.hpp"
|
||||
#include "graphics/ui/elements/InputBindBox.hpp"
|
||||
#include "graphics/render/WorldRenderer.hpp"
|
||||
#include "logic/scripting/scripting.hpp"
|
||||
#include "objects/Player.hpp"
|
||||
#include "objects/Entities.hpp"
|
||||
#include "objects/EntityDef.hpp"
|
||||
#include "physics/Hitbox.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "voxels/Chunks.hpp"
|
||||
#include "world/Level.hpp"
|
||||
#include "world/World.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <memory>
|
||||
|
||||
+39
-39
@@ -4,45 +4,45 @@
|
||||
#include "LevelFrontend.hpp"
|
||||
#include "UiDocument.hpp"
|
||||
|
||||
#include <assets/Assets.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <core_defs.hpp>
|
||||
#include <delegates.hpp>
|
||||
#include <engine.hpp>
|
||||
#include <graphics/core/Atlas.hpp>
|
||||
#include <graphics/core/Batch2D.hpp>
|
||||
#include <graphics/core/Batch3D.hpp>
|
||||
#include <graphics/core/DrawContext.hpp>
|
||||
#include <graphics/core/Font.hpp>
|
||||
#include <graphics/core/Mesh.hpp>
|
||||
#include <graphics/core/Shader.hpp>
|
||||
#include <graphics/core/Texture.hpp>
|
||||
#include <graphics/render/WorldRenderer.hpp>
|
||||
#include <graphics/ui/elements/InventoryView.hpp>
|
||||
#include <graphics/ui/elements/Menu.hpp>
|
||||
#include <graphics/ui/elements/Panel.hpp>
|
||||
#include <graphics/ui/elements/Plotter.hpp>
|
||||
#include <graphics/ui/elements/UINode.hpp>
|
||||
#include <graphics/ui/gui_util.hpp>
|
||||
#include <graphics/ui/GUI.hpp>
|
||||
#include <items/Inventories.hpp>
|
||||
#include <items/Inventory.hpp>
|
||||
#include <items/ItemDef.hpp>
|
||||
#include <logic/scripting/scripting.hpp>
|
||||
#include <maths/voxmaths.hpp>
|
||||
#include <objects/Player.hpp>
|
||||
#include <physics/Hitbox.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include <voxels/Chunks.hpp>
|
||||
#include <window/Camera.hpp>
|
||||
#include <window/Events.hpp>
|
||||
#include <window/input.hpp>
|
||||
#include <window/Window.hpp>
|
||||
#include <world/Level.hpp>
|
||||
#include <world/World.hpp>
|
||||
#include "assets/Assets.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "core_defs.hpp"
|
||||
#include "delegates.hpp"
|
||||
#include "engine.hpp"
|
||||
#include "graphics/core/Atlas.hpp"
|
||||
#include "graphics/core/Batch2D.hpp"
|
||||
#include "graphics/core/Batch3D.hpp"
|
||||
#include "graphics/core/DrawContext.hpp"
|
||||
#include "graphics/core/Font.hpp"
|
||||
#include "graphics/core/Mesh.hpp"
|
||||
#include "graphics/core/Shader.hpp"
|
||||
#include "graphics/core/Texture.hpp"
|
||||
#include "graphics/render/WorldRenderer.hpp"
|
||||
#include "graphics/ui/elements/InventoryView.hpp"
|
||||
#include "graphics/ui/elements/Menu.hpp"
|
||||
#include "graphics/ui/elements/Panel.hpp"
|
||||
#include "graphics/ui/elements/Plotter.hpp"
|
||||
#include "graphics/ui/elements/UINode.hpp"
|
||||
#include "graphics/ui/gui_util.hpp"
|
||||
#include "graphics/ui/GUI.hpp"
|
||||
#include "items/Inventories.hpp"
|
||||
#include "items/Inventory.hpp"
|
||||
#include "items/ItemDef.hpp"
|
||||
#include "logic/scripting/scripting.hpp"
|
||||
#include "maths/voxmaths.hpp"
|
||||
#include "objects/Player.hpp"
|
||||
#include "physics/Hitbox.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "voxels/Chunks.hpp"
|
||||
#include "window/Camera.hpp"
|
||||
#include "window/Events.hpp"
|
||||
#include "window/input.hpp"
|
||||
#include "window/Window.hpp"
|
||||
#include "world/Level.hpp"
|
||||
#include "world/World.hpp"
|
||||
|
||||
#include <assert.h>
|
||||
#include <memory>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#ifndef FRONTEND_HUD_HPP_
|
||||
#define FRONTEND_HUD_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include <util/ObjectsKeeper.hpp>
|
||||
#include "typedefs.hpp"
|
||||
#include "util/ObjectsKeeper.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <memory>
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
#include <utility>
|
||||
|
||||
#include <coders/json.hpp>
|
||||
#include <coders/commons.hpp>
|
||||
#include <content/ContentPack.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include "coders/json.hpp"
|
||||
#include "coders/commons.hpp"
|
||||
#include "content/ContentPack.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
|
||||
static debug::Logger logger("locale");
|
||||
|
||||
|
||||
+13
-13
@@ -4,19 +4,19 @@
|
||||
#include "UiDocument.hpp"
|
||||
#include "screens/MenuScreen.hpp"
|
||||
|
||||
#include <delegates.hpp>
|
||||
#include <engine.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <interfaces/Task.hpp>
|
||||
#include <files/engine_paths.hpp>
|
||||
#include <graphics/ui/elements/Menu.hpp>
|
||||
#include <graphics/ui/gui_util.hpp>
|
||||
#include <graphics/ui/GUI.hpp>
|
||||
#include <logic/scripting/scripting.hpp>
|
||||
#include <settings.hpp>
|
||||
#include <coders/commons.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include <window/Window.hpp>
|
||||
#include "delegates.hpp"
|
||||
#include "engine.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "interfaces/Task.hpp"
|
||||
#include "files/engine_paths.hpp"
|
||||
#include "graphics/ui/elements/Menu.hpp"
|
||||
#include "graphics/ui/gui_util.hpp"
|
||||
#include "graphics/ui/GUI.hpp"
|
||||
#include "logic/scripting/scripting.hpp"
|
||||
#include "settings.hpp"
|
||||
#include "coders/commons.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "window/Window.hpp"
|
||||
|
||||
#include <filesystem>
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#ifndef FRONTEND_MENU_MENU_HPP_
|
||||
#define FRONTEND_MENU_MENU_HPP_
|
||||
|
||||
#include <data/dynamic.hpp>
|
||||
#include <graphics/ui/elements/Menu.hpp>
|
||||
#include "data/dynamic.hpp"
|
||||
#include "graphics/ui/elements/Menu.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
#include "LevelScreen.hpp"
|
||||
|
||||
#include <core_defs.hpp>
|
||||
#include <frontend/hud.hpp>
|
||||
#include <frontend/LevelFrontend.hpp>
|
||||
#include <audio/audio.hpp>
|
||||
#include <coders/imageio.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include <engine.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <graphics/core/DrawContext.hpp>
|
||||
#include <graphics/core/ImageData.hpp>
|
||||
#include <graphics/core/PostProcessing.hpp>
|
||||
#include <graphics/core/Viewport.hpp>
|
||||
#include <graphics/render/WorldRenderer.hpp>
|
||||
#include <graphics/ui/elements/Menu.hpp>
|
||||
#include <graphics/ui/GUI.hpp>
|
||||
#include <logic/LevelController.hpp>
|
||||
#include <logic/scripting/scripting_hud.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include <physics/Hitbox.hpp>
|
||||
#include <voxels/Chunks.hpp>
|
||||
#include <window/Camera.hpp>
|
||||
#include <window/Events.hpp>
|
||||
#include <window/Window.hpp>
|
||||
#include <world/Level.hpp>
|
||||
#include <world/World.hpp>
|
||||
#include "core_defs.hpp"
|
||||
#include "frontend/hud.hpp"
|
||||
#include "frontend/LevelFrontend.hpp"
|
||||
#include "audio/audio.hpp"
|
||||
#include "coders/imageio.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "engine.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "graphics/core/DrawContext.hpp"
|
||||
#include "graphics/core/ImageData.hpp"
|
||||
#include "graphics/core/PostProcessing.hpp"
|
||||
#include "graphics/core/Viewport.hpp"
|
||||
#include "graphics/render/WorldRenderer.hpp"
|
||||
#include "graphics/ui/elements/Menu.hpp"
|
||||
#include "graphics/ui/GUI.hpp"
|
||||
#include "logic/LevelController.hpp"
|
||||
#include "logic/scripting/scripting_hud.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "physics/Hitbox.hpp"
|
||||
#include "voxels/Chunks.hpp"
|
||||
#include "window/Camera.hpp"
|
||||
#include "window/Events.hpp"
|
||||
#include "window/Window.hpp"
|
||||
#include "world/Level.hpp"
|
||||
#include "world/World.hpp"
|
||||
|
||||
static debug::Logger logger("level-screen");
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#include "MenuScreen.hpp"
|
||||
|
||||
#include <graphics/ui/GUI.hpp>
|
||||
#include <graphics/ui/elements/Menu.hpp>
|
||||
#include <graphics/core/Batch2D.hpp>
|
||||
#include <graphics/core/Shader.hpp>
|
||||
#include <graphics/core/Texture.hpp>
|
||||
#include <maths/UVRegion.hpp>
|
||||
#include <window/Window.hpp>
|
||||
#include <window/Camera.hpp>
|
||||
#include <engine.hpp>
|
||||
#include "graphics/ui/GUI.hpp"
|
||||
#include "graphics/ui/elements/Menu.hpp"
|
||||
#include "graphics/core/Batch2D.hpp"
|
||||
#include "graphics/core/Shader.hpp"
|
||||
#include "graphics/core/Texture.hpp"
|
||||
#include "maths/UVRegion.hpp"
|
||||
#include "window/Window.hpp"
|
||||
#include "window/Camera.hpp"
|
||||
#include "engine.hpp"
|
||||
|
||||
MenuScreen::MenuScreen(Engine* engine) : Screen(engine) {
|
||||
engine->resetContent();
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "Screen.hpp"
|
||||
|
||||
#include <graphics/core/Batch2D.hpp>
|
||||
#include <engine.hpp>
|
||||
#include "graphics/core/Batch2D.hpp"
|
||||
#include "engine.hpp"
|
||||
|
||||
Screen::Screen(Engine* engine)
|
||||
: engine(engine),
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef FRONTEND_SCREENS_SCREEN_HPP_
|
||||
#define FRONTEND_SCREENS_SCREEN_HPP_
|
||||
|
||||
#include <util/ObjectsKeeper.hpp>
|
||||
#include "util/ObjectsKeeper.hpp"
|
||||
|
||||
class Engine;
|
||||
class Batch2D;
|
||||
|
||||
Reference in New Issue
Block a user