PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

just a minor refactor, nothing special

Browse Source
This commit is contained in:
MihailRis 2024-04-23 02:00:03 +03:00
parent 6e2bc9ca95
commit 9f2bceb039
67 changed files with 143 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/assets/Assets.cpp
View File

@ -1,10 +1,10 @@
#include "Assets.h" #include "Assets.h"
#include "../audio/audio.h" #include "../audio/audio.h"
#include "../graphics/core/Texture.h" #include "../graphics/core/Texture.hpp"
#include "../graphics/core/Shader.h" #include "../graphics/core/Shader.hpp"
#include "../graphics/core/Atlas.h" #include "../graphics/core/Atlas.hpp"
#include "../graphics/core/Font.h" #include "../graphics/core/Font.hpp"
#include "../frontend/UiDocument.h" #include "../frontend/UiDocument.h"
#include "../logic/scripting/scripting.h" #include "../logic/scripting/scripting.h"

2
src/assets/Assets.h
View File

@ -1,7 +1,7 @@
#ifndef ASSETS_ASSETS_H_ #ifndef ASSETS_ASSETS_H_
#define ASSETS_ASSETS_H_ #define ASSETS_ASSETS_H_
#include "../graphics/core/TextureAnimation.h" #include "../graphics/core/TextureAnimation.hpp"
#include <string> #include <string>
#include <memory> #include <memory>

12
src/assets/assetload_funcs.cpp
View File

@ -11,12 +11,12 @@
#include "../coders/imageio.h" #include "../coders/imageio.h"
#include "../coders/json.h" #include "../coders/json.h"
#include "../coders/GLSLExtension.h" #include "../coders/GLSLExtension.h"
#include "../graphics/core/Shader.h" #include "../graphics/core/Shader.hpp"
#include "../graphics/core/Texture.h" #include "../graphics/core/Texture.hpp"
#include "../graphics/core/ImageData.h" #include "../graphics/core/ImageData.hpp"
#include "../graphics/core/Atlas.h" #include "../graphics/core/Atlas.hpp"
#include "../graphics/core/Font.h" #include "../graphics/core/Font.hpp"
#include "../graphics/core/TextureAnimation.h" #include "../graphics/core/TextureAnimation.hpp"
#include "../frontend/UiDocument.h" #include "../frontend/UiDocument.h"
namespace fs = std::filesystem; namespace fs = std::filesystem;

2
src/coders/imageio.cpp
View File

@ -1,7 +1,7 @@
#include "imageio.h" #include "imageio.h"
#include "png.h" #include "png.h"
#include "../graphics/core/ImageData.h" #include "../graphics/core/ImageData.hpp"
#include <filesystem> #include <filesystem>
#include <functional> #include <functional>

4
src/coders/png.cpp
View File

@ -4,8 +4,8 @@
#include <memory> #include <memory>
#include <GL/glew.h> #include <GL/glew.h>
#include "../graphics/core/ImageData.h" #include "../graphics/core/ImageData.hpp"
#include "../graphics/core/Texture.h" #include "../graphics/core/Texture.hpp"
#include "../files/files.h" #include "../files/files.h"
#ifndef _WIN32 #ifndef _WIN32

8
src/engine.cpp
View File

@ -14,10 +14,10 @@
#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.h" #include "graphics/core/Batch2D.hpp"
#include "graphics/core/GfxContext.h" #include "graphics/core/GfxContext.hpp"
#include "graphics/core/ImageData.h" #include "graphics/core/ImageData.hpp"
#include "graphics/core/Shader.h" #include "graphics/core/Shader.hpp"
#include "graphics/ui/GUI.h" #include "graphics/ui/GUI.h"
#include "logic/EngineController.hpp" #include "logic/EngineController.hpp"
#include "logic/scripting/scripting.h" #include "logic/scripting/scripting.h"

2
src/frontend/ContentGfxCache.cpp
View File

@ -6,7 +6,7 @@
#include "../content/Content.h" #include "../content/Content.h"
#include "../content/ContentPack.h" #include "../content/ContentPack.h"
#include "../core_defs.h" #include "../core_defs.h"
#include "../graphics/core/Atlas.h" #include "../graphics/core/Atlas.hpp"
#include "../maths/UVRegion.h" #include "../maths/UVRegion.h"
#include "../voxels/Block.h" #include "../voxels/Block.h"
#include "UiDocument.h" #include "UiDocument.h"

10
src/frontend/InventoryView.cpp
View File

@ -5,11 +5,11 @@
#include "../assets/Assets.h" #include "../assets/Assets.h"
#include "../content/Content.h" #include "../content/Content.h"
#include "../graphics/core/Atlas.h" #include "../graphics/core/Atlas.hpp"
#include "../graphics/core/Batch2D.h" #include "../graphics/core/Batch2D.hpp"
#include "../graphics/core/Font.h" #include "../graphics/core/Font.hpp"
#include "../graphics/core/GfxContext.h" #include "../graphics/core/GfxContext.hpp"
#include "../graphics/core/Shader.h" #include "../graphics/core/Shader.hpp"
#include "../graphics/render/BlocksPreview.h" #include "../graphics/render/BlocksPreview.h"
#include "../items/Inventories.h" #include "../items/Inventories.h"
#include "../items/Inventory.h" #include "../items/Inventory.h"

2
src/frontend/LevelFrontend.cpp
View File

@ -3,7 +3,7 @@
#include "../assets/Assets.h" #include "../assets/Assets.h"
#include "../audio/audio.h" #include "../audio/audio.h"
#include "../content/Content.h" #include "../content/Content.h"
#include "../graphics/core/Atlas.h" #include "../graphics/core/Atlas.hpp"
#include "../graphics/render/BlocksPreview.h" #include "../graphics/render/BlocksPreview.h"
#include "../logic/LevelController.h" #include "../logic/LevelController.h"
#include "../logic/PlayerController.h" #include "../logic/PlayerController.h"

2
src/frontend/debug_panel.cpp
View File

@ -5,7 +5,7 @@
#include "../audio/audio.h" #include "../audio/audio.h"
#include "../delegates.h" #include "../delegates.h"
#include "../engine.h" #include "../engine.h"
#include "../graphics/core/Mesh.h" #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"

16
src/frontend/hud.cpp
View File

@ -5,14 +5,14 @@
#include "../core_defs.h" #include "../core_defs.h"
#include "../delegates.h" #include "../delegates.h"
#include "../engine.h" #include "../engine.h"
#include "../graphics/core/Atlas.h" #include "../graphics/core/Atlas.hpp"
#include "../graphics/core/Batch2D.h" #include "../graphics/core/Batch2D.hpp"
#include "../graphics/core/Batch3D.h" #include "../graphics/core/Batch3D.hpp"
#include "../graphics/core/Font.h" #include "../graphics/core/Font.hpp"
#include "../graphics/core/GfxContext.h" #include "../graphics/core/GfxContext.hpp"
#include "../graphics/core/Mesh.h" #include "../graphics/core/Mesh.hpp"
#include "../graphics/core/Shader.h" #include "../graphics/core/Shader.hpp"
#include "../graphics/core/Texture.h" #include "../graphics/core/Texture.hpp"
#include "../graphics/render/BlocksPreview.h" #include "../graphics/render/BlocksPreview.h"
#include "../graphics/render/WorldRenderer.h" #include "../graphics/render/WorldRenderer.h"
#include "../graphics/ui/elements/UINode.hpp" #include "../graphics/ui/elements/UINode.hpp"

6
src/frontend/screens/LevelScreen.cpp
View File

@ -6,9 +6,9 @@
#include "../../audio/audio.h" #include "../../audio/audio.h"
#include "../../coders/imageio.h" #include "../../coders/imageio.h"
#include "../../graphics/core/PostProcessing.h" #include "../../graphics/core/PostProcessing.h"
#include "../../graphics/core/GfxContext.h" #include "../../graphics/core/GfxContext.hpp"
#include "../../graphics/core/Viewport.h" #include "../../graphics/core/Viewport.hpp"
#include "../../graphics/core/ImageData.h" #include "../../graphics/core/ImageData.hpp"
#include "../../graphics/ui/GUI.h" #include "../../graphics/ui/GUI.h"
#include "../../graphics/ui/elements/Menu.hpp" #include "../../graphics/ui/elements/Menu.hpp"
#include "../../graphics/render/WorldRenderer.h" #include "../../graphics/render/WorldRenderer.h"

4
src/frontend/screens/MenuScreen.cpp
View File

@ -2,8 +2,8 @@
#include "../../graphics/ui/GUI.h" #include "../../graphics/ui/GUI.h"
#include "../../graphics/ui/elements/Menu.hpp" #include "../../graphics/ui/elements/Menu.hpp"
#include "../../graphics/core/Batch2D.h" #include "../../graphics/core/Batch2D.hpp"
#include "../../graphics/core/Shader.h" #include "../../graphics/core/Shader.hpp"
#include "../../window/Window.h" #include "../../window/Window.h"
#include "../../window/Camera.h" #include "../../window/Camera.h"
#include "../../engine.h" #include "../../engine.h"

2
src/frontend/screens/Screen.cpp
View File

@ -1,6 +1,6 @@
#include "Screen.hpp" #include "Screen.hpp"
#include "../../graphics/core/Batch2D.h" #include "../../graphics/core/Batch2D.hpp"
#include "../../engine.h" #include "../../engine.h"
Screen::Screen(Engine* engine) : engine(engine), batch(new Batch2D(1024)) { Screen::Screen(Engine* engine) : engine(engine), batch(new Batch2D(1024)) {

6
src/graphics/core/Atlas.cpp
View File

@ -1,9 +1,9 @@
#include "Atlas.h" #include "Atlas.hpp"
#include <stdexcept> #include <stdexcept>
#include "../../maths/LMPacker.h" #include "../../maths/LMPacker.h"
#include "Texture.h" #include "Texture.hpp"
#include "ImageData.h" #include "ImageData.hpp"
Atlas::Atlas( Atlas::Atlas(
std::unique_ptr<ImageData> image, std::unique_ptr<ImageData> image,

0
src/graphics/core/Atlas.h → src/graphics/core/Atlas.hpp
View File

8
src/graphics/core/Batch2D.cpp
View File

@ -1,7 +1,7 @@
#include "Batch2D.h" #include "Batch2D.hpp"
#include "Mesh.h" #include "Mesh.hpp"
#include "Texture.h" #include "Texture.hpp"
#include "gl_util.h" #include "gl_util.hpp"
#include <GL/glew.h> #include <GL/glew.h>

2
src/graphics/core/Batch2D.h → src/graphics/core/Batch2D.hpp
View File

@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include "commons.h" #include "commons.hpp"
#include "../../maths/UVRegion.h" #include "../../maths/UVRegion.h"
class Mesh; class Mesh;

6
src/graphics/core/Batch3D.cpp
View File

@ -1,7 +1,7 @@
#include "Batch3D.h" #include "Batch3D.hpp"
#include "Mesh.h" #include "Mesh.hpp"
#include "Texture.h" #include "Texture.hpp"
#include <GL/glew.h> #include <GL/glew.h>
#include "../../typedefs.h" #include "../../typedefs.h"

0
src/graphics/core/Batch3D.h → src/graphics/core/Batch3D.hpp
View File

4
src/graphics/core/Cubemap.cpp
View File

@ -1,5 +1,5 @@
#include "Cubemap.h" #include "Cubemap.hpp"
#include "gl_util.h" #include "gl_util.hpp"
#include <GL/glew.h> #include <GL/glew.h>

2
src/graphics/core/Cubemap.h → src/graphics/core/Cubemap.hpp
View File

@ -1,7 +1,7 @@
#ifndef GRAPHICS_CORE_CUBEMAP_H_ #ifndef GRAPHICS_CORE_CUBEMAP_H_
#define GRAPHICS_CORE_CUBEMAP_H_ #define GRAPHICS_CORE_CUBEMAP_H_
#include "Texture.h" #include "Texture.hpp"
/// @brief Cubemap texture /// @brief Cubemap texture
class Cubemap : public Texture { class Cubemap : public Texture {

6
src/graphics/core/Font.cpp
View File

@ -1,6 +1,6 @@
#include "Font.h" #include "Font.hpp"
#include "Texture.h" #include "Texture.hpp"
#include "Batch2D.h" #include "Batch2D.hpp"
inline constexpr uint GLYPH_SIZE = 16; inline constexpr uint GLYPH_SIZE = 16;
inline constexpr uint MAX_CODEPAGES = 10000; // idk ho many codepages unicode has inline constexpr uint MAX_CODEPAGES = 10000; // idk ho many codepages unicode has

0
src/graphics/core/Font.h → src/graphics/core/Font.hpp
View File

4
src/graphics/core/Framebuffer.cpp
View File

@ -1,7 +1,7 @@
#include "Framebuffer.h" #include "Framebuffer.hpp"
#include <GL/glew.h> #include <GL/glew.h>
#include "Texture.h" #include "Texture.hpp"
Framebuffer::Framebuffer(uint fbo, uint depth, std::unique_ptr<Texture> texture) Framebuffer::Framebuffer(uint fbo, uint depth, std::unique_ptr<Texture> texture)
: fbo(fbo), depth(depth), texture(std::move(texture)) : fbo(fbo), depth(depth), texture(std::move(texture))

0
src/graphics/core/Framebuffer.h → src/graphics/core/Framebuffer.hpp
View File

6
src/graphics/core/GfxContext.cpp
View File

@ -1,9 +1,9 @@
#include "GfxContext.h" #include "GfxContext.hpp"
#include <GL/glew.h> #include <GL/glew.h>
#include "Batch2D.h" #include "Batch2D.hpp"
#include "Framebuffer.h" #include "Framebuffer.hpp"
GfxContext::GfxContext( GfxContext::GfxContext(
const GfxContext* parent, const GfxContext* parent,

2
src/graphics/core/GfxContext.h → src/graphics/core/GfxContext.hpp
View File

@ -1,7 +1,7 @@
#ifndef GRAPHICS_CORE_GFX_CONTEXT_H_ #ifndef GRAPHICS_CORE_GFX_CONTEXT_H_
#define GRAPHICS_CORE_GFX_CONTEXT_H_ #define GRAPHICS_CORE_GFX_CONTEXT_H_
#include "Viewport.h" #include "Viewport.hpp"
#include "../../window/Window.h" #include "../../window/Window.h"
#include "../../typedefs.h" #include "../../typedefs.h"

2
src/graphics/core/ImageData.cpp
View File

@ -1,4 +1,4 @@
#include "ImageData.h" #include "ImageData.hpp"
#include <assert.h> #include <assert.h>
#include <stdexcept> #include <stdexcept>

0
src/graphics/core/ImageData.h → src/graphics/core/ImageData.hpp
View File

4
src/graphics/core/LineBatch.cpp
View File

@ -1,5 +1,5 @@
#include "LineBatch.h" #include "LineBatch.hpp"
#include "Mesh.h" #include "Mesh.hpp"
#include <GL/glew.h> #include <GL/glew.h>

0
src/graphics/core/LineBatch.h → src/graphics/core/LineBatch.hpp
View File

2
src/graphics/core/Mesh.cpp
View File

@ -1,4 +1,4 @@
#include "Mesh.h" #include "Mesh.hpp"
#include <GL/glew.h> #include <GL/glew.h>
int Mesh::meshesCount = 0; int Mesh::meshesCount = 0;

0
src/graphics/core/Mesh.h → src/graphics/core/Mesh.hpp
View File

8
src/graphics/core/PostProcessing.cpp
View File

@ -1,8 +1,8 @@
#include "PostProcessing.h" #include "PostProcessing.h"
#include "Mesh.h" #include "Mesh.hpp"
#include "Shader.h" #include "Shader.hpp"
#include "Texture.h" #include "Texture.hpp"
#include "Framebuffer.h" #include "Framebuffer.hpp"
#include <stdexcept> #include <stdexcept>

4
src/graphics/core/PostProcessing.h
View File

@ -1,8 +1,8 @@
#ifndef GRAPHICS_CORE_POST_PROCESSING_H_ #ifndef GRAPHICS_CORE_POST_PROCESSING_H_
#define GRAPHICS_CORE_POST_PROCESSING_H_ #define GRAPHICS_CORE_POST_PROCESSING_H_
#include "Viewport.h" #include "Viewport.hpp"
#include "GfxContext.h" #include "GfxContext.hpp"
#include <memory> #include <memory>

2
src/graphics/core/Shader.cpp
View File

@ -1,4 +1,4 @@
#include "Shader.h" #include "Shader.hpp"
#include <exception> #include <exception>
#include <fstream> #include <fstream>

0
src/graphics/core/Shader.h → src/graphics/core/Shader.hpp
View File

8
src/graphics/core/Texture.cpp
View File

@ -1,11 +1,11 @@
#include "Texture.h" #include "Texture.hpp"
#include "ImageData.hpp"
#include "gl_util.hpp"
#include <GL/glew.h> #include <GL/glew.h>
#include <stdexcept> #include <stdexcept>
#include <memory> #include <memory>
#include "ImageData.h"
#include "gl_util.h"
uint Texture::MAX_RESOLUTION = 1024; // Window.initialize overrides it uint Texture::MAX_RESOLUTION = 1024; // Window.initialize overrides it
Texture::Texture(uint id, uint width, uint height) Texture::Texture(uint id, uint width, uint height)

2
src/graphics/core/Texture.h → src/graphics/core/Texture.hpp
View File

@ -4,7 +4,7 @@
#include <string> #include <string>
#include <memory> #include <memory>
#include "../../typedefs.h" #include "../../typedefs.h"
#include "ImageData.h" #include "ImageData.hpp"
class Texture { class Texture {
protected: protected:

6
src/graphics/core/TextureAnimation.cpp
View File

@ -1,6 +1,6 @@
#include "TextureAnimation.h" #include "TextureAnimation.hpp"
#include "Texture.h" #include "Texture.hpp"
#include "Framebuffer.h" #include "Framebuffer.hpp"
#include <GL/glew.h> #include <GL/glew.h>
#include <unordered_set> #include <unordered_set>

0
src/graphics/core/TextureAnimation.h → src/graphics/core/TextureAnimation.hpp
View File

2
src/graphics/core/Viewport.cpp
View File

@ -1,4 +1,4 @@
#include "Viewport.h" #include "Viewport.hpp"
Viewport::Viewport(uint width, uint height) Viewport::Viewport(uint width, uint height)
: width(width), height(height) { : width(width), height(height) {

0
src/graphics/core/Viewport.h → src/graphics/core/Viewport.hpp
View File

0
src/graphics/core/commons.h → src/graphics/core/commons.hpp
View File

4
src/graphics/core/gl_util.h → src/graphics/core/gl_util.hpp
View File

@ -1,8 +1,8 @@
#ifndef GRAPHICS_CORE_GL_UTIL_H_ #ifndef GRAPHICS_CORE_GL_UTIL_H_
#define GRAPHICS_CORE_GL_UTIL_H_ #define GRAPHICS_CORE_GL_UTIL_H_
#include "commons.h" #include "commons.hpp"
#include "ImageData.h" #include "ImageData.hpp"
#include <GL/glew.h> #include <GL/glew.h>

14
src/graphics/render/BlocksPreview.cpp
View File

@ -9,13 +9,13 @@
#include "../../voxels/Block.h" #include "../../voxels/Block.h"
#include "../../window/Camera.h" #include "../../window/Camera.h"
#include "../../window/Window.h" #include "../../window/Window.h"
#include "../core/Atlas.h" #include "../core/Atlas.hpp"
#include "../core/Batch3D.h" #include "../core/Batch3D.hpp"
#include "../core/Framebuffer.h" #include "../core/Framebuffer.hpp"
#include "../core/GfxContext.h" #include "../core/GfxContext.hpp"
#include "../core/Shader.h" #include "../core/Shader.hpp"
#include "../core/Texture.h" #include "../core/Texture.hpp"
#include "../core/Viewport.h" #include "../core/Viewport.hpp"
std::unique_ptr<ImageData> BlocksPreview::draw( std::unique_ptr<ImageData> BlocksPreview::draw(
const ContentGfxCache* cache, const ContentGfxCache* cache,

2
src/graphics/render/BlocksRenderer.cpp
View File

@ -2,7 +2,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include "../core/Mesh.h" #include "../core/Mesh.hpp"
#include "../../maths/UVRegion.h" #include "../../maths/UVRegion.h"
#include "../../constants.h" #include "../../constants.h"
#include "../../content/Content.h" #include "../../content/Content.h"

2
src/graphics/render/ChunksRenderer.cpp
View File

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

14
src/graphics/render/Skybox.cpp
View File

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

14
src/graphics/render/WorldRenderer.cpp
View File

@ -21,14 +21,14 @@
#include "../../world/Level.h" #include "../../world/Level.h"
#include "../../world/LevelEvents.h" #include "../../world/LevelEvents.h"
#include "../../world/World.h" #include "../../world/World.h"
#include "../core/Atlas.h" #include "../core/Atlas.hpp"
#include "../core/Batch3D.h" #include "../core/Batch3D.hpp"
#include "../core/GfxContext.h" #include "../core/GfxContext.hpp"
#include "../core/LineBatch.h" #include "../core/LineBatch.hpp"
#include "../core/Mesh.h" #include "../core/Mesh.hpp"
#include "../core/PostProcessing.h" #include "../core/PostProcessing.h"
#include "../core/Shader.h" #include "../core/Shader.hpp"
#include "../core/Texture.h" #include "../core/Texture.hpp"
#include "ChunksRenderer.h" #include "ChunksRenderer.h"
#include "Skybox.h" #include "Skybox.h"

6
src/graphics/ui/GUI.cpp
View File

@ -7,9 +7,9 @@
#include "../../assets/Assets.h" #include "../../assets/Assets.h"
#include "../../frontend/UiDocument.h" #include "../../frontend/UiDocument.h"
#include "../../graphics/core/Batch2D.h" #include "../../graphics/core/Batch2D.hpp"
#include "../../graphics/core/Shader.h" #include "../../graphics/core/Shader.hpp"
#include "../../graphics/core/GfxContext.h" #include "../../graphics/core/GfxContext.hpp"
#include "../../window/Events.h" #include "../../window/Events.h"
#include "../../window/input.h" #include "../../window/input.h"
#include "../../window/Camera.h" #include "../../window/Camera.h"

4
src/graphics/ui/elements/Button.cpp
View File

@ -1,8 +1,8 @@
#include "Button.hpp" #include "Button.hpp"
#include "Label.hpp" #include "Label.hpp"
#include "../../core/GfxContext.h" #include "../../core/GfxContext.hpp"
#include "../../core/Batch2D.h" #include "../../core/Batch2D.hpp"
using namespace gui; using namespace gui;

4
src/graphics/ui/elements/CheckBox.cpp
View File

@ -1,7 +1,7 @@
#include "CheckBox.hpp" #include "CheckBox.hpp"
#include "../../core/GfxContext.h" #include "../../core/GfxContext.hpp"
#include "../../core/Batch2D.h" #include "../../core/Batch2D.hpp"
#include "Label.hpp" #include "Label.hpp"
using namespace gui; using namespace gui;

4
src/graphics/ui/elements/Container.cpp
View File

@ -1,7 +1,7 @@
#include "Container.hpp" #include "Container.hpp"
#include "../../core/GfxContext.h" #include "../../core/GfxContext.hpp"
#include "../../core/Batch2D.h" #include "../../core/Batch2D.hpp"
using namespace gui; using namespace gui;

6
src/graphics/ui/elements/Image.cpp
View File

@ -1,8 +1,8 @@
#include "Image.hpp" #include "Image.hpp"
#include "../../core/GfxContext.h" #include "../../core/GfxContext.hpp"
#include "../../core/Batch2D.h" #include "../../core/Batch2D.hpp"
#include "../../core/Texture.h" #include "../../core/Texture.hpp"
#include "../../../assets/Assets.h" #include "../../../assets/Assets.h"
#include "../../../maths/UVRegion.h" #include "../../../maths/UVRegion.h"

4
src/graphics/ui/elements/InputBindBox.cpp
View File

@ -1,8 +1,8 @@
#include "InputBindBox.hpp" #include "InputBindBox.hpp"
#include "Label.hpp" #include "Label.hpp"
#include "../../core/GfxContext.h" #include "../../core/GfxContext.hpp"
#include "../../core/Batch2D.h" #include "../../core/Batch2D.hpp"
#include "../../../util/stringutil.h" #include "../../../util/stringutil.h"
using namespace gui; using namespace gui;

6
src/graphics/ui/elements/Label.cpp
View File

@ -1,8 +1,8 @@
#include "Label.hpp" #include "Label.hpp"
#include "../../core/GfxContext.h" #include "../../core/GfxContext.hpp"
#include "../../core/Batch2D.h" #include "../../core/Batch2D.hpp"
#include "../../core/Font.h" #include "../../core/Font.hpp"
#include "../../../assets/Assets.h" #include "../../../assets/Assets.h"
#include "../../../util/stringutil.h" #include "../../../util/stringutil.h"

6
src/graphics/ui/elements/Plotter.cpp
View File

@ -1,8 +1,8 @@
#include "Plotter.hpp" #include "Plotter.hpp"
#include "../../core/Batch2D.h" #include "../../core/Batch2D.hpp"
#include "../../core/Font.h" #include "../../core/Font.hpp"
#include "../../core/GfxContext.h" #include "../../core/GfxContext.hpp"
#include "../../../assets/Assets.h" #include "../../../assets/Assets.h"
#include "../../../util/stringutil.h" #include "../../../util/stringutil.h"

6
src/graphics/ui/elements/TextBox.cpp
View File

@ -1,9 +1,9 @@
#include "TextBox.hpp" #include "TextBox.hpp"
#include "Label.hpp" #include "Label.hpp"
#include "../../core/GfxContext.h" #include "../../core/GfxContext.hpp"
#include "../../core/Batch2D.h" #include "../../core/Batch2D.hpp"
#include "../../core/Font.h" #include "../../core/Font.hpp"
#include "../../../assets/Assets.h" #include "../../../assets/Assets.h"
#include "../../../util/stringutil.h" #include "../../../util/stringutil.h"
#include "../../../window/Events.h" #include "../../../window/Events.h"

4
src/graphics/ui/elements/TrackBar.cpp
View File

@ -1,7 +1,7 @@
#include "TrackBar.hpp" #include "TrackBar.hpp"
#include "../../core/GfxContext.h" #include "../../core/GfxContext.hpp"
#include "../../core/Batch2D.h" #include "../../core/Batch2D.hpp"
#include "../../../assets/Assets.h" #include "../../../assets/Assets.h"
using namespace gui; using namespace gui;

2
src/graphics/ui/elements/UINode.cpp
View File

@ -1,7 +1,7 @@
#include "UINode.hpp" #include "UINode.hpp"
#include "Container.hpp" #include "Container.hpp"
#include "../../core/Batch2D.h" #include "../../core/Batch2D.hpp"
using gui::UINode; using gui::UINode;
using gui::Align; using gui::Align;

2
src/logic/ChunksController.cpp
View File

@ -11,7 +11,7 @@
#include "../voxels/ChunksStorage.h" #include "../voxels/ChunksStorage.h"
#include "../voxels/WorldGenerator.h" #include "../voxels/WorldGenerator.h"
#include "../world/WorldGenerators.h" #include "../world/WorldGenerators.h"
#include "../graphics/core/Mesh.h" #include "../graphics/core/Mesh.hpp"
#include "../lighting/Lighting.h" #include "../lighting/Lighting.h"
#include "../files/WorldFiles.h" #include "../files/WorldFiles.h"
#include "../world/Level.h" #include "../world/Level.h"

2
src/logic/scripting/lua/libpack.cpp
View File

@ -7,7 +7,7 @@
#include "../../../files/WorldFiles.h" #include "../../../files/WorldFiles.h"
#include "../../../world/Level.h" #include "../../../world/Level.h"
#include "../../../world/World.h" #include "../../../world/World.h"
#include "../../../graphics/core/Texture.h" #include "../../../graphics/core/Texture.hpp"
#include <string> #include <string>
#include <filesystem> #include <filesystem>

2
src/logic/scripting/lua/libworld.cpp
View File

@ -3,7 +3,7 @@
#include "../scripting.h" #include "../scripting.h"
#include "../../../assets/Assets.h" #include "../../../assets/Assets.h"
#include "../../../coders/imageio.h" #include "../../../coders/imageio.h"
#include "../../../graphics/core/Texture.h" #include "../../../graphics/core/Texture.hpp"
#include "../../../files/engine_paths.h" #include "../../../files/engine_paths.h"
#include "../../../world/Level.h" #include "../../../world/Level.h"
#include "../../../world/World.h" #include "../../../world/World.h"

2
src/voxels/Chunks.cpp
View File

@ -7,7 +7,7 @@
#include "../lighting/Lightmap.h" #include "../lighting/Lightmap.h"
#include "../files/WorldFiles.h" #include "../files/WorldFiles.h"
#include "../world/LevelEvents.h" #include "../world/LevelEvents.h"
#include "../graphics/core/Mesh.h" #include "../graphics/core/Mesh.hpp"
#include "../maths/voxmaths.h" #include "../maths/voxmaths.h"
#include "../maths/aabb.h" #include "../maths/aabb.h"
#include "../maths/rays.h" #include "../maths/rays.h"

4
src/window/Window.cpp
View File

@ -2,8 +2,8 @@
#include "Window.h" #include "Window.h"
#include "Events.h" #include "Events.h"
#include "../debug/Logger.h" #include "../debug/Logger.h"
#include "../graphics/core/ImageData.h" #include "../graphics/core/ImageData.hpp"
#include "../graphics/core/Texture.h" #include "../graphics/core/Texture.hpp"
#include <GL/glew.h> #include <GL/glew.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>