update project includes format

This commit is contained in:
MihailRis 2024-08-10 01:37:48 +03:00
parent 6c4fb417c5
commit f43cc93cd2
233 changed files with 1028 additions and 1028 deletions

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;

View File

@ -4,19 +4,19 @@
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <coders/imageio.hpp> #include "coders/imageio.hpp"
#include <constants.hpp> #include "constants.hpp"
#include <content/Content.hpp> #include "content/Content.hpp"
#include <content/ContentPack.hpp> #include "content/ContentPack.hpp"
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#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"
#include <voxels/Block.hpp> #include "voxels/Block.hpp"
#include "Assets.hpp" #include "Assets.hpp"
#include "assetload_funcs.hpp" #include "assetload_funcs.hpp"

View File

@ -9,9 +9,9 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include <delegates.hpp> #include "delegates.hpp"
#include <interfaces/Task.hpp> #include "interfaces/Task.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
#include "Assets.hpp" #include "Assets.hpp"
namespace dynamic { namespace dynamic {

View File

@ -4,25 +4,25 @@
#include <iostream> #include <iostream>
#include <stdexcept> #include <stdexcept>
#include <audio/audio.hpp> #include "audio/audio.hpp"
#include <coders/GLSLExtension.hpp> #include "coders/GLSLExtension.hpp"
#include <coders/commons.hpp> #include "coders/commons.hpp"
#include <coders/imageio.hpp> #include "coders/imageio.hpp"
#include <coders/json.hpp> #include "coders/json.hpp"
#include <coders/obj.hpp> #include "coders/obj.hpp"
#include <constants.hpp> #include "constants.hpp"
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#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"

View File

@ -3,7 +3,7 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include <debug/Logger.hpp> #include "debug/Logger.hpp"
#include "alutil.hpp" #include "alutil.hpp"
static debug::Logger logger("al-audio"); static debug::Logger logger("al-audio");

View File

@ -7,8 +7,8 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <typedefs.hpp> #include "typedefs.hpp"
#include <audio/audio.hpp> #include "audio/audio.hpp"
#ifdef __APPLE__ #ifdef __APPLE__
#include <OpenAL/al.h> #include <OpenAL/al.h>

View File

@ -5,7 +5,7 @@
#include <memory> #include <memory>
#include <type_traits> #include <type_traits>
#include <debug/Logger.hpp> #include "debug/Logger.hpp"
#ifdef __APPLE__ #ifdef __APPLE__
#include <OpenAL/al.h> #include <OpenAL/al.h>

View File

@ -5,7 +5,7 @@
#include <string> #include <string>
#include <type_traits> #include <type_traits>
#include <typedefs.hpp> #include "typedefs.hpp"
#ifdef __APPLE__ #ifdef __APPLE__
#include <OpenAL/al.h> #include <OpenAL/al.h>

View File

@ -4,8 +4,8 @@
#include <stdexcept> #include <stdexcept>
#include <utility> #include <utility>
#include <coders/ogg.hpp> #include "coders/ogg.hpp"
#include <coders/wav.hpp> #include "coders/wav.hpp"
#include "AL/ALAudio.hpp" #include "AL/ALAudio.hpp"
#include "NoAudio.hpp" #include "NoAudio.hpp"

View File

@ -6,7 +6,7 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <typedefs.hpp> #include "typedefs.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;

View File

@ -5,10 +5,10 @@
#include <stdexcept> #include <stdexcept>
#include <utility> #include <utility>
#include <files/engine_paths.hpp> #include "files/engine_paths.hpp"
#include <files/files.hpp> #include "files/files.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
#include <util/stringutil.hpp> #include "util/stringutil.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;

View File

@ -2,7 +2,7 @@
#include <stdexcept> #include <stdexcept>
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#include "byte_utils.hpp" #include "byte_utils.hpp"
#include "gzip.hpp" #include "gzip.hpp"

View File

@ -4,7 +4,7 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <data/dynamic_fwd.hpp> #include "data/dynamic_fwd.hpp"
namespace dynamic { namespace dynamic {
class Map; class Map;

View File

@ -4,7 +4,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <typedefs.hpp> #include "typedefs.hpp"
/* byteorder: little-endian */ /* byteorder: little-endian */
class ByteBuilder { class ByteBuilder {

View File

@ -5,7 +5,7 @@
#include <sstream> #include <sstream>
#include <stdexcept> #include <stdexcept>
#include <util/stringutil.hpp> #include "util/stringutil.hpp"
inline double power(double base, int64_t power) { inline double power(double base, int64_t power) {
double result = 1.0; double result = 1.0;

View File

@ -4,8 +4,8 @@
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
inline int is_box(int c) { inline int is_box(int c) {
switch (c) { switch (c) {

View File

@ -3,7 +3,7 @@
#include <vector> #include <vector>
#include <typedefs.hpp> #include "typedefs.hpp"
namespace gzip { namespace gzip {
const unsigned char MAGIC[] = "\x1F\x8B"; const unsigned char MAGIC[] = "\x1F\x8B";

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;

View File

@ -6,8 +6,8 @@
#include <memory> #include <memory>
#include <sstream> #include <sstream>
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#include <util/stringutil.hpp> #include "util/stringutil.hpp"
#include "commons.hpp" #include "commons.hpp"
using namespace json; using namespace json;

View File

@ -3,8 +3,8 @@
#include <string> #include <string>
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
#include "binary_json.hpp" #include "binary_json.hpp"
namespace json { namespace json {

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;

View File

@ -5,9 +5,9 @@
#include <string> #include <string>
#include <audio/audio.hpp> #include "audio/audio.hpp"
#include <debug/Logger.hpp> #include "debug/Logger.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
static debug::Logger logger("ogg"); static debug::Logger logger("ogg");

View File

@ -4,10 +4,10 @@
#include <iostream> #include <iostream>
#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");

View File

@ -1,7 +1,7 @@
#ifndef CODERS_RLE_HPP_ #ifndef CODERS_RLE_HPP_
#define CODERS_RLE_HPP_ #define CODERS_RLE_HPP_
#include <typedefs.hpp> #include "typedefs.hpp"
namespace rle { namespace rle {
size_t encode(const ubyte* src, size_t length, ubyte* dst); size_t encode(const ubyte* src, size_t length, ubyte* dst);

View File

@ -6,10 +6,10 @@
#include <iomanip> #include <iomanip>
#include <sstream> #include <sstream>
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#include <data/setting.hpp> #include "data/setting.hpp"
#include <files/settings_io.hpp> #include "files/settings_io.hpp"
#include <util/stringutil.hpp> #include "util/stringutil.hpp"
#include "commons.hpp" #include "commons.hpp"
using namespace toml; using namespace toml;

View File

@ -3,7 +3,7 @@
#include <string> #include <string>
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
class SettingsHandler; class SettingsHandler;

View File

@ -6,8 +6,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <audio/audio.hpp> #include "audio/audio.hpp"
#include <debug/Logger.hpp> #include "debug/Logger.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;

View File

@ -5,7 +5,7 @@
#include <stdexcept> #include <stdexcept>
#include <utility> #include <utility>
#include <util/stringutil.hpp> #include "util/stringutil.hpp"
using namespace xml; using namespace xml;

View File

@ -1,7 +1,7 @@
#ifndef CONSTANTS_HPP_ #ifndef CONSTANTS_HPP_
#define CONSTANTS_HPP_ #define CONSTANTS_HPP_
#include <typedefs.hpp> #include "typedefs.hpp"
#include <limits> #include <limits>
#include <string> #include <string>

View File

@ -5,11 +5,11 @@
#include <stdexcept> #include <stdexcept>
#include <utility> #include <utility>
#include <items/ItemDef.hpp> #include "items/ItemDef.hpp"
#include <logic/scripting/scripting.hpp> #include "logic/scripting/scripting.hpp"
#include <objects/EntityDef.hpp> #include "objects/EntityDef.hpp"
#include <objects/rigging.hpp> #include "objects/rigging.hpp"
#include <voxels/Block.hpp> #include "voxels/Block.hpp"
#include "ContentPack.hpp" #include "ContentPack.hpp"
ContentIndices::ContentIndices( ContentIndices::ContentIndices(

View File

@ -9,7 +9,7 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <data/dynamic_fwd.hpp> #include "data/dynamic_fwd.hpp"
#include "content_fwd.hpp" #include "content_fwd.hpp"
using DrawGroups = std::set<ubyte>; using DrawGroups = std::set<ubyte>;

View File

@ -1,6 +1,6 @@
#include "ContentBuilder.hpp" #include "ContentBuilder.hpp"
#include <objects/rigging.hpp> #include "objects/rigging.hpp"
ContentBuilder::~ContentBuilder() = default; ContentBuilder::~ContentBuilder() = default;

View File

@ -7,9 +7,9 @@
#include "Content.hpp" #include "Content.hpp"
#include "ContentPack.hpp" #include "ContentPack.hpp"
#include <items/ItemDef.hpp> #include "items/ItemDef.hpp"
#include <objects/EntityDef.hpp> #include "objects/EntityDef.hpp"
#include <voxels/Block.hpp> #include "voxels/Block.hpp"
template <class T> template <class T>
class ContentUnitBuilder { class ContentUnitBuilder {

View File

@ -2,11 +2,11 @@
#include <memory> #include <memory>
#include <coders/json.hpp> #include "coders/json.hpp"
#include <constants.hpp> #include "constants.hpp"
#include <files/files.hpp> #include "files/files.hpp"
#include <items/ItemDef.hpp> #include "items/ItemDef.hpp"
#include <voxels/Block.hpp> #include "voxels/Block.hpp"
#include "Content.hpp" #include "Content.hpp"
ContentLUT::ContentLUT( ContentLUT::ContentLUT(

View File

@ -6,9 +6,9 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <constants.hpp> #include "constants.hpp"
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
#include "Content.hpp" #include "Content.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;

View File

@ -6,18 +6,18 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <coders/json.hpp> #include "coders/json.hpp"
#include <core_defs.hpp> #include "core_defs.hpp"
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#include <debug/Logger.hpp> #include "debug/Logger.hpp"
#include <files/files.hpp> #include "files/files.hpp"
#include <items/ItemDef.hpp> #include "items/ItemDef.hpp"
#include <logic/scripting/scripting.hpp> #include "logic/scripting/scripting.hpp"
#include <objects/rigging.hpp> #include "objects/rigging.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
#include <util/listutil.hpp> #include "util/listutil.hpp"
#include <util/stringutil.hpp> #include "util/stringutil.hpp"
#include <voxels/Block.hpp> #include "voxels/Block.hpp"
#include "Content.hpp" #include "Content.hpp"
#include "ContentBuilder.hpp" #include "ContentBuilder.hpp"
#include "ContentPack.hpp" #include "ContentPack.hpp"

View File

@ -4,10 +4,10 @@
#include <iostream> #include <iostream>
#include <utility> #include <utility>
#include <coders/json.hpp> #include "coders/json.hpp"
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#include <files/engine_paths.hpp> #include "files/engine_paths.hpp"
#include <files/files.hpp> #include "files/files.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;

View File

@ -6,7 +6,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <typedefs.hpp> #include "typedefs.hpp"
class EnginePaths; class EnginePaths;

View File

@ -3,7 +3,7 @@
#include <queue> #include <queue>
#include <sstream> #include <sstream>
#include <util/listutil.hpp> #include "util/listutil.hpp"
PacksManager::PacksManager() = default; PacksManager::PacksManager() = default;

View File

@ -1,7 +1,7 @@
#ifndef CONTENT_CONTENT_FWD_HPP_ #ifndef CONTENT_CONTENT_FWD_HPP_
#define CONTENT_CONTENT_FWD_HPP_ #define CONTENT_CONTENT_FWD_HPP_
#include <typedefs.hpp> #include "typedefs.hpp"
class Content; class Content;
class ContentPackRuntime; class ContentPackRuntime;

View File

@ -1,14 +1,14 @@
#include "core_defs.hpp" #include "core_defs.hpp"
#include <items/ItemDef.hpp> #include "items/ItemDef.hpp"
#include <content/Content.hpp> #include "content/Content.hpp"
#include <content/ContentBuilder.hpp> #include "content/ContentBuilder.hpp"
#include <files/files.hpp> #include "files/files.hpp"
#include <files/engine_paths.hpp> #include "files/engine_paths.hpp"
#include <window/Window.hpp> #include "window/Window.hpp"
#include <window/Events.hpp> #include "window/Events.hpp"
#include <window/input.hpp> #include "window/input.hpp"
#include <voxels/Block.hpp> #include "voxels/Block.hpp"
// All in-game definitions (blocks, items, etc..) // All in-game definitions (blocks, items, etc..)
void corecontent::setup(EnginePaths* paths, ContentBuilder* builder) { void corecontent::setup(EnginePaths* paths, ContentBuilder* builder) {

View File

@ -1,6 +1,6 @@
#include "dynamic.hpp" #include "dynamic.hpp"
#include <coders/json.hpp> #include "coders/json.hpp"
using namespace dynamic; using namespace dynamic;

View File

@ -6,7 +6,7 @@
#include <string> #include <string>
#include <variant> #include <variant>
#include <typedefs.hpp> #include "typedefs.hpp"
namespace dynamic { namespace dynamic {
class Map; class Map;

View File

@ -1,6 +1,6 @@
#include "setting.hpp" #include "setting.hpp"
#include <util/stringutil.hpp> #include "util/stringutil.hpp"
std::string NumberSetting::toString() const { std::string NumberSetting::toString() const {
switch (getFormat()) { switch (getFormat()) {

View File

@ -6,8 +6,8 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <delegates.hpp> #include "delegates.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
enum class setting_format { simple, percent }; enum class setting_format { simple, percent };

View File

@ -2,42 +2,42 @@
#define GLEW_STATIC #define GLEW_STATIC
#include <debug/Logger.hpp> #include "debug/Logger.hpp"
#include <assets/AssetsLoader.hpp> #include "assets/AssetsLoader.hpp"
#include <audio/audio.hpp> #include "audio/audio.hpp"
#include <coders/GLSLExtension.hpp> #include "coders/GLSLExtension.hpp"
#include <coders/imageio.hpp> #include "coders/imageio.hpp"
#include <coders/json.hpp> #include "coders/json.hpp"
#include <coders/toml.hpp> #include "coders/toml.hpp"
#include <content/Content.hpp> #include "content/Content.hpp"
#include <content/ContentBuilder.hpp> #include "content/ContentBuilder.hpp"
#include <content/ContentLoader.hpp> #include "content/ContentLoader.hpp"
#include <core_defs.hpp> #include "core_defs.hpp"
#include <files/files.hpp> #include "files/files.hpp"
#include <files/settings_io.hpp> #include "files/settings_io.hpp"
#include <frontend/locale.hpp> #include "frontend/locale.hpp"
#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"
#include <logic/scripting/scripting.hpp> #include "logic/scripting/scripting.hpp"
#include <util/listutil.hpp> #include "util/listutil.hpp"
#include <util/platform.hpp> #include "util/platform.hpp"
#include <voxels/DefaultWorldGenerator.hpp> #include "voxels/DefaultWorldGenerator.hpp"
#include <voxels/FlatWorldGenerator.hpp> #include "voxels/FlatWorldGenerator.hpp"
#include <window/Camera.hpp> #include "window/Camera.hpp"
#include <window/Events.hpp> #include "window/Events.hpp"
#include <window/input.hpp> #include "window/input.hpp"
#include <window/Window.hpp> #include "window/Window.hpp"
#include <world/WorldGenerators.hpp> #include "world/WorldGenerators.hpp"
#include <settings.hpp> #include "settings.hpp"
#include <iostream> #include <iostream>
#include <assert.h> #include <assert.h>

View File

@ -1,15 +1,15 @@
#ifndef ENGINE_HPP_ #ifndef ENGINE_HPP_
#define ENGINE_HPP_ #define ENGINE_HPP_
#include <delegates.hpp> #include "delegates.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
#include <assets/Assets.hpp> #include "assets/Assets.hpp"
#include <content/content_fwd.hpp> #include "content/content_fwd.hpp"
#include <content/ContentPack.hpp> #include "content/ContentPack.hpp"
#include <content/PacksManager.hpp> #include "content/PacksManager.hpp"
#include <files/engine_paths.hpp> #include "files/engine_paths.hpp"
#include <util/ObjectsKeeper.hpp> #include "util/ObjectsKeeper.hpp"
#include <filesystem> #include <filesystem>
#include <memory> #include <memory>

View File

@ -5,13 +5,13 @@
#include <stdexcept> #include <stdexcept>
#include <utility> #include <utility>
#include <content/ContentLUT.hpp> #include "content/ContentLUT.hpp"
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#include <debug/Logger.hpp> #include "debug/Logger.hpp"
#include <files/files.hpp> #include "files/files.hpp"
#include <objects/Player.hpp> #include "objects/Player.hpp"
#include <util/ThreadPool.hpp> #include "util/ThreadPool.hpp"
#include <voxels/Chunk.hpp> #include "voxels/Chunk.hpp"
#include "WorldFiles.hpp" #include "WorldFiles.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;

View File

@ -5,9 +5,9 @@
#include <memory> #include <memory>
#include <queue> #include <queue>
#include <delegates.hpp> #include "delegates.hpp"
#include <interfaces/Task.hpp> #include "interfaces/Task.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;

View File

@ -8,28 +8,28 @@
#include <sstream> #include <sstream>
#include <utility> #include <utility>
#include <coders/byte_utils.hpp> #include "coders/byte_utils.hpp"
#include <coders/json.hpp> #include "coders/json.hpp"
#include <constants.hpp> #include "constants.hpp"
#include <content/Content.hpp> #include "content/Content.hpp"
#include <core_defs.hpp> #include "core_defs.hpp"
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#include <debug/Logger.hpp> #include "debug/Logger.hpp"
#include <items/Inventory.hpp> #include "items/Inventory.hpp"
#include <items/ItemDef.hpp> #include "items/ItemDef.hpp"
#include <lighting/Lightmap.hpp> #include "lighting/Lightmap.hpp"
#include <maths/voxmaths.hpp> #include "maths/voxmaths.hpp"
#include <objects/EntityDef.hpp> #include "objects/EntityDef.hpp"
#include <objects/Player.hpp> #include "objects/Player.hpp"
#include <physics/Hitbox.hpp> #include "physics/Hitbox.hpp"
#include <settings.hpp> #include "settings.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
#include <util/data_io.hpp> #include "util/data_io.hpp"
#include <voxels/Block.hpp> #include "voxels/Block.hpp"
#include <voxels/Chunk.hpp> #include "voxels/Chunk.hpp"
#include <voxels/voxel.hpp> #include "voxels/voxel.hpp"
#include <window/Camera.hpp> #include "window/Camera.hpp"
#include <world/World.hpp> #include "world/World.hpp"
#define WORLD_FORMAT_MAGIC ".VOXWLD" #define WORLD_FORMAT_MAGIC ".VOXWLD"

View File

@ -7,13 +7,13 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <content/ContentPack.hpp> #include "content/ContentPack.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
#include <voxels/Chunk.hpp> #include "voxels/Chunk.hpp"
#include "WorldRegions.hpp" #include "WorldRegions.hpp"
#include "files.hpp" #include "files.hpp"
#define GLM_ENABLE_EXPERIMENTAL #define GLM_ENABLE_EXPERIMENTAL
#include "glm/gtx/hash.hpp" #include <glm/gtx/hash.hpp>
inline constexpr uint WORLD_FORMAT_VERSION = 1; inline constexpr uint WORLD_FORMAT_VERSION = 1;

View File

@ -4,12 +4,12 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <coders/byte_utils.hpp> #include "coders/byte_utils.hpp"
#include <coders/rle.hpp> #include "coders/rle.hpp"
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#include <items/Inventory.hpp> #include "items/Inventory.hpp"
#include <maths/voxmaths.hpp> #include "maths/voxmaths.hpp"
#include <util/data_io.hpp> #include "util/data_io.hpp"
#define REGION_FORMAT_MAGIC ".VOXREG" #define REGION_FORMAT_MAGIC ".VOXREG"

View File

@ -9,13 +9,13 @@
#include <mutex> #include <mutex>
#include <unordered_map> #include <unordered_map>
#include <data/dynamic_fwd.hpp> #include "data/dynamic_fwd.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
#include <util/BufferPool.hpp> #include "util/BufferPool.hpp"
#include <voxels/Chunk.hpp> #include "voxels/Chunk.hpp"
#include "files.hpp" #include "files.hpp"
#define GLM_ENABLE_EXPERIMENTAL #define GLM_ENABLE_EXPERIMENTAL
#include "glm/gtx/hash.hpp" #include <glm/gtx/hash.hpp>
namespace fs = std::filesystem; namespace fs = std::filesystem;

View File

@ -5,8 +5,8 @@
#include <filesystem> #include <filesystem>
#include <sstream> #include <sstream>
#include <stack> #include <stack>
#include <typedefs.hpp> #include "typedefs.hpp"
#include <util/stringutil.hpp> #include "util/stringutil.hpp"
#include <utility> #include <utility>
#include "WorldFiles.hpp" #include "WorldFiles.hpp"

View File

@ -6,7 +6,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <content/ContentPack.hpp> #include "content/ContentPack.hpp"
class files_access_error : public std::runtime_error { class files_access_error : public std::runtime_error {

View File

@ -7,12 +7,12 @@
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include <coders/commons.hpp> #include "coders/commons.hpp"
#include <coders/gzip.hpp> #include "coders/gzip.hpp"
#include <coders/json.hpp> #include "coders/json.hpp"
#include <coders/toml.hpp> #include "coders/toml.hpp"
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#include <util/stringutil.hpp> #include "util/stringutil.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;

View File

@ -7,7 +7,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <typedefs.hpp> #include "typedefs.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;

View File

@ -3,12 +3,12 @@
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <coders/json.hpp> #include "coders/json.hpp"
#include <coders/toml.hpp> #include "coders/toml.hpp"
#include <debug/Logger.hpp> #include "debug/Logger.hpp"
#include <settings.hpp> #include "settings.hpp"
#include <window/Events.hpp> #include "window/Events.hpp"
#include <window/input.hpp> #include "window/input.hpp"
static debug::Logger logger("settings_io"); static debug::Logger logger("settings_io");

View File

@ -6,7 +6,7 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
class Setting; class Setting;
struct EngineSettings; struct EngineSettings;

View File

@ -2,13 +2,13 @@
#include "UiDocument.hpp" #include "UiDocument.hpp"
#include <assets/Assets.hpp> #include "assets/Assets.hpp"
#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"
#include <string> #include <string>

View File

@ -1,7 +1,7 @@
#ifndef FRONTEND_BLOCKS_GFX_CACHE_HPP_ #ifndef FRONTEND_BLOCKS_GFX_CACHE_HPP_
#define FRONTEND_BLOCKS_GFX_CACHE_HPP_ #define FRONTEND_BLOCKS_GFX_CACHE_HPP_
#include <typedefs.hpp> #include "typedefs.hpp"
#include <memory> #include <memory>

View File

@ -2,16 +2,16 @@
#include "ContentGfxCache.hpp" #include "ContentGfxCache.hpp"
#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"
#include <voxels/Block.hpp> #include "voxels/Block.hpp"
#include <world/Level.hpp> #include "world/Level.hpp"
LevelFrontend::LevelFrontend( LevelFrontend::LevelFrontend(
Player* currentPlayer, LevelController* controller, Assets* assets Player* currentPlayer, LevelController* controller, Assets* assets

View File

@ -2,11 +2,11 @@
#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(
std::string id, std::string id,

View File

@ -1,7 +1,7 @@
#ifndef FRONTEND_UI_DOCUMENT_HPP_ #ifndef FRONTEND_UI_DOCUMENT_HPP_
#define FRONTEND_UI_DOCUMENT_HPP_ #define FRONTEND_UI_DOCUMENT_HPP_
#include <typedefs.hpp> #include "typedefs.hpp"
#include <string> #include <string>
#include <memory> #include <memory>

View File

@ -1,25 +1,25 @@
#include <audio/audio.hpp> #include "audio/audio.hpp"
#include <delegates.hpp> #include "delegates.hpp"
#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"
#include <objects/EntityDef.hpp> #include "objects/EntityDef.hpp"
#include <physics/Hitbox.hpp> #include "physics/Hitbox.hpp"
#include <util/stringutil.hpp> #include "util/stringutil.hpp"
#include <voxels/Block.hpp> #include "voxels/Block.hpp"
#include <voxels/Chunk.hpp> #include "voxels/Chunk.hpp"
#include <voxels/Chunks.hpp> #include "voxels/Chunks.hpp"
#include <world/Level.hpp> #include "world/Level.hpp"
#include <world/World.hpp> #include "world/World.hpp"
#include <string> #include <string>
#include <memory> #include <memory>

View File

@ -4,45 +4,45 @@
#include "LevelFrontend.hpp" #include "LevelFrontend.hpp"
#include "UiDocument.hpp" #include "UiDocument.hpp"
#include <assets/Assets.hpp> #include "assets/Assets.hpp"
#include <content/Content.hpp> #include "content/Content.hpp"
#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"
#include <logic/scripting/scripting.hpp> #include "logic/scripting/scripting.hpp"
#include <maths/voxmaths.hpp> #include "maths/voxmaths.hpp"
#include <objects/Player.hpp> #include "objects/Player.hpp"
#include <physics/Hitbox.hpp> #include "physics/Hitbox.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
#include <util/stringutil.hpp> #include "util/stringutil.hpp"
#include <voxels/Block.hpp> #include "voxels/Block.hpp"
#include <voxels/Chunk.hpp> #include "voxels/Chunk.hpp"
#include <voxels/Chunks.hpp> #include "voxels/Chunks.hpp"
#include <window/Camera.hpp> #include "window/Camera.hpp"
#include <window/Events.hpp> #include "window/Events.hpp"
#include <window/input.hpp> #include "window/input.hpp"
#include <window/Window.hpp> #include "window/Window.hpp"
#include <world/Level.hpp> #include "world/Level.hpp"
#include <world/World.hpp> #include "world/World.hpp"
#include <assert.h> #include <assert.h>
#include <memory> #include <memory>

View File

@ -1,8 +1,8 @@
#ifndef FRONTEND_HUD_HPP_ #ifndef FRONTEND_HUD_HPP_
#define FRONTEND_HUD_HPP_ #define FRONTEND_HUD_HPP_
#include <typedefs.hpp> #include "typedefs.hpp"
#include <util/ObjectsKeeper.hpp> #include "util/ObjectsKeeper.hpp"
#include <string> #include <string>
#include <memory> #include <memory>

View File

@ -2,13 +2,13 @@
#include <utility> #include <utility>
#include <coders/json.hpp> #include "coders/json.hpp"
#include <coders/commons.hpp> #include "coders/commons.hpp"
#include <content/ContentPack.hpp> #include "content/ContentPack.hpp"
#include <files/files.hpp> #include "files/files.hpp"
#include <util/stringutil.hpp> #include "util/stringutil.hpp"
#include <data/dynamic.hpp> #include "data/dynamic.hpp"
#include <debug/Logger.hpp> #include "debug/Logger.hpp"
static debug::Logger logger("locale"); static debug::Logger logger("locale");

View File

@ -4,19 +4,19 @@
#include "UiDocument.hpp" #include "UiDocument.hpp"
#include "screens/MenuScreen.hpp" #include "screens/MenuScreen.hpp"
#include <delegates.hpp> #include "delegates.hpp"
#include <engine.hpp> #include "engine.hpp"
#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"
#include <util/stringutil.hpp> #include "util/stringutil.hpp"
#include <window/Window.hpp> #include "window/Window.hpp"
#include <filesystem> #include <filesystem>
#include <glm/glm.hpp> #include <glm/glm.hpp>

View File

@ -1,8 +1,8 @@
#ifndef FRONTEND_MENU_MENU_HPP_ #ifndef FRONTEND_MENU_MENU_HPP_
#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>

View File

@ -1,31 +1,31 @@
#include "LevelScreen.hpp" #include "LevelScreen.hpp"
#include <core_defs.hpp> #include "core_defs.hpp"
#include <frontend/hud.hpp> #include "frontend/hud.hpp"
#include <frontend/LevelFrontend.hpp> #include "frontend/LevelFrontend.hpp"
#include <audio/audio.hpp> #include "audio/audio.hpp"
#include <coders/imageio.hpp> #include "coders/imageio.hpp"
#include <debug/Logger.hpp> #include "debug/Logger.hpp"
#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"
#include <physics/Hitbox.hpp> #include "physics/Hitbox.hpp"
#include <voxels/Chunks.hpp> #include "voxels/Chunks.hpp"
#include <window/Camera.hpp> #include "window/Camera.hpp"
#include <window/Events.hpp> #include "window/Events.hpp"
#include <window/Window.hpp> #include "window/Window.hpp"
#include <world/Level.hpp> #include "world/Level.hpp"
#include <world/World.hpp> #include "world/World.hpp"
static debug::Logger logger("level-screen"); static debug::Logger logger("level-screen");

View File

@ -1,14 +1,14 @@
#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"
#include <engine.hpp> #include "engine.hpp"
MenuScreen::MenuScreen(Engine* engine) : Screen(engine) { MenuScreen::MenuScreen(Engine* engine) : Screen(engine) {
engine->resetContent(); engine->resetContent();

View File

@ -1,7 +1,7 @@
#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)
: engine(engine), : engine(engine),

View File

@ -1,7 +1,7 @@
#ifndef FRONTEND_SCREENS_SCREEN_HPP_ #ifndef FRONTEND_SCREENS_SCREEN_HPP_
#define FRONTEND_SCREENS_SCREEN_HPP_ #define FRONTEND_SCREENS_SCREEN_HPP_
#include <util/ObjectsKeeper.hpp> #include "util/ObjectsKeeper.hpp"
class Engine; class Engine;
class Batch2D; class Batch2D;

View File

@ -2,7 +2,7 @@
#include "Texture.hpp" #include "Texture.hpp"
#include "ImageData.hpp" #include "ImageData.hpp"
#include <maths/LMPacker.hpp> #include "maths/LMPacker.hpp"
#include <stdexcept> #include <stdexcept>

View File

@ -7,8 +7,8 @@
#include <vector> #include <vector>
#include <optional> #include <optional>
#include <unordered_map> #include <unordered_map>
#include <maths/UVRegion.hpp> #include "maths/UVRegion.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
class ImageData; class ImageData;
class Texture; class Texture;

View File

@ -2,7 +2,7 @@
#include "Mesh.hpp" #include "Mesh.hpp"
#include "Texture.hpp" #include "Texture.hpp"
#include "gl_util.hpp" #include "gl_util.hpp"
#include <maths/UVRegion.hpp> #include "maths/UVRegion.hpp"
#include <GL/glew.h> #include <GL/glew.h>

View File

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

View File

@ -4,8 +4,8 @@
#include "Texture.hpp" #include "Texture.hpp"
#include <GL/glew.h> #include <GL/glew.h>
#include <typedefs.hpp> #include "typedefs.hpp"
#include <maths/UVRegion.hpp> #include "maths/UVRegion.hpp"
/// xyz, uv, rgba /// xyz, uv, rgba
inline constexpr uint B3D_VERTEX_SIZE = 9; inline constexpr uint B3D_VERTEX_SIZE = 9;

View File

@ -1,7 +1,7 @@
#ifndef GRAPHICS_CORE_BATCH3D_HPP_ #ifndef GRAPHICS_CORE_BATCH3D_HPP_
#define GRAPHICS_CORE_BATCH3D_HPP_ #define GRAPHICS_CORE_BATCH3D_HPP_
#include <typedefs.hpp> #include "typedefs.hpp"
#include "commons.hpp" #include "commons.hpp"
#include <memory> #include <memory>

View File

@ -6,7 +6,7 @@
#include "Batch2D.hpp" #include "Batch2D.hpp"
#include "Framebuffer.hpp" #include "Framebuffer.hpp"
#include <window/Window.hpp> #include "window/Window.hpp"
static void set_blend_mode(BlendMode mode) { static void set_blend_mode(BlendMode mode) {
switch (mode) { switch (mode) {

View File

@ -3,7 +3,7 @@
#include "commons.hpp" #include "commons.hpp"
#include "Viewport.hpp" #include "Viewport.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
class Batch2D; class Batch2D;
class Framebuffer; class Framebuffer;

View File

@ -4,7 +4,7 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <typedefs.hpp> #include "typedefs.hpp"
class Texture; class Texture;
class Batch2D; class Batch2D;

View File

@ -1,7 +1,7 @@
#ifndef GRAPHICS_CORE_FRAMEBUFFER_HPP_ #ifndef GRAPHICS_CORE_FRAMEBUFFER_HPP_
#define GRAPHICS_CORE_FRAMEBUFFER_HPP_ #define GRAPHICS_CORE_FRAMEBUFFER_HPP_
#include <typedefs.hpp> #include "typedefs.hpp"
#include <memory> #include <memory>

View File

@ -1,7 +1,7 @@
#ifndef GRAPHICS_CORE_IMAGE_DATA_HPP_ #ifndef GRAPHICS_CORE_IMAGE_DATA_HPP_
#define GRAPHICS_CORE_IMAGE_DATA_HPP_ #define GRAPHICS_CORE_IMAGE_DATA_HPP_
#include <typedefs.hpp> #include "typedefs.hpp"
#include <memory> #include <memory>

View File

@ -2,7 +2,7 @@
#define GRAPHICS_CORE_MESH_HPP_ #define GRAPHICS_CORE_MESH_HPP_
#include <stdlib.h> #include <stdlib.h>
#include <typedefs.hpp> #include "typedefs.hpp"
struct vattr { struct vattr {
ubyte size; ubyte size;

View File

@ -11,7 +11,7 @@
#include <GL/glew.h> #include <GL/glew.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <coders/GLSLExtension.hpp> #include "coders/GLSLExtension.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;

View File

@ -1,7 +1,7 @@
#ifndef GRAPHICS_CORE_SHADER_HPP_ #ifndef GRAPHICS_CORE_SHADER_HPP_
#define GRAPHICS_CORE_SHADER_HPP_ #define GRAPHICS_CORE_SHADER_HPP_
#include <typedefs.hpp> #include "typedefs.hpp"
#include <string> #include <string>
#include <memory> #include <memory>

View File

@ -1,8 +1,8 @@
#ifndef GRAPHICS_CORE_TEXTURE_HPP_ #ifndef GRAPHICS_CORE_TEXTURE_HPP_
#define GRAPHICS_CORE_TEXTURE_HPP_ #define GRAPHICS_CORE_TEXTURE_HPP_
#include <typedefs.hpp> #include "typedefs.hpp"
#include <maths/UVRegion.hpp> #include "maths/UVRegion.hpp"
#include "ImageData.hpp" #include "ImageData.hpp"
#include <memory> #include <memory>

View File

@ -1,7 +1,7 @@
#ifndef GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_ #ifndef GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
#define GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_ #define GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
#include <typedefs.hpp> #include "typedefs.hpp"
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <vector> #include <vector>

View File

@ -3,7 +3,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <typedefs.hpp> #include "typedefs.hpp"
class Viewport { class Viewport {
uint width; uint width;

View File

@ -1,19 +1,19 @@
#include "BlocksPreview.hpp" #include "BlocksPreview.hpp"
#include <assets/Assets.hpp> #include "assets/Assets.hpp"
#include <constants.hpp> #include "constants.hpp"
#include <content/Content.hpp> #include "content/Content.hpp"
#include <frontend/ContentGfxCache.hpp> #include "frontend/ContentGfxCache.hpp"
#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 <graphics/core/Atlas.hpp> #include "graphics/core/Atlas.hpp"
#include <graphics/core/Batch3D.hpp> #include "graphics/core/Batch3D.hpp"
#include <graphics/core/Framebuffer.hpp> #include "graphics/core/Framebuffer.hpp"
#include <graphics/core/DrawContext.hpp> #include "graphics/core/DrawContext.hpp"
#include <graphics/core/Shader.hpp> #include "graphics/core/Shader.hpp"
#include <graphics/core/Texture.hpp> #include "graphics/core/Texture.hpp"
#include <graphics/core/Viewport.hpp> #include "graphics/core/Viewport.hpp"
#include <glm/ext.hpp> #include <glm/ext.hpp>

View File

@ -1,7 +1,7 @@
#ifndef GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_ #ifndef GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
#define GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_ #define GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
#include <typedefs.hpp> #include "typedefs.hpp"
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <memory> #include <memory>

View File

@ -1,16 +1,16 @@
#include "BlocksRenderer.hpp" #include "BlocksRenderer.hpp"
#include <graphics/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"
#include <voxels/Block.hpp> #include "voxels/Block.hpp"
#include <voxels/Chunk.hpp> #include "voxels/Chunk.hpp"
#include <voxels/VoxelsVolume.hpp> #include "voxels/VoxelsVolume.hpp"
#include <voxels/ChunksStorage.hpp> #include "voxels/ChunksStorage.hpp"
#include <lighting/Lightmap.hpp> #include "lighting/Lightmap.hpp"
#include <frontend/ContentGfxCache.hpp> #include "frontend/ContentGfxCache.hpp"
#include <settings.hpp> #include "settings.hpp"
#include <glm/glm.hpp> #include <glm/glm.hpp>

View File

@ -5,8 +5,8 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <voxels/voxel.hpp> #include "voxels/voxel.hpp"
#include <typedefs.hpp> #include "typedefs.hpp"
class Content; class Content;
class Mesh; class Mesh;

View File

@ -1,10 +1,10 @@
#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"
#include <iostream> #include <iostream>
#include <glm/glm.hpp> #include <glm/glm.hpp>

View File

@ -7,9 +7,9 @@
#include <unordered_map> #include <unordered_map>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <voxels/Block.hpp> #include "voxels/Block.hpp"
#include <voxels/ChunksStorage.hpp> #include "voxels/ChunksStorage.hpp"
#include <util/ThreadPool.hpp> #include "util/ThreadPool.hpp"
class Mesh; class Mesh;
class Chunk; class Chunk;

View File

@ -1,13 +1,13 @@
#include "ModelBatch.hpp" #include "ModelBatch.hpp"
#include <graphics/core/Mesh.hpp> #include "graphics/core/Mesh.hpp"
#include <graphics/core/Model.hpp> #include "graphics/core/Model.hpp"
#include <graphics/core/Atlas.hpp> #include "graphics/core/Atlas.hpp"
#include <graphics/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"
#include <lighting/Lightmap.hpp> #include "lighting/Lightmap.hpp"
#define GLM_ENABLE_EXPERIMENTAL #define GLM_ENABLE_EXPERIMENTAL
#include <glm/ext/matrix_transform.hpp> #include <glm/ext/matrix_transform.hpp>

View File

@ -1,7 +1,7 @@
#ifndef GRAPHICS_RENDER_MODEL_BATCH_HPP_ #ifndef GRAPHICS_RENDER_MODEL_BATCH_HPP_
#define GRAPHICS_RENDER_MODEL_BATCH_HPP_ #define GRAPHICS_RENDER_MODEL_BATCH_HPP_
#include <maths/UVRegion.hpp> #include "maths/UVRegion.hpp"
#include <memory> #include <memory>
#include <vector> #include <vector>

View File

@ -1,15 +1,15 @@
#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"
#include <cmath> #include <cmath>
#include <iostream> #include <iostream>

Some files were not shown because too many files have changed in this diff Show More