minor refactor

This commit is contained in:
MihailRis
2024-04-23 16:45:29 +03:00
parent 3ddde7f7d3
commit 67f34ceb8c
25 changed files with 66 additions and 66 deletions
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_ATLAS_H_
#define GRAPHICS_CORE_ATLAS_H_
#ifndef GRAPHICS_CORE_ATLAS_HPP_
#define GRAPHICS_CORE_ATLAS_HPP_
#include <set>
#include <string>
@@ -58,4 +58,4 @@ public:
Atlas* build(uint extrusion, bool prepare=true, uint maxResolution=0);
};
#endif // GRAPHICS_CORE_ATLAS_H_
#endif // GRAPHICS_CORE_ATLAS_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_BATCH2D_H_
#define GRAPHICS_CORE_BATCH2D_H_
#ifndef GRAPHICS_CORE_BATCH2D_HPP_
#define GRAPHICS_CORE_BATCH2D_HPP_
#include <memory>
#include <stdlib.h>
@@ -92,4 +92,4 @@ public:
void lineWidth(float width);
};
#endif // GRAPHICS_CORE_BATCH2D_H_
#endif // GRAPHICS_CORE_BATCH2D_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_BATCH3D_H_
#define GRAPHICS_CORE_BATCH3D_H_
#ifndef GRAPHICS_CORE_BATCH3D_HPP_
#define GRAPHICS_CORE_BATCH3D_HPP_
#include "../../maths/UVRegion.h"
#include "../../typedefs.h"
@@ -51,4 +51,4 @@ public:
void flushPoints();
};
#endif // GRAPHICS_CORE_BATCH3D_H_
#endif // GRAPHICS_CORE_BATCH3D_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_CUBEMAP_H_
#define GRAPHICS_CORE_CUBEMAP_H_
#ifndef GRAPHICS_CORE_CUBEMAP_HPP_
#define GRAPHICS_CORE_CUBEMAP_HPP_
#include "Texture.hpp"
@@ -12,4 +12,4 @@ public:
virtual void unbind() override;
};
#endif // GRAPHICS_CORE_CUBEMAP_H_
#endif // GRAPHICS_CORE_CUBEMAP_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_FONT_H_
#define GRAPHICS_CORE_FONT_H_
#ifndef GRAPHICS_CORE_FONT_HPP_
#define GRAPHICS_CORE_FONT_HPP_
#include <memory>
#include <string>
@@ -40,4 +40,4 @@ public:
void draw(Batch2D* batch, std::wstring_view text, int x, int y, FontStyle style);
};
#endif // GRAPHICS_CORE_FONT_H_
#endif // GRAPHICS_CORE_FONT_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_FRAMEBUFFER_H_
#define GRAPHICS_CORE_FRAMEBUFFER_H_
#ifndef GRAPHICS_CORE_FRAMEBUFFER_HPP_
#define GRAPHICS_CORE_FRAMEBUFFER_HPP_
#include "../../typedefs.h"
@@ -39,4 +39,4 @@ public:
uint getHeight() const;
};
#endif // GRAPHICS_CORE_FRAMEBUFFER_H_
#endif // GRAPHICS_CORE_FRAMEBUFFER_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_GFX_CONTEXT_H_
#define GRAPHICS_CORE_GFX_CONTEXT_H_
#ifndef GRAPHICS_CORE_GFX_CONTEXT_HPP_
#define GRAPHICS_CORE_GFX_CONTEXT_HPP_
#include "Viewport.hpp"
#include "../../window/Window.h"
@@ -35,4 +35,4 @@ public:
void setScissors(glm::vec4 area);
};
#endif // GRAPHICS_CORE_GFX_CONTEXT_H_
#endif // GRAPHICS_CORE_GFX_CONTEXT_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_IMAGE_DATA_H_
#define GRAPHICS_CORE_IMAGE_DATA_H_
#ifndef GRAPHICS_CORE_IMAGE_DATA_HPP_
#define GRAPHICS_CORE_IMAGE_DATA_HPP_
#include "../../typedefs.h"
@@ -46,4 +46,4 @@ public:
extern ImageData* add_atlas_margins(ImageData* image, int grid_size);
#endif // GRAPHICS_CORE_IMAGE_DATA_H_
#endif // GRAPHICS_CORE_IMAGE_DATA_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_LINEBATCH_H_
#define GRAPHICS_CORE_LINEBATCH_H_
#ifndef GRAPHICS_CORE_LINEBATCH_HPP_
#define GRAPHICS_CORE_LINEBATCH_HPP_
#include <memory>
#include <stdlib.h>
@@ -33,4 +33,4 @@ public:
void lineWidth(float width);
};
#endif // GRAPHICS_CORE_LINEBATCH_H_
#endif // GRAPHICS_CORE_LINEBATCH_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_MESH_H_
#define GRAPHICS_CORE_MESH_H_
#ifndef GRAPHICS_CORE_MESH_HPP_
#define GRAPHICS_CORE_MESH_HPP_
#include <stdlib.h>
#include "../../typedefs.h"
@@ -39,4 +39,4 @@ public:
static int meshesCount;
};
#endif // GRAPHICS_CORE_MESH_H_
#endif // GRAPHICS_CORE_MESH_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_POST_PROCESSING_H_
#define GRAPHICS_CORE_POST_PROCESSING_H_
#ifndef GRAPHICS_CORE_POST_PROCESSING_HPP_
#define GRAPHICS_CORE_POST_PROCESSING_HPP_
#include "Viewport.hpp"
#include "GfxContext.hpp"
@@ -39,4 +39,4 @@ public:
Framebuffer* getFramebuffer() const;
};
#endif // GRAPHICS_CORE_POST_PROCESSING_H_
#endif // GRAPHICS_CORE_POST_PROCESSING_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_SHADER_H_
#define GRAPHICS_CORE_SHADER_H_
#ifndef GRAPHICS_CORE_SHADER_HPP_
#define GRAPHICS_CORE_SHADER_HPP_
#include "../../typedefs.h"
@@ -44,4 +44,4 @@ public:
);
};
#endif // GRAPHICS_SHADER_H_
#endif // GRAPHICS_SHADER_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_TEXTURE_H_
#define GRAPHICS_CORE_TEXTURE_H_
#ifndef GRAPHICS_CORE_TEXTURE_HPP_
#define GRAPHICS_CORE_TEXTURE_HPP_
#include <string>
#include <memory>
@@ -34,4 +34,4 @@ public:
static Texture* from(const ImageData* image);
};
#endif // GRAPHICS_CORE_TEXTURE_H_
#endif // GRAPHICS_CORE_TEXTURE_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_TEXTURE_ANIMATION_H_
#define GRAPHICS_CORE_TEXTURE_ANIMATION_H_
#ifndef GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
#define GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
#include "../../typedefs.h"
@@ -49,4 +49,4 @@ private:
std::vector<TextureAnimation> animations;
};
#endif // GRAPHICS_CORE_TEXTURE_ANIMATION_H_
#endif // GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_VIEWPORT_H_
#define GRAPHICS_CORE_VIEWPORT_H_
#ifndef GRAPHICS_CORE_VIEWPORT_HPP_
#define GRAPHICS_CORE_VIEWPORT_HPP_
#include <glm/glm.hpp>
@@ -19,4 +19,4 @@ public:
}
};
#endif // GRAPHICS_VIEWPORT_H_
#endif // GRAPHICS_VIEWPORT_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_COMMONS_H_
#define GRAPHICS_CORE_COMMONS_H_
#ifndef GRAPHICS_CORE_COMMONS_HPP_
#define GRAPHICS_CORE_COMMONS_HPP_
enum class DrawPrimitive {
point = 0,
@@ -7,4 +7,4 @@ enum class DrawPrimitive {
triangle,
};
#endif // GRAPHICS_CORE_COMMONS_H_
#endif // GRAPHICS_CORE_COMMONS_HPP_
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GRAPHICS_CORE_GL_UTIL_H_
#define GRAPHICS_CORE_GL_UTIL_H_
#ifndef GRAPHICS_CORE_GL_UTIL_HPP_
#define GRAPHICS_CORE_GL_UTIL_HPP_
#include "commons.hpp"
#include "ImageData.hpp"
@@ -26,4 +26,4 @@ namespace gl {
}
}
#endif // GRAPHICS_CORE_GL_UTIL_H_
#endif // GRAPHICS_CORE_GL_UTIL_HPP_
+1 -1
View File
@@ -9,7 +9,7 @@
#include "../../voxels/Block.h"
#include "../../voxels/ChunksStorage.h"
#include "../../util/ThreadPool.h"
#include "../../util/ThreadPool.hpp"
#include "../../settings.h"
class Mesh;