graphics/

This commit is contained in:
InfiniteCoder
2024-08-04 22:12:48 +03:00
parent f837bc5158
commit eb061bcaf4
44 changed files with 150 additions and 150 deletions
+1 -1
View File
@@ -11,7 +11,7 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include "../graphics/core/TextureAnimation.hpp" #include <graphics/core/TextureAnimation.hpp>
class Assets; class Assets;
+1 -1
View File
@@ -12,7 +12,7 @@
#include <debug/Logger.hpp> #include <debug/Logger.hpp>
#include <files/engine_paths.hpp> #include <files/engine_paths.hpp>
#include <files/files.hpp> #include <files/files.hpp>
#include "../graphics/core/Texture.hpp" #include <graphics/core/Texture.hpp>
#include "../logic/scripting/scripting.hpp" #include "../logic/scripting/scripting.hpp"
#include "../objects/rigging.hpp" #include "../objects/rigging.hpp"
#include "../util/ThreadPool.hpp" #include "../util/ThreadPool.hpp"
+7 -7
View File
@@ -15,13 +15,13 @@
#include <files/engine_paths.hpp> #include <files/engine_paths.hpp>
#include <files/files.hpp> #include <files/files.hpp>
#include "../frontend/UiDocument.hpp" #include "../frontend/UiDocument.hpp"
#include "../graphics/core/Atlas.hpp" #include <graphics/core/Atlas.hpp>
#include "../graphics/core/Font.hpp" #include <graphics/core/Font.hpp>
#include "../graphics/core/ImageData.hpp" #include <graphics/core/ImageData.hpp>
#include "../graphics/core/Model.hpp" #include <graphics/core/Model.hpp>
#include "../graphics/core/Shader.hpp" #include <graphics/core/Shader.hpp>
#include "../graphics/core/Texture.hpp" #include <graphics/core/Texture.hpp>
#include "../graphics/core/TextureAnimation.hpp" #include <graphics/core/TextureAnimation.hpp>
#include "../objects/rigging.hpp" #include "../objects/rigging.hpp"
#include "Assets.hpp" #include "Assets.hpp"
#include "AssetsLoader.hpp" #include "AssetsLoader.hpp"
+1 -1
View File
@@ -4,7 +4,7 @@
#include <functional> #include <functional>
#include <unordered_map> #include <unordered_map>
#include "../graphics/core/ImageData.hpp" #include <graphics/core/ImageData.hpp>
#include "png.hpp" #include "png.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;
+1 -1
View File
@@ -1,6 +1,6 @@
#include "obj.hpp" #include "obj.hpp"
#include "../graphics/core/Model.hpp" #include <graphics/core/Model.hpp>
#include "commons.hpp" #include "commons.hpp"
using namespace model; using namespace model;
+2 -2
View File
@@ -6,8 +6,8 @@
#include <debug/Logger.hpp> #include <debug/Logger.hpp>
#include <files/files.hpp> #include <files/files.hpp>
#include "../graphics/core/GLTexture.hpp" #include <graphics/core/GLTexture.hpp>
#include "../graphics/core/ImageData.hpp" #include <graphics/core/ImageData.hpp>
static debug::Logger logger("png-coder"); static debug::Logger logger("png-coder");
+5 -5
View File
@@ -19,11 +19,11 @@
#include "frontend/menu.hpp" #include "frontend/menu.hpp"
#include "frontend/screens/Screen.hpp" #include "frontend/screens/Screen.hpp"
#include "frontend/screens/MenuScreen.hpp" #include "frontend/screens/MenuScreen.hpp"
#include "graphics/core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include "graphics/core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "graphics/core/ImageData.hpp" #include <graphics/core/ImageData.hpp>
#include "graphics/core/Shader.hpp" #include <graphics/core/Shader.hpp>
#include "graphics/ui/GUI.hpp" #include <graphics/ui/GUI.hpp>
#include "objects/rigging.hpp" #include "objects/rigging.hpp"
#include "logic/EngineController.hpp" #include "logic/EngineController.hpp"
#include "logic/CommandsInterpreter.hpp" #include "logic/CommandsInterpreter.hpp"
+1 -1
View File
@@ -6,7 +6,7 @@
#include <content/Content.hpp> #include <content/Content.hpp>
#include <content/ContentPack.hpp> #include <content/ContentPack.hpp>
#include <core_defs.hpp> #include <core_defs.hpp>
#include "../graphics/core/Atlas.hpp" #include <graphics/core/Atlas.hpp>
#include "../maths/UVRegion.hpp" #include "../maths/UVRegion.hpp"
#include "../voxels/Block.hpp" #include "../voxels/Block.hpp"
+2 -2
View File
@@ -5,8 +5,8 @@
#include <assets/Assets.hpp> #include <assets/Assets.hpp>
#include "../audio/audio.hpp" #include "../audio/audio.hpp"
#include <content/Content.hpp> #include <content/Content.hpp>
#include "../graphics/core/Atlas.hpp" #include <graphics/core/Atlas.hpp>
#include "../graphics/render/BlocksPreview.hpp" #include <graphics/render/BlocksPreview.hpp>
#include "../logic/LevelController.hpp" #include "../logic/LevelController.hpp"
#include "../logic/PlayerController.hpp" #include "../logic/PlayerController.hpp"
#include "../objects/Player.hpp" #include "../objects/Player.hpp"
+3 -3
View File
@@ -3,9 +3,9 @@
#include <utility> #include <utility>
#include <files/files.hpp> #include <files/files.hpp>
#include "../graphics/ui/elements/UINode.hpp" #include <graphics/ui/elements/UINode.hpp>
#include "../graphics/ui/elements/InventoryView.hpp" #include <graphics/ui/elements/InventoryView.hpp>
#include "../graphics/ui/gui_xml.hpp" #include <graphics/ui/gui_xml.hpp>
#include "../logic/scripting/scripting.hpp" #include "../logic/scripting/scripting.hpp"
UiDocument::UiDocument( UiDocument::UiDocument(
+6 -6
View File
@@ -3,12 +3,12 @@
#include <engine.hpp> #include <engine.hpp>
#include <settings.hpp> #include <settings.hpp>
#include <content/Content.hpp> #include <content/Content.hpp>
#include "../graphics/core/Mesh.hpp" #include <graphics/core/Mesh.hpp>
#include "../graphics/ui/elements/CheckBox.hpp" #include <graphics/ui/elements/CheckBox.hpp>
#include "../graphics/ui/elements/TextBox.hpp" #include <graphics/ui/elements/TextBox.hpp>
#include "../graphics/ui/elements/TrackBar.hpp" #include <graphics/ui/elements/TrackBar.hpp>
#include "../graphics/ui/elements/InputBindBox.hpp" #include <graphics/ui/elements/InputBindBox.hpp>
#include "../graphics/render/WorldRenderer.hpp" #include <graphics/render/WorldRenderer.hpp>
#include "../logic/scripting/scripting.hpp" #include "../logic/scripting/scripting.hpp"
#include "../objects/Player.hpp" #include "../objects/Player.hpp"
#include "../objects/Entities.hpp" #include "../objects/Entities.hpp"
+16 -16
View File
@@ -9,22 +9,22 @@
#include <core_defs.hpp> #include <core_defs.hpp>
#include <delegates.hpp> #include <delegates.hpp>
#include <engine.hpp> #include <engine.hpp>
#include "../graphics/core/Atlas.hpp" #include <graphics/core/Atlas.hpp>
#include "../graphics/core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include "../graphics/core/Batch3D.hpp" #include <graphics/core/Batch3D.hpp>
#include "../graphics/core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../graphics/core/Font.hpp" #include <graphics/core/Font.hpp>
#include "../graphics/core/Mesh.hpp" #include <graphics/core/Mesh.hpp>
#include "../graphics/core/Shader.hpp" #include <graphics/core/Shader.hpp>
#include "../graphics/core/Texture.hpp" #include <graphics/core/Texture.hpp>
#include "../graphics/render/WorldRenderer.hpp" #include <graphics/render/WorldRenderer.hpp>
#include "../graphics/ui/elements/InventoryView.hpp" #include <graphics/ui/elements/InventoryView.hpp>
#include "../graphics/ui/elements/Menu.hpp" #include <graphics/ui/elements/Menu.hpp>
#include "../graphics/ui/elements/Panel.hpp" #include <graphics/ui/elements/Panel.hpp>
#include "../graphics/ui/elements/Plotter.hpp" #include <graphics/ui/elements/Plotter.hpp>
#include "../graphics/ui/elements/UINode.hpp" #include <graphics/ui/elements/UINode.hpp>
#include "../graphics/ui/gui_util.hpp" #include <graphics/ui/gui_util.hpp>
#include "../graphics/ui/GUI.hpp" #include <graphics/ui/GUI.hpp>
#include "../items/Inventories.hpp" #include "../items/Inventories.hpp"
#include "../items/Inventory.hpp" #include "../items/Inventory.hpp"
#include "../items/ItemDef.hpp" #include "../items/ItemDef.hpp"
+3 -3
View File
@@ -9,9 +9,9 @@
#include "../data/dynamic.hpp" #include "../data/dynamic.hpp"
#include "../interfaces/Task.hpp" #include "../interfaces/Task.hpp"
#include <files/engine_paths.hpp> #include <files/engine_paths.hpp>
#include "../graphics/ui/elements/Menu.hpp" #include <graphics/ui/elements/Menu.hpp>
#include "../graphics/ui/gui_util.hpp" #include <graphics/ui/gui_util.hpp>
#include "../graphics/ui/GUI.hpp" #include <graphics/ui/GUI.hpp>
#include "../logic/scripting/scripting.hpp" #include "../logic/scripting/scripting.hpp"
#include <settings.hpp> #include <settings.hpp>
#include <coders/commons.hpp> #include <coders/commons.hpp>
+1 -1
View File
@@ -2,7 +2,7 @@
#define FRONTEND_MENU_MENU_HPP_ #define FRONTEND_MENU_MENU_HPP_
#include "../data/dynamic.hpp" #include "../data/dynamic.hpp"
#include "../graphics/ui/elements/Menu.hpp" #include <graphics/ui/elements/Menu.hpp>
#include <string> #include <string>
#include <vector> #include <vector>
+7 -7
View File
@@ -9,13 +9,13 @@
#include <engine.hpp> #include <engine.hpp>
#include <files/files.hpp> #include <files/files.hpp>
#include <content/Content.hpp> #include <content/Content.hpp>
#include "../../graphics/core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../../graphics/core/ImageData.hpp" #include <graphics/core/ImageData.hpp>
#include "../../graphics/core/PostProcessing.hpp" #include <graphics/core/PostProcessing.hpp>
#include "../../graphics/core/Viewport.hpp" #include <graphics/core/Viewport.hpp>
#include "../../graphics/render/WorldRenderer.hpp" #include <graphics/render/WorldRenderer.hpp>
#include "../../graphics/ui/elements/Menu.hpp" #include <graphics/ui/elements/Menu.hpp>
#include "../../graphics/ui/GUI.hpp" #include <graphics/ui/GUI.hpp>
#include "../../logic/LevelController.hpp" #include "../../logic/LevelController.hpp"
#include "../../logic/scripting/scripting_hud.hpp" #include "../../logic/scripting/scripting_hud.hpp"
#include "../../util/stringutil.hpp" #include "../../util/stringutil.hpp"
+5 -5
View File
@@ -1,10 +1,10 @@
#include "MenuScreen.hpp" #include "MenuScreen.hpp"
#include "../../graphics/ui/GUI.hpp" #include <graphics/ui/GUI.hpp>
#include "../../graphics/ui/elements/Menu.hpp" #include <graphics/ui/elements/Menu.hpp>
#include "../../graphics/core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include "../../graphics/core/Shader.hpp" #include <graphics/core/Shader.hpp>
#include "../../graphics/core/Texture.hpp" #include <graphics/core/Texture.hpp>
#include "../../maths/UVRegion.hpp" #include "../../maths/UVRegion.hpp"
#include "../../window/Window.hpp" #include "../../window/Window.hpp"
#include "../../window/Camera.hpp" #include "../../window/Camera.hpp"
+1 -1
View File
@@ -1,6 +1,6 @@
#include "Screen.hpp" #include "Screen.hpp"
#include "../../graphics/core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include <engine.hpp> #include <engine.hpp>
Screen::Screen(Engine* engine) Screen::Screen(Engine* engine)
+7 -7
View File
@@ -7,13 +7,13 @@
#include "../../voxels/Block.hpp" #include "../../voxels/Block.hpp"
#include "../../window/Camera.hpp" #include "../../window/Camera.hpp"
#include "../../window/Window.hpp" #include "../../window/Window.hpp"
#include "../core/Atlas.hpp" #include <graphics/core/Atlas.hpp>
#include "../core/Batch3D.hpp" #include <graphics/core/Batch3D.hpp>
#include "../core/Framebuffer.hpp" #include <graphics/core/Framebuffer.hpp>
#include "../core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../core/Shader.hpp" #include <graphics/core/Shader.hpp>
#include "../core/Texture.hpp" #include <graphics/core/Texture.hpp>
#include "../core/Viewport.hpp" #include <graphics/core/Viewport.hpp>
#include <glm/ext.hpp> #include <glm/ext.hpp>
+1 -1
View File
@@ -1,6 +1,6 @@
#include "BlocksRenderer.hpp" #include "BlocksRenderer.hpp"
#include "../core/Mesh.hpp" #include <graphics/core/Mesh.hpp>
#include "../../maths/UVRegion.hpp" #include "../../maths/UVRegion.hpp"
#include <constants.hpp> #include <constants.hpp>
#include <content/Content.hpp> #include <content/Content.hpp>
+1 -1
View File
@@ -1,7 +1,7 @@
#include "ChunksRenderer.hpp" #include "ChunksRenderer.hpp"
#include "BlocksRenderer.hpp" #include "BlocksRenderer.hpp"
#include <debug/Logger.hpp> #include <debug/Logger.hpp>
#include "../../graphics/core/Mesh.hpp" #include <graphics/core/Mesh.hpp>
#include "../../voxels/Chunk.hpp" #include "../../voxels/Chunk.hpp"
#include "../../world/Level.hpp" #include "../../world/Level.hpp"
#include <settings.hpp> #include <settings.hpp>
+4 -4
View File
@@ -1,9 +1,9 @@
#include "ModelBatch.hpp" #include "ModelBatch.hpp"
#include "../core/Mesh.hpp" #include <graphics/core/Mesh.hpp>
#include "../core/Model.hpp" #include <graphics/core/Model.hpp>
#include "../core/Atlas.hpp" #include <graphics/core/Atlas.hpp>
#include "../core/Texture.hpp" #include <graphics/core/Texture.hpp>
#include <assets/Assets.hpp> #include <assets/Assets.hpp>
#include "../../window/Window.hpp" #include "../../window/Window.hpp"
#include "../../voxels/Chunks.hpp" #include "../../voxels/Chunks.hpp"
+7 -7
View File
@@ -1,12 +1,12 @@
#include "Skybox.hpp" #include "Skybox.hpp"
#include <assets/Assets.hpp> #include <assets/Assets.hpp>
#include "../../graphics/core/Shader.hpp" #include <graphics/core/Shader.hpp>
#include "../../graphics/core/Mesh.hpp" #include <graphics/core/Mesh.hpp>
#include "../../graphics/core/Batch3D.hpp" #include <graphics/core/Batch3D.hpp>
#include "../../graphics/core/Texture.hpp" #include <graphics/core/Texture.hpp>
#include "../../graphics/core/Cubemap.hpp" #include <graphics/core/Cubemap.hpp>
#include "../../graphics/core/Framebuffer.hpp" #include <graphics/core/Framebuffer.hpp>
#include "../../graphics/core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../../window/Window.hpp" #include "../../window/Window.hpp"
#include "../../window/Camera.hpp" #include "../../window/Camera.hpp"
#include "../../maths/UVRegion.hpp" #include "../../maths/UVRegion.hpp"
+9 -9
View File
@@ -30,15 +30,15 @@
#include "../../world/Level.hpp" #include "../../world/Level.hpp"
#include "../../world/LevelEvents.hpp" #include "../../world/LevelEvents.hpp"
#include "../../world/World.hpp" #include "../../world/World.hpp"
#include "../core/Atlas.hpp" #include <graphics/core/Atlas.hpp>
#include "../core/Batch3D.hpp" #include <graphics/core/Batch3D.hpp>
#include "../core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../core/LineBatch.hpp" #include <graphics/core/LineBatch.hpp>
#include "../core/Mesh.hpp" #include <graphics/core/Mesh.hpp>
#include "../core/Model.hpp" #include <graphics/core/Model.hpp>
#include "../core/PostProcessing.hpp" #include <graphics/core/PostProcessing.hpp>
#include "../core/Shader.hpp" #include <graphics/core/Shader.hpp>
#include "../core/Texture.hpp" #include <graphics/core/Texture.hpp>
#include "ChunksRenderer.hpp" #include "ChunksRenderer.hpp"
#include "ModelBatch.hpp" #include "ModelBatch.hpp"
#include "Skybox.hpp" #include "Skybox.hpp"
+3 -3
View File
@@ -9,9 +9,9 @@
#include <assets/Assets.hpp> #include <assets/Assets.hpp>
#include "../../frontend/UiDocument.hpp" #include "../../frontend/UiDocument.hpp"
#include "../../frontend/locale.hpp" #include "../../frontend/locale.hpp"
#include "../../graphics/core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include "../../graphics/core/Shader.hpp" #include <graphics/core/Shader.hpp>
#include "../../graphics/core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../../window/Events.hpp" #include "../../window/Events.hpp"
#include "../../window/Window.hpp" #include "../../window/Window.hpp"
#include "../../window/input.hpp" #include "../../window/input.hpp"
+2 -2
View File
@@ -3,8 +3,8 @@
#include <utility> #include <utility>
#include "Label.hpp" #include "Label.hpp"
#include "../../core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../../core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
using namespace gui; using namespace gui;
+2 -2
View File
@@ -2,8 +2,8 @@
#include <utility> #include <utility>
#include "../../core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../../core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include "Label.hpp" #include "Label.hpp"
using namespace gui; using namespace gui;
+2 -2
View File
@@ -1,7 +1,7 @@
#include "Container.hpp" #include "Container.hpp"
#include "../../core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../../core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include <algorithm> #include <algorithm>
#include <utility> #include <utility>
+4 -4
View File
@@ -2,10 +2,10 @@
#include <utility> #include <utility>
#include "../../core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../../core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include "../../core/Texture.hpp" #include <graphics/core/Texture.hpp>
#include "../../core/Atlas.hpp" #include <graphics/core/Atlas.hpp>
#include <assets/Assets.hpp> #include <assets/Assets.hpp>
#include "../../../maths/UVRegion.hpp" #include "../../../maths/UVRegion.hpp"
+2 -2
View File
@@ -1,8 +1,8 @@
#include "InputBindBox.hpp" #include "InputBindBox.hpp"
#include "Label.hpp" #include "Label.hpp"
#include "../../core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../../core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include "../../../util/stringutil.hpp" #include "../../../util/stringutil.hpp"
using namespace gui; using namespace gui;
+7 -7
View File
@@ -16,13 +16,13 @@
#include "../../../window/Events.hpp" #include "../../../window/Events.hpp"
#include "../../../window/input.hpp" #include "../../../window/input.hpp"
#include "../../../world/Level.hpp" #include "../../../world/Level.hpp"
#include "../../core/Atlas.hpp" #include <graphics/core/Atlas.hpp>
#include "../../core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include "../../core/Font.hpp" #include <graphics/core/Font.hpp>
#include "../../core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../../core/Shader.hpp" #include <graphics/core/Shader.hpp>
#include "../../core/Texture.hpp" #include <graphics/core/Texture.hpp>
#include "../../render/BlocksPreview.hpp" #include <graphics/render/BlocksPreview.hpp>
#include "../GUI.hpp" #include "../GUI.hpp"
#include <glm/glm.hpp> #include <glm/glm.hpp>
+3 -3
View File
@@ -1,9 +1,9 @@
#include "Label.hpp" #include "Label.hpp"
#include <utility> #include <utility>
#include "../../core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../../core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include "../../core/Font.hpp" #include <graphics/core/Font.hpp>
#include <assets/Assets.hpp> #include <assets/Assets.hpp>
#include "../../../util/stringutil.hpp" #include "../../../util/stringutil.hpp"
+3 -3
View File
@@ -1,8 +1,8 @@
#include "Plotter.hpp" #include "Plotter.hpp"
#include "../../core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include "../../core/Font.hpp" #include <graphics/core/Font.hpp>
#include "../../core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include <assets/Assets.hpp> #include <assets/Assets.hpp>
#include "../../../util/stringutil.hpp" #include "../../../util/stringutil.hpp"
+3 -3
View File
@@ -4,9 +4,9 @@
#include <algorithm> #include <algorithm>
#include "Label.hpp" #include "Label.hpp"
#include "../../core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../../core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include "../../core/Font.hpp" #include <graphics/core/Font.hpp>
#include <assets/Assets.hpp> #include <assets/Assets.hpp>
#include "../../../util/stringutil.hpp" #include "../../../util/stringutil.hpp"
#include "../../../window/Events.hpp" #include "../../../window/Events.hpp"
+2 -2
View File
@@ -2,8 +2,8 @@
#include <utility> #include <utility>
#include "../../core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../../core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
#include <assets/Assets.hpp> #include <assets/Assets.hpp>
using namespace gui; using namespace gui;
+1 -1
View File
@@ -3,7 +3,7 @@
#include <utility> #include <utility>
#include "Container.hpp" #include "Container.hpp"
#include "../../core/Batch2D.hpp" #include <graphics/core/Batch2D.hpp>
using gui::UINode; using gui::UINode;
using gui::Align; using gui::Align;
+1 -1
View File
@@ -7,7 +7,7 @@
#include <content/Content.hpp> #include <content/Content.hpp>
#include <files/WorldFiles.hpp> #include <files/WorldFiles.hpp>
#include "../graphics/core/Mesh.hpp" #include <graphics/core/Mesh.hpp>
#include "../lighting/Lighting.hpp" #include "../lighting/Lighting.hpp"
#include "../maths/voxmaths.hpp" #include "../maths/voxmaths.hpp"
#include "../util/timeutil.hpp" #include "../util/timeutil.hpp"
+2 -2
View File
@@ -14,8 +14,8 @@
#include "../frontend/menu.hpp" #include "../frontend/menu.hpp"
#include "../frontend/screens/LevelScreen.hpp" #include "../frontend/screens/LevelScreen.hpp"
#include "../frontend/screens/MenuScreen.hpp" #include "../frontend/screens/MenuScreen.hpp"
#include "../graphics/ui/elements/Menu.hpp" #include <graphics/ui/elements/Menu.hpp>
#include "../graphics/ui/gui_util.hpp" #include <graphics/ui/gui_util.hpp>
#include "../interfaces/Task.hpp" #include "../interfaces/Task.hpp"
#include "../util/stringutil.hpp" #include "../util/stringutil.hpp"
#include "../world/Level.hpp" #include "../world/Level.hpp"
+10 -10
View File
@@ -2,16 +2,16 @@
#include <engine.hpp> #include <engine.hpp>
#include "../../../frontend/UiDocument.hpp" #include "../../../frontend/UiDocument.hpp"
#include "../../../frontend/locale.hpp" #include "../../../frontend/locale.hpp"
#include "../../../graphics/ui/elements/Button.hpp" #include <graphics/ui/elements/Button.hpp>
#include "../../../graphics/ui/elements/CheckBox.hpp" #include <graphics/ui/elements/CheckBox.hpp>
#include "../../../graphics/ui/elements/Image.hpp" #include <graphics/ui/elements/Image.hpp>
#include "../../../graphics/ui/elements/InventoryView.hpp" #include <graphics/ui/elements/InventoryView.hpp>
#include "../../../graphics/ui/elements/Menu.hpp" #include <graphics/ui/elements/Menu.hpp>
#include "../../../graphics/ui/elements/Panel.hpp" #include <graphics/ui/elements/Panel.hpp>
#include "../../../graphics/ui/elements/TextBox.hpp" #include <graphics/ui/elements/TextBox.hpp>
#include "../../../graphics/ui/elements/TrackBar.hpp" #include <graphics/ui/elements/TrackBar.hpp>
#include "../../../graphics/ui/elements/UINode.hpp" #include <graphics/ui/elements/UINode.hpp>
#include "../../../graphics/ui/gui_util.hpp" #include <graphics/ui/gui_util.hpp>
#include "../../../items/Inventories.hpp" #include "../../../items/Inventories.hpp"
#include "../../../util/stringutil.hpp" #include "../../../util/stringutil.hpp"
#include "../../../world/Level.hpp" #include "../../../world/Level.hpp"
+1 -1
View File
@@ -6,7 +6,7 @@
#include <engine.hpp> #include <engine.hpp>
#include "../../../frontend/UiDocument.hpp" #include "../../../frontend/UiDocument.hpp"
#include "../../../frontend/hud.hpp" #include "../../../frontend/hud.hpp"
#include "../../../graphics/ui/elements/InventoryView.hpp" #include <graphics/ui/elements/InventoryView.hpp>
#include "../../../items/Inventories.hpp" #include "../../../items/Inventories.hpp"
#include "../../../logic/BlocksController.hpp" #include "../../../logic/BlocksController.hpp"
#include "../../../objects/Player.hpp" #include "../../../objects/Player.hpp"
+1 -1
View File
@@ -1,7 +1,7 @@
#include <engine.hpp> #include <engine.hpp>
#include "../../../frontend/hud.hpp" #include "../../../frontend/hud.hpp"
#include "../../../frontend/screens/Screen.hpp" #include "../../../frontend/screens/Screen.hpp"
#include "../../../graphics/ui/GUI.hpp" #include <graphics/ui/GUI.hpp>
#include "../../../util/stringutil.hpp" #include "../../../util/stringutil.hpp"
#include "../../../window/Events.hpp" #include "../../../window/Events.hpp"
#include "../../../window/input.hpp" #include "../../../window/input.hpp"
+4 -4
View File
@@ -8,10 +8,10 @@
#include "../data/dynamic_util.hpp" #include "../data/dynamic_util.hpp"
#include <debug/Logger.hpp> #include <debug/Logger.hpp>
#include <engine.hpp> #include <engine.hpp>
#include "../graphics/core/DrawContext.hpp" #include <graphics/core/DrawContext.hpp>
#include "../graphics/core/LineBatch.hpp" #include <graphics/core/LineBatch.hpp>
#include "../graphics/core/Model.hpp" #include <graphics/core/Model.hpp>
#include "../graphics/render/ModelBatch.hpp" #include <graphics/render/ModelBatch.hpp>
#include "../logic/scripting/scripting.hpp" #include "../logic/scripting/scripting.hpp"
#include "../maths/FrustumCulling.hpp" #include "../maths/FrustumCulling.hpp"
#include "../maths/rays.hpp" #include "../maths/rays.hpp"
+2 -2
View File
@@ -3,8 +3,8 @@
#include <assets/Assets.hpp> #include <assets/Assets.hpp>
#include <coders/json.hpp> #include <coders/json.hpp>
#include "../data/dynamic_util.hpp" #include "../data/dynamic_util.hpp"
#include "../graphics/core/Model.hpp" #include <graphics/core/Model.hpp>
#include "../graphics/render/ModelBatch.hpp" #include <graphics/render/ModelBatch.hpp>
#define GLM_ENABLE_EXPERIMENTAL #define GLM_ENABLE_EXPERIMENTAL
#include <glm/ext/matrix_transform.hpp> #include <glm/ext/matrix_transform.hpp>
+1 -1
View File
@@ -10,7 +10,7 @@
#include <coders/json.hpp> #include <coders/json.hpp>
#include <content/Content.hpp> #include <content/Content.hpp>
#include <files/WorldFiles.hpp> #include <files/WorldFiles.hpp>
#include "../graphics/core/Mesh.hpp" #include <graphics/core/Mesh.hpp>
#include "../lighting/Lightmap.hpp" #include "../lighting/Lightmap.hpp"
#include "../maths/aabb.hpp" #include "../maths/aabb.hpp"
#include "../maths/rays.hpp" #include "../maths/rays.hpp"
+2 -2
View File
@@ -8,8 +8,8 @@
#include <thread> #include <thread>
#include <debug/Logger.hpp> #include <debug/Logger.hpp>
#include "../graphics/core/ImageData.hpp" #include <graphics/core/ImageData.hpp>
#include "../graphics/core/Texture.hpp" #include <graphics/core/Texture.hpp>
#include <settings.hpp> #include <settings.hpp>
#include "../util/ObjectsKeeper.hpp" #include "../util/ObjectsKeeper.hpp"
#include "Events.hpp" #include "Events.hpp"