just a minor refactor, nothing special
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
#include "Atlas.h"
|
||||
#include "Atlas.hpp"
|
||||
|
||||
#include <stdexcept>
|
||||
#include "../../maths/LMPacker.h"
|
||||
#include "Texture.h"
|
||||
#include "ImageData.h"
|
||||
#include "Texture.hpp"
|
||||
#include "ImageData.hpp"
|
||||
|
||||
Atlas::Atlas(
|
||||
std::unique_ptr<ImageData> image,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "Batch2D.h"
|
||||
#include "Mesh.h"
|
||||
#include "Texture.h"
|
||||
#include "gl_util.h"
|
||||
#include "Batch2D.hpp"
|
||||
#include "Mesh.hpp"
|
||||
#include "Texture.hpp"
|
||||
#include "gl_util.hpp"
|
||||
|
||||
#include <GL/glew.h>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
#include "commons.h"
|
||||
#include "commons.hpp"
|
||||
#include "../../maths/UVRegion.h"
|
||||
|
||||
class Mesh;
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "Batch3D.h"
|
||||
#include "Batch3D.hpp"
|
||||
|
||||
#include "Mesh.h"
|
||||
#include "Texture.h"
|
||||
#include "Mesh.hpp"
|
||||
#include "Texture.hpp"
|
||||
|
||||
#include <GL/glew.h>
|
||||
#include "../../typedefs.h"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "Cubemap.h"
|
||||
#include "gl_util.h"
|
||||
#include "Cubemap.hpp"
|
||||
#include "gl_util.hpp"
|
||||
|
||||
#include <GL/glew.h>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef GRAPHICS_CORE_CUBEMAP_H_
|
||||
#define GRAPHICS_CORE_CUBEMAP_H_
|
||||
|
||||
#include "Texture.h"
|
||||
#include "Texture.hpp"
|
||||
|
||||
/// @brief Cubemap texture
|
||||
class Cubemap : public Texture {
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "Font.h"
|
||||
#include "Texture.h"
|
||||
#include "Batch2D.h"
|
||||
#include "Font.hpp"
|
||||
#include "Texture.hpp"
|
||||
#include "Batch2D.hpp"
|
||||
|
||||
inline constexpr uint GLYPH_SIZE = 16;
|
||||
inline constexpr uint MAX_CODEPAGES = 10000; // idk ho many codepages unicode has
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "Framebuffer.h"
|
||||
#include "Framebuffer.hpp"
|
||||
|
||||
#include <GL/glew.h>
|
||||
#include "Texture.h"
|
||||
#include "Texture.hpp"
|
||||
|
||||
Framebuffer::Framebuffer(uint fbo, uint depth, std::unique_ptr<Texture> texture)
|
||||
: fbo(fbo), depth(depth), texture(std::move(texture))
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#include "GfxContext.h"
|
||||
#include "GfxContext.hpp"
|
||||
|
||||
#include <GL/glew.h>
|
||||
|
||||
#include "Batch2D.h"
|
||||
#include "Framebuffer.h"
|
||||
#include "Batch2D.hpp"
|
||||
#include "Framebuffer.hpp"
|
||||
|
||||
GfxContext::GfxContext(
|
||||
const GfxContext* parent,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef GRAPHICS_CORE_GFX_CONTEXT_H_
|
||||
#define GRAPHICS_CORE_GFX_CONTEXT_H_
|
||||
|
||||
#include "Viewport.h"
|
||||
#include "Viewport.hpp"
|
||||
#include "../../window/Window.h"
|
||||
#include "../../typedefs.h"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "ImageData.h"
|
||||
#include "ImageData.hpp"
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdexcept>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "LineBatch.h"
|
||||
#include "Mesh.h"
|
||||
#include "LineBatch.hpp"
|
||||
#include "Mesh.hpp"
|
||||
|
||||
#include <GL/glew.h>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "Mesh.h"
|
||||
#include "Mesh.hpp"
|
||||
#include <GL/glew.h>
|
||||
|
||||
int Mesh::meshesCount = 0;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "PostProcessing.h"
|
||||
#include "Mesh.h"
|
||||
#include "Shader.h"
|
||||
#include "Texture.h"
|
||||
#include "Framebuffer.h"
|
||||
#include "Mesh.hpp"
|
||||
#include "Shader.hpp"
|
||||
#include "Texture.hpp"
|
||||
#include "Framebuffer.hpp"
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#ifndef GRAPHICS_CORE_POST_PROCESSING_H_
|
||||
#define GRAPHICS_CORE_POST_PROCESSING_H_
|
||||
|
||||
#include "Viewport.h"
|
||||
#include "GfxContext.h"
|
||||
#include "Viewport.hpp"
|
||||
#include "GfxContext.hpp"
|
||||
|
||||
#include <memory>
|
||||
|
||||
@@ -35,7 +35,7 @@ public:
|
||||
|
||||
/// @brief Make an image from the last rendered frame
|
||||
std::unique_ptr<ImageData> toImage();
|
||||
|
||||
|
||||
Framebuffer* getFramebuffer() const;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "Shader.h"
|
||||
#include "Shader.hpp"
|
||||
|
||||
#include <exception>
|
||||
#include <fstream>
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
#include "Texture.h"
|
||||
#include "Texture.hpp"
|
||||
#include "ImageData.hpp"
|
||||
#include "gl_util.hpp"
|
||||
|
||||
#include <GL/glew.h>
|
||||
#include <stdexcept>
|
||||
#include <memory>
|
||||
|
||||
#include "ImageData.h"
|
||||
#include "gl_util.h"
|
||||
|
||||
uint Texture::MAX_RESOLUTION = 1024; // Window.initialize overrides it
|
||||
|
||||
Texture::Texture(uint id, uint width, uint height)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <string>
|
||||
#include <memory>
|
||||
#include "../../typedefs.h"
|
||||
#include "ImageData.h"
|
||||
#include "ImageData.hpp"
|
||||
|
||||
class Texture {
|
||||
protected:
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "TextureAnimation.h"
|
||||
#include "Texture.h"
|
||||
#include "Framebuffer.h"
|
||||
#include "TextureAnimation.hpp"
|
||||
#include "Texture.hpp"
|
||||
#include "Framebuffer.hpp"
|
||||
|
||||
#include <GL/glew.h>
|
||||
#include <unordered_set>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "Viewport.h"
|
||||
#include "Viewport.hpp"
|
||||
|
||||
Viewport::Viewport(uint width, uint height)
|
||||
: width(width), height(height) {
|
||||
@@ -10,4 +10,4 @@ uint Viewport::getWidth() const {
|
||||
|
||||
uint Viewport::getHeight() const {
|
||||
return height;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#ifndef GRAPHICS_CORE_GL_UTIL_H_
|
||||
#define GRAPHICS_CORE_GL_UTIL_H_
|
||||
|
||||
#include "commons.h"
|
||||
#include "ImageData.h"
|
||||
#include "commons.hpp"
|
||||
#include "ImageData.hpp"
|
||||
|
||||
#include <GL/glew.h>
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
#include "../../voxels/Block.h"
|
||||
#include "../../window/Camera.h"
|
||||
#include "../../window/Window.h"
|
||||
#include "../core/Atlas.h"
|
||||
#include "../core/Batch3D.h"
|
||||
#include "../core/Framebuffer.h"
|
||||
#include "../core/GfxContext.h"
|
||||
#include "../core/Shader.h"
|
||||
#include "../core/Texture.h"
|
||||
#include "../core/Viewport.h"
|
||||
#include "../core/Atlas.hpp"
|
||||
#include "../core/Batch3D.hpp"
|
||||
#include "../core/Framebuffer.hpp"
|
||||
#include "../core/GfxContext.hpp"
|
||||
#include "../core/Shader.hpp"
|
||||
#include "../core/Texture.hpp"
|
||||
#include "../core/Viewport.hpp"
|
||||
|
||||
std::unique_ptr<ImageData> BlocksPreview::draw(
|
||||
const ContentGfxCache* cache,
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
#include "../core/Mesh.h"
|
||||
#include "../core/Mesh.hpp"
|
||||
#include "../../maths/UVRegion.h"
|
||||
#include "../../constants.h"
|
||||
#include "../../content/Content.h"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "ChunksRenderer.h"
|
||||
|
||||
#include "../../debug/Logger.h"
|
||||
#include "../../graphics/core/Mesh.h"
|
||||
#include "../../graphics/core/Mesh.hpp"
|
||||
#include "BlocksRenderer.h"
|
||||
#include "../../voxels/Chunk.h"
|
||||
#include "../../world/Level.h"
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
#include "../../assets/Assets.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 "../../graphics/core/Shader.hpp"
|
||||
#include "../../graphics/core/Mesh.hpp"
|
||||
#include "../../graphics/core/Batch3D.hpp"
|
||||
#include "../../graphics/core/Texture.hpp"
|
||||
#include "../../graphics/core/Cubemap.hpp"
|
||||
#include "../../graphics/core/Framebuffer.hpp"
|
||||
#include "../../graphics/core/GfxContext.hpp"
|
||||
#include "../../window/Window.h"
|
||||
#include "../../window/Camera.h"
|
||||
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
#include "../../world/Level.h"
|
||||
#include "../../world/LevelEvents.h"
|
||||
#include "../../world/World.h"
|
||||
#include "../core/Atlas.h"
|
||||
#include "../core/Batch3D.h"
|
||||
#include "../core/GfxContext.h"
|
||||
#include "../core/LineBatch.h"
|
||||
#include "../core/Mesh.h"
|
||||
#include "../core/Atlas.hpp"
|
||||
#include "../core/Batch3D.hpp"
|
||||
#include "../core/GfxContext.hpp"
|
||||
#include "../core/LineBatch.hpp"
|
||||
#include "../core/Mesh.hpp"
|
||||
#include "../core/PostProcessing.h"
|
||||
#include "../core/Shader.h"
|
||||
#include "../core/Texture.h"
|
||||
#include "../core/Shader.hpp"
|
||||
#include "../core/Texture.hpp"
|
||||
#include "ChunksRenderer.h"
|
||||
#include "Skybox.h"
|
||||
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
|
||||
#include "../../assets/Assets.h"
|
||||
#include "../../frontend/UiDocument.h"
|
||||
#include "../../graphics/core/Batch2D.h"
|
||||
#include "../../graphics/core/Shader.h"
|
||||
#include "../../graphics/core/GfxContext.h"
|
||||
#include "../../graphics/core/Batch2D.hpp"
|
||||
#include "../../graphics/core/Shader.hpp"
|
||||
#include "../../graphics/core/GfxContext.hpp"
|
||||
#include "../../window/Events.h"
|
||||
#include "../../window/input.h"
|
||||
#include "../../window/Camera.h"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "Button.hpp"
|
||||
|
||||
#include "Label.hpp"
|
||||
#include "../../core/GfxContext.h"
|
||||
#include "../../core/Batch2D.h"
|
||||
#include "../../core/GfxContext.hpp"
|
||||
#include "../../core/Batch2D.hpp"
|
||||
|
||||
using namespace gui;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "CheckBox.hpp"
|
||||
|
||||
#include "../../core/GfxContext.h"
|
||||
#include "../../core/Batch2D.h"
|
||||
#include "../../core/GfxContext.hpp"
|
||||
#include "../../core/Batch2D.hpp"
|
||||
#include "Label.hpp"
|
||||
|
||||
using namespace gui;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "Container.hpp"
|
||||
|
||||
#include "../../core/GfxContext.h"
|
||||
#include "../../core/Batch2D.h"
|
||||
#include "../../core/GfxContext.hpp"
|
||||
#include "../../core/Batch2D.hpp"
|
||||
|
||||
using namespace gui;
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "Image.hpp"
|
||||
|
||||
#include "../../core/GfxContext.h"
|
||||
#include "../../core/Batch2D.h"
|
||||
#include "../../core/Texture.h"
|
||||
#include "../../core/GfxContext.hpp"
|
||||
#include "../../core/Batch2D.hpp"
|
||||
#include "../../core/Texture.hpp"
|
||||
#include "../../../assets/Assets.h"
|
||||
#include "../../../maths/UVRegion.h"
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "InputBindBox.hpp"
|
||||
|
||||
#include "Label.hpp"
|
||||
#include "../../core/GfxContext.h"
|
||||
#include "../../core/Batch2D.h"
|
||||
#include "../../core/GfxContext.hpp"
|
||||
#include "../../core/Batch2D.hpp"
|
||||
#include "../../../util/stringutil.h"
|
||||
|
||||
using namespace gui;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "Label.hpp"
|
||||
|
||||
#include "../../core/GfxContext.h"
|
||||
#include "../../core/Batch2D.h"
|
||||
#include "../../core/Font.h"
|
||||
#include "../../core/GfxContext.hpp"
|
||||
#include "../../core/Batch2D.hpp"
|
||||
#include "../../core/Font.hpp"
|
||||
#include "../../../assets/Assets.h"
|
||||
#include "../../../util/stringutil.h"
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "Plotter.hpp"
|
||||
|
||||
#include "../../core/Batch2D.h"
|
||||
#include "../../core/Font.h"
|
||||
#include "../../core/GfxContext.h"
|
||||
#include "../../core/Batch2D.hpp"
|
||||
#include "../../core/Font.hpp"
|
||||
#include "../../core/GfxContext.hpp"
|
||||
#include "../../../assets/Assets.h"
|
||||
#include "../../../util/stringutil.h"
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#include "TextBox.hpp"
|
||||
|
||||
#include "Label.hpp"
|
||||
#include "../../core/GfxContext.h"
|
||||
#include "../../core/Batch2D.h"
|
||||
#include "../../core/Font.h"
|
||||
#include "../../core/GfxContext.hpp"
|
||||
#include "../../core/Batch2D.hpp"
|
||||
#include "../../core/Font.hpp"
|
||||
#include "../../../assets/Assets.h"
|
||||
#include "../../../util/stringutil.h"
|
||||
#include "../../../window/Events.h"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "TrackBar.hpp"
|
||||
|
||||
#include "../../core/GfxContext.h"
|
||||
#include "../../core/Batch2D.h"
|
||||
#include "../../core/GfxContext.hpp"
|
||||
#include "../../core/Batch2D.hpp"
|
||||
#include "../../../assets/Assets.h"
|
||||
|
||||
using namespace gui;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "UINode.hpp"
|
||||
|
||||
#include "Container.hpp"
|
||||
#include "../../core/Batch2D.h"
|
||||
#include "../../core/Batch2D.hpp"
|
||||
|
||||
using gui::UINode;
|
||||
using gui::Align;
|
||||
|
||||
Reference in New Issue
Block a user