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

the final rename

Browse Source
This commit is contained in:
MihailRis 2024-05-06 03:38:19 +03:00
parent f27a418dbe
commit 1627e21c1d
196 changed files with 836 additions and 815 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/Assets.cpp
View File

@ -6,7 +6,7 @@
#include "../graphics/core/Atlas.hpp" #include "../graphics/core/Atlas.hpp"
#include "../graphics/core/Font.hpp" #include "../graphics/core/Font.hpp"
#include "../frontend/UiDocument.hpp" #include "../frontend/UiDocument.hpp"
#include "../logic/scripting/scripting.h" #include "../logic/scripting/scripting.hpp"
Assets::~Assets() { Assets::~Assets() {
} }

14
src/assets/AssetsLoader.cpp
View File

@ -3,16 +3,16 @@
#include "Assets.hpp" #include "Assets.hpp"
#include "assetload_funcs.hpp" #include "assetload_funcs.hpp"
#include "../util/ThreadPool.hpp" #include "../util/ThreadPool.hpp"
#include "../constants.h" #include "../constants.hpp"
#include "../data/dynamic.h" #include "../data/dynamic.hpp"
#include "../debug/Logger.hpp" #include "../debug/Logger.hpp"
#include "../coders/imageio.hpp" #include "../coders/imageio.hpp"
#include "../files/files.h" #include "../files/files.hpp"
#include "../files/engine_paths.h" #include "../files/engine_paths.hpp"
#include "../content/Content.h" #include "../content/Content.hpp"
#include "../content/ContentPack.h" #include "../content/ContentPack.hpp"
#include "../graphics/core/Texture.hpp" #include "../graphics/core/Texture.hpp"
#include "../logic/scripting/scripting.h" #include "../logic/scripting/scripting.hpp"
#include <iostream> #include <iostream>
#include <memory> #include <memory>

4
src/assets/AssetsLoader.hpp
View File

@ -3,8 +3,8 @@
#include "Assets.hpp" #include "Assets.hpp"
#include "../interfaces/Task.hpp" #include "../interfaces/Task.hpp"
#include "../typedefs.h" #include "../typedefs.hpp"
#include "../delegates.h" #include "../delegates.hpp"
#include <string> #include <string>
#include <memory> #include <memory>

7
src/assets/assetload_funcs.cpp
View File

@ -2,11 +2,12 @@
#include "Assets.hpp" #include "Assets.hpp"
#include "AssetsLoader.hpp" #include "AssetsLoader.hpp"
#include "../data/dynamic.hpp"
#include "../audio/audio.hpp" #include "../audio/audio.hpp"
#include "../files/files.h" #include "../files/files.hpp"
#include "../files/engine_paths.h" #include "../files/engine_paths.hpp"
#include "../coders/imageio.hpp" #include "../coders/imageio.hpp"
#include "../coders/json.h" #include "../coders/json.hpp"
#include "../coders/GLSLExtension.hpp" #include "../coders/GLSLExtension.hpp"
#include "../graphics/core/Shader.hpp" #include "../graphics/core/Shader.hpp"
#include "../graphics/core/Texture.hpp" #include "../graphics/core/Texture.hpp"

2
src/audio/AL/ALAudio.hpp
View File

@ -2,7 +2,7 @@
#define SRC_AUDIO_AUDIO_HPP_ #define SRC_AUDIO_AUDIO_HPP_
#include "../audio.hpp" #include "../audio.hpp"
#include "../../typedefs.h" #include "../../typedefs.hpp"
#include <queue> #include <queue>
#include <vector> #include <vector>

2
src/audio/AL/alutil.hpp
View File

@ -1,7 +1,7 @@
#ifndef AUDIO_AUDIOUTIL_HPP_ #ifndef AUDIO_AUDIOUTIL_HPP_
#define AUDIO_AUDIOUTIL_HPP_ #define AUDIO_AUDIOUTIL_HPP_
#include "../../typedefs.h" #include "../../typedefs.hpp"
#include <string> #include <string>
#include <type_traits> #include <type_traits>

2
src/audio/audio.hpp
View File

@ -1,7 +1,7 @@
#ifndef AUDIO_AUDIO_HPP_ #ifndef AUDIO_AUDIO_HPP_
#define AUDIO_AUDIO_HPP_ #define AUDIO_AUDIO_HPP_
#include "../typedefs.h" #include "../typedefs.hpp"
#include <vector> #include <vector>
#include <memory> #include <memory>

6
src/coders/GLSLExtension.cpp
View File

@ -1,9 +1,9 @@
#include "GLSLExtension.hpp" #include "GLSLExtension.hpp"
#include "../util/stringutil.hpp" #include "../util/stringutil.hpp"
#include "../typedefs.h" #include "../typedefs.hpp"
#include "../files/files.h" #include "../files/files.hpp"
#include "../files/engine_paths.h" #include "../files/engine_paths.hpp"
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>

1
src/coders/binary_json.cpp
View File

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

7
src/coders/binary_json.hpp
View File

@ -1,9 +1,14 @@
#ifndef CODERS_BINARY_JSON_HPP_ #ifndef CODERS_BINARY_JSON_HPP_
#define CODERS_BINARY_JSON_HPP_ #define CODERS_BINARY_JSON_HPP_
#include "../typedefs.hpp"
#include <vector> #include <vector>
#include <memory> #include <memory>
#include "../data/dynamic.h"
namespace dynamic {
class Map;
}
namespace json { namespace json {
const int BJSON_END = 0x0; const int BJSON_END = 0x0;

2
src/coders/byte_utils.hpp
View File

@ -1,7 +1,7 @@
#ifndef CODERS_BYTE_UTILS_HPP_ #ifndef CODERS_BYTE_UTILS_HPP_
#define CODERS_BYTE_UTILS_HPP_ #define CODERS_BYTE_UTILS_HPP_
#include "../typedefs.h" #include "../typedefs.hpp"
#include <string> #include <string>
#include <vector> #include <vector>

9
src/coders/commons.hpp
View File

@ -1,9 +1,10 @@
#ifndef CODERS_COMMONS_H_ #ifndef CODERS_COMMONS_HPP_
#define CODERS_COMMONS_H_ #define CODERS_COMMONS_HPP_
#include "../typedefs.hpp"
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>
#include "../typedefs.h"
inline int is_box(int c) { inline int is_box(int c) {
switch (c) { switch (c) {
@ -102,4 +103,4 @@ public:
BasicParser(const std::string& file, const std::string& source); BasicParser(const std::string& file, const std::string& source);
}; };
#endif // CODERS_COMMONS_H_ #endif // CODERS_COMMONS_HPP_

2
src/coders/gzip.hpp
View File

@ -1,7 +1,7 @@
#ifndef CODERS_GZIP_HPP_ #ifndef CODERS_GZIP_HPP_
#define CODERS_GZIP_HPP_ #define CODERS_GZIP_HPP_
#include "../typedefs.h" #include "../typedefs.hpp"
#include <vector> #include <vector>
namespace gzip { namespace gzip {

8
src/coders/json.cpp
View File

@ -1,13 +1,13 @@
#include "json.h" #include "json.hpp"
#include "../data/dynamic.hpp"
#include "../util/stringutil.hpp"
#include <math.h> #include <math.h>
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
#include <memory> #include <memory>
#include "../data/dynamic.h"
#include "../util/stringutil.hpp"
using namespace json; using namespace json;
using namespace dynamic; using namespace dynamic;

8
src/coders/json.h → src/coders/json.hpp
View File

@ -1,10 +1,10 @@
#ifndef CODERS_JSON_H_ #ifndef CODERS_JSON_HPP_
#define CODERS_JSON_H_ #define CODERS_JSON_HPP_
#include "commons.hpp" #include "commons.hpp"
#include "binary_json.hpp" #include "binary_json.hpp"
#include "../typedefs.h" #include "../typedefs.hpp"
#include <vector> #include <vector>
#include <string> #include <string>
@ -38,4 +38,4 @@ namespace json {
const std::string& indent); const std::string& indent);
} }
#endif // CODERS_JSON_H_ #endif // CODERS_JSON_HPP_

2
src/coders/ogg.cpp
View File

@ -2,7 +2,7 @@
#include "../debug/Logger.hpp" #include "../debug/Logger.hpp"
#include "../audio/audio.hpp" #include "../audio/audio.hpp"
#include "../typedefs.h" #include "../typedefs.hpp"
#include <string> #include <string>
#include <vorbis/codec.h> #include <vorbis/codec.h>

2
src/coders/png.cpp
View File

@ -2,7 +2,7 @@
#include "../graphics/core/ImageData.hpp" #include "../graphics/core/ImageData.hpp"
#include "../graphics/core/Texture.hpp" #include "../graphics/core/Texture.hpp"
#include "../files/files.h" #include "../files/files.hpp"
#include "../debug/Logger.hpp" #include "../debug/Logger.hpp"
#include <iostream> #include <iostream>

2
src/coders/rle.hpp
View File

@ -1,7 +1,7 @@
#ifndef CODERS_RLE_HPP_ #ifndef CODERS_RLE_HPP_
#define CODERS_RLE_HPP_ #define CODERS_RLE_HPP_
#include "../typedefs.h" #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);

2
src/coders/toml.cpp
View File

@ -2,7 +2,7 @@
#include "commons.hpp" #include "commons.hpp"
#include "../data/setting.hpp" #include "../data/setting.hpp"
#include "../data/dynamic.h" #include "../data/dynamic.hpp"
#include "../util/stringutil.hpp" #include "../util/stringutil.hpp"
#include "../files/settings_io.hpp" #include "../files/settings_io.hpp"

9
src/constants.h → src/constants.hpp
View File

@ -1,9 +1,10 @@
#ifndef CONSTANTS_H_ #ifndef CONSTANTS_HPP_
#define CONSTANTS_H_ #define CONSTANTS_HPP_
#include "typedefs.hpp"
#include <limits> #include <limits>
#include <string> #include <string>
#include "typedefs.h"
inline constexpr int ENGINE_VERSION_MAJOR = 0; inline constexpr int ENGINE_VERSION_MAJOR = 0;
inline constexpr int ENGINE_VERSION_MINOR = 21; inline constexpr int ENGINE_VERSION_MINOR = 21;
@ -49,4 +50,4 @@ inline const std::string FONTS_FOLDER = "fonts";
inline const std::string LAYOUTS_FOLDER = "layouts"; inline const std::string LAYOUTS_FOLDER = "layouts";
inline const std::string SOUNDS_FOLDER = "sounds"; inline const std::string SOUNDS_FOLDER = "sounds";
#endif // CONSTANTS_H_ #endif // CONSTANTS_HPP_

10
src/content/Content.cpp
View File

@ -1,14 +1,14 @@
#include "Content.h" #include "Content.hpp"
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include "../voxels/Block.h" #include "../voxels/Block.hpp"
#include "../items/ItemDef.h" #include "../items/ItemDef.hpp"
#include "ContentPack.h" #include "ContentPack.hpp"
#include "../logic/scripting/scripting.h" #include "../logic/scripting/scripting.hpp"
ContentBuilder::~ContentBuilder() {} ContentBuilder::~ContentBuilder() {}

10
src/content/Content.h → src/content/Content.hpp
View File

@ -1,5 +1,5 @@
#ifndef CONTENT_CONTENT_H_ #ifndef CONTENT_CONTENT_HPP_
#define CONTENT_CONTENT_H_ #define CONTENT_CONTENT_HPP_
#include <string> #include <string>
#include <vector> #include <vector>
@ -7,8 +7,8 @@
#include <stdexcept> #include <stdexcept>
#include <unordered_map> #include <unordered_map>
#include <set> #include <set>
#include "../typedefs.h" #include "../typedefs.hpp"
#include "../voxels/Block.h" #include "../voxels/Block.hpp"
using DrawGroups = std::set<ubyte>; using DrawGroups = std::set<ubyte>;
@ -146,4 +146,4 @@ public:
const std::unordered_map<std::string, std::unique_ptr<ContentPackRuntime>>& getPacks() const; const std::unordered_map<std::string, std::unique_ptr<ContentPackRuntime>>& getPacks() const;
}; };
#endif // CONTENT_CONTENT_H_ #endif // CONTENT_CONTENT_HPP_

14
src/content/ContentLUT.cpp
View File

@ -1,12 +1,12 @@
#include "ContentLUT.hpp" #include "ContentLUT.hpp"
#include "Content.h" #include "Content.hpp"
#include "../constants.h" #include "../constants.hpp"
#include "../files/files.h" #include "../files/files.hpp"
#include "../coders/json.h" #include "../coders/json.hpp"
#include "../voxels/Block.h" #include "../voxels/Block.hpp"
#include "../items/ItemDef.h" #include "../items/ItemDef.hpp"
#include "../data/dynamic.h" #include "../data/dynamic.hpp"
#include <memory> #include <memory>

6
src/content/ContentLUT.hpp
View File

@ -1,10 +1,10 @@
#ifndef CONTENT_CONTENT_LUT_HPP_ #ifndef CONTENT_CONTENT_LUT_HPP_
#define CONTENT_CONTENT_LUT_HPP_ #define CONTENT_CONTENT_LUT_HPP_
#include "Content.h" #include "Content.hpp"
#include "../typedefs.h" #include "../typedefs.hpp"
#include "../constants.h" #include "../constants.hpp"
#include <string> #include <string>
#include <vector> #include <vector>

20
src/content/ContentLoader.cpp
View File

@ -1,17 +1,17 @@
#include "ContentLoader.h" #include "ContentLoader.hpp"
#include "Content.h" #include "Content.hpp"
#include "ContentPack.h" #include "ContentPack.hpp"
#include "../coders/json.h" #include "../coders/json.hpp"
#include "../core_defs.hpp" #include "../core_defs.hpp"
#include "../data/dynamic.h" #include "../data/dynamic.hpp"
#include "../debug/Logger.hpp" #include "../debug/Logger.hpp"
#include "../files/files.h" #include "../files/files.hpp"
#include "../items/ItemDef.h" #include "../items/ItemDef.hpp"
#include "../logic/scripting/scripting.h" #include "../logic/scripting/scripting.hpp"
#include "../typedefs.h" #include "../typedefs.hpp"
#include "../util/listutil.hpp" #include "../util/listutil.hpp"
#include "../voxels/Block.h" #include "../voxels/Block.hpp"
#include <iostream> #include <iostream>
#include <string> #include <string>

8
src/content/ContentLoader.h → src/content/ContentLoader.hpp
View File

@ -1,7 +1,7 @@
#ifndef CONTENT_CONTENT_LOADER_H_ #ifndef CONTENT_CONTENT_LOADER_HPP_
#define CONTENT_CONTENT_LOADER_H_ #define CONTENT_CONTENT_LOADER_HPP_
#include "../voxels/Block.h" #include "../voxels/Block.hpp"
#include <string> #include <string>
#include <filesystem> #include <filesystem>
@ -38,4 +38,4 @@ public:
void load(ContentBuilder& builder); void load(ContentBuilder& builder);
}; };
#endif // CONTENT_CONTENT_LOADER_H_ #endif // CONTENT_CONTENT_LOADER_HPP_

10
src/content/ContentPack.cpp
View File

@ -1,12 +1,12 @@
#include "ContentPack.h" #include "ContentPack.hpp"
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
#include "../coders/json.h" #include "../coders/json.hpp"
#include "../files/files.h" #include "../files/files.hpp"
#include "../files/engine_paths.h" #include "../files/engine_paths.hpp"
#include "../data/dynamic.h" #include "../data/dynamic.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;

8
src/content/ContentPack.h → src/content/ContentPack.hpp
View File

@ -1,7 +1,7 @@
#ifndef CONTENT_CONTENT_PACK_H_ #ifndef CONTENT_CONTENT_PACK_HPP_
#define CONTENT_CONTENT_PACK_H_ #define CONTENT_CONTENT_PACK_HPP_
#include "../typedefs.h" #include "../typedefs.hpp"
#include <string> #include <string>
#include <vector> #include <vector>
@ -116,4 +116,4 @@ public:
} }
}; };
#endif // CONTENT_CONTENT_PACK_H_ #endif // CONTENT_CONTENT_PACK_HPP_

2
src/content/PacksManager.hpp
View File

@ -1,7 +1,7 @@
#ifndef CONTENT_PACKS_MANAGER_HPP_ #ifndef CONTENT_PACKS_MANAGER_HPP_
#define CONTENT_PACKS_MANAGER_HPP_ #define CONTENT_PACKS_MANAGER_HPP_
#include "ContentPack.h" #include "ContentPack.hpp"
#include <vector> #include <vector>
#include <filesystem> #include <filesystem>

6
src/core_defs.cpp
View File

@ -1,11 +1,11 @@
#include "core_defs.hpp" #include "core_defs.hpp"
#include "items/ItemDef.h" #include "items/ItemDef.hpp"
#include "content/Content.h" #include "content/Content.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.h" #include "voxels/Block.hpp"
// All in-game definitions (blocks, items, etc..) // All in-game definitions (blocks, items, etc..)
void corecontent::setup(ContentBuilder* builder) { void corecontent::setup(ContentBuilder* builder) {

2
src/data/dynamic.cpp
View File

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

9
src/data/dynamic.h → src/data/dynamic.hpp
View File

@ -1,12 +1,13 @@
#ifndef DATA_DYNAMIC_H_ #ifndef DATA_DYNAMIC_HPP_
#define DATA_DYNAMIC_H_ #define DATA_DYNAMIC_HPP_
#include "../typedefs.hpp"
#include <string> #include <string>
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <variant> #include <variant>
#include <unordered_map> #include <unordered_map>
#include "../typedefs.h"
namespace dynamic { namespace dynamic {
class Map; class Map;
@ -129,4 +130,4 @@ namespace dynamic {
}; };
} }
#endif // DATA_DYNAMIC_H_ #endif // DATA_DYNAMIC_HPP_

10
src/data/setting.hpp
View File

@ -1,13 +1,13 @@
#ifndef DATA_SETTING_H_ #ifndef DATA_SETTING_HPP_
#define DATA_SETTING_H_ #define DATA_SETTING_HPP_
#include <limits> #include <limits>
#include <string> #include <string>
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
#include "../typedefs.h" #include "../typedefs.hpp"
#include "../delegates.h" #include "../delegates.hpp"
enum class setting_format { enum class setting_format {
simple, percent simple, percent
@ -177,4 +177,4 @@ public:
virtual std::string toString() const override; virtual std::string toString() const override;
}; };
#endif // DATA_SETTING_H_ #endif // DATA_SETTING_HPP_

6
src/delegates.h → src/delegates.hpp
View File

@ -1,5 +1,5 @@
#ifndef DELEGATES_H_ #ifndef DELEGATES_HPP_
#define DELEGATES_H_ #define DELEGATES_HPP_
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <functional> #include <functional>
@ -22,4 +22,4 @@ using boolconsumer = std::function<void(bool)>;
using int_array_consumer = std::function<void(const int[], size_t)>; using int_array_consumer = std::function<void(const int[], size_t)>;
using wstringchecker = std::function<bool(const std::wstring&)>; using wstringchecker = std::function<bool(const std::wstring&)>;
#endif // DELEGATES_H_ #endif // DELEGATES_HPP_

16
src/engine.cpp
View File

@ -1,4 +1,4 @@
#include "engine.h" #include "engine.hpp"
#define GLEW_STATIC #define GLEW_STATIC
@ -7,11 +7,11 @@
#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.h" #include "coders/json.hpp"
#include "coders/toml.hpp" #include "coders/toml.hpp"
#include "content/ContentLoader.h" #include "content/ContentLoader.hpp"
#include "core_defs.hpp" #include "core_defs.hpp"
#include "files/files.h" #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"
@ -23,16 +23,16 @@
#include "graphics/core/Shader.hpp" #include "graphics/core/Shader.hpp"
#include "graphics/ui/GUI.hpp" #include "graphics/ui/GUI.hpp"
#include "logic/EngineController.hpp" #include "logic/EngineController.hpp"
#include "logic/scripting/scripting.h" #include "logic/scripting/scripting.hpp"
#include "util/listutil.hpp" #include "util/listutil.hpp"
#include "util/platform.hpp" #include "util/platform.hpp"
#include "voxels/DefaultWorldGenerator.h" #include "voxels/DefaultWorldGenerator.hpp"
#include "voxels/FlatWorldGenerator.h" #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.h" #include "world/WorldGenerators.hpp"
#include <iostream> #include <iostream>
#include <assert.h> #include <assert.h>

18
src/engine.h → src/engine.hpp
View File

@ -1,15 +1,15 @@
#ifndef SRC_ENGINE_H_ #ifndef ENGINE_HPP_
#define SRC_ENGINE_H_ #define ENGINE_HPP_
#include "delegates.h" #include "delegates.hpp"
#include "settings.h" #include "settings.hpp"
#include "typedefs.h" #include "typedefs.hpp"
#include "assets/Assets.hpp" #include "assets/Assets.hpp"
#include "content/Content.h" #include "content/Content.hpp"
#include "content/ContentPack.h" #include "content/ContentPack.hpp"
#include "content/PacksManager.hpp" #include "content/PacksManager.hpp"
#include "files/engine_paths.h" #include "files/engine_paths.hpp"
#include "util/ObjectsKeeper.hpp" #include "util/ObjectsKeeper.hpp"
#include <filesystem> #include <filesystem>
@ -142,4 +142,4 @@ public:
SettingsHandler& getSettingsHandler(); SettingsHandler& getSettingsHandler();
}; };
#endif // SRC_ENGINE_H_ #endif // ENGINE_HPP_

12
src/files/WorldConverter.cpp
View File

@ -1,14 +1,14 @@
#include "WorldConverter.h" #include "WorldConverter.hpp"
#include "WorldFiles.h" #include "WorldFiles.hpp"
#include "../content/ContentLUT.hpp" #include "../content/ContentLUT.hpp"
#include "../data/dynamic.h" #include "../data/dynamic.hpp"
#include "../debug/Logger.hpp" #include "../debug/Logger.hpp"
#include "../files/files.h" #include "../files/files.hpp"
#include "../objects/Player.h" #include "../objects/Player.hpp"
#include "../util/ThreadPool.hpp" #include "../util/ThreadPool.hpp"
#include "../voxels/Chunk.h" #include "../voxels/Chunk.hpp"
#include <memory> #include <memory>
#include <iostream> #include <iostream>

10
src/files/WorldConverter.h → src/files/WorldConverter.hpp
View File

@ -1,12 +1,12 @@
#ifndef FILES_WORLD_CONVERTER_H_ #ifndef FILES_WORLD_CONVERTER_HPP_
#define FILES_WORLD_CONVERTER_H_ #define FILES_WORLD_CONVERTER_HPP_
#include <queue> #include <queue>
#include <memory> #include <memory>
#include <filesystem> #include <filesystem>
#include "../typedefs.h" #include "../typedefs.hpp"
#include "../delegates.h" #include "../delegates.hpp"
#include "../interfaces/Task.hpp" #include "../interfaces/Task.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;
@ -63,4 +63,4 @@ public:
); );
}; };
#endif // FILES_WORLD_CONVERTER_H_ #endif // FILES_WORLD_CONVERTER_HPP_

32
src/files/WorldFiles.cpp
View File

@ -1,24 +1,24 @@
#include "WorldFiles.h" #include "WorldFiles.hpp"
#include "../coders/byte_utils.hpp" #include "../coders/byte_utils.hpp"
#include "../coders/json.h" #include "../coders/json.hpp"
#include "../constants.h" #include "../constants.hpp"
#include "../content/Content.h" #include "../content/Content.hpp"
#include "../core_defs.hpp" #include "../core_defs.hpp"
#include "../data/dynamic.h" #include "../data/dynamic.hpp"
#include "../items/Inventory.h" #include "../items/Inventory.hpp"
#include "../items/ItemDef.h" #include "../items/ItemDef.hpp"
#include "../lighting/Lightmap.h" #include "../lighting/Lightmap.hpp"
#include "../maths/voxmaths.h" #include "../maths/voxmaths.hpp"
#include "../objects/Player.h" #include "../objects/Player.hpp"
#include "../physics/Hitbox.h" #include "../physics/Hitbox.hpp"
#include "../typedefs.h" #include "../typedefs.hpp"
#include "../util/data_io.hpp" #include "../util/data_io.hpp"
#include "../voxels/Block.h" #include "../voxels/Block.hpp"
#include "../voxels/Chunk.h" #include "../voxels/Chunk.hpp"
#include "../voxels/voxel.h" #include "../voxels/voxel.hpp"
#include "../window/Camera.hpp" #include "../window/Camera.hpp"
#include "../world/World.h" #include "../world/World.hpp"
#include <cassert> #include <cassert>
#include <iostream> #include <iostream>

16
src/files/WorldFiles.h → src/files/WorldFiles.hpp
View File

@ -1,13 +1,13 @@
#ifndef FILES_WORLD_FILES_H_ #ifndef FILES_WORLD_FILES_HPP_
#define FILES_WORLD_FILES_H_ #define FILES_WORLD_FILES_HPP_
#include "WorldRegions.hpp" #include "WorldRegions.hpp"
#include "files.h" #include "files.hpp"
#include "../typedefs.h" #include "../typedefs.hpp"
#include "../settings.h" #include "../settings.hpp"
#include "../content/ContentPack.h" #include "../content/ContentPack.hpp"
#include "../voxels/Chunk.h" #include "../voxels/Chunk.hpp"
#include <vector> #include <vector>
#include <string> #include <string>
@ -73,4 +73,4 @@ public:
} }
}; };
#endif // FILES_WORLD_FILES_H_ #endif // FILES_WORLD_FILES_HPP_

9
src/files/WorldRegions.cpp
View File

@ -1,10 +1,11 @@
#include "WorldRegions.hpp" #include "WorldRegions.hpp"
#include "../coders/rle.hpp"
#include "../util/data_io.hpp"
#include "../coders/byte_utils.hpp" #include "../coders/byte_utils.hpp"
#include "../maths/voxmaths.h" #include "../coders/rle.hpp"
#include "../items/Inventory.h" #include "../data/dynamic.hpp"
#include "../items/Inventory.hpp"
#include "../maths/voxmaths.hpp"
#include "../util/data_io.hpp"
#include <cstring> #include <cstring>

6
src/files/WorldRegions.hpp
View File

@ -1,10 +1,10 @@
#ifndef FILES_WORLD_REGIONS_HPP_ #ifndef FILES_WORLD_REGIONS_HPP_
#define FILES_WORLD_REGIONS_HPP_ #define FILES_WORLD_REGIONS_HPP_
#include "files.h" #include "files.hpp"
#include "../typedefs.h" #include "../typedefs.hpp"
#include "../util/BufferPool.hpp" #include "../util/BufferPool.hpp"
#include "../voxels/Chunk.h" #include "../voxels/Chunk.hpp"
#include <mutex> #include <mutex>
#include <memory> #include <memory>

6
src/files/engine_paths.cpp
View File

@ -1,4 +1,4 @@
#include "engine_paths.h" #include "engine_paths.hpp"
#include <stack> #include <stack>
#include <sstream> #include <sstream>
@ -6,8 +6,8 @@
#include <algorithm> #include <algorithm>
#include "../util/stringutil.hpp" #include "../util/stringutil.hpp"
#include "../typedefs.h" #include "../typedefs.hpp"
#include "WorldFiles.h" #include "WorldFiles.hpp"
const fs::path SCREENSHOTS_FOLDER {"screenshots"}; const fs::path SCREENSHOTS_FOLDER {"screenshots"};
const fs::path CONTROLS_FILE {"controls.json"}; const fs::path CONTROLS_FILE {"controls.json"};

8
src/files/engine_paths.h → src/files/engine_paths.hpp
View File

@ -1,12 +1,12 @@
#ifndef FILES_ENGINE_PATHS_H_ #ifndef FILES_ENGINE_PATHS_HPP_
#define FILES_ENGINE_PATHS_H_ #define FILES_ENGINE_PATHS_HPP_
#include <string> #include <string>
#include <vector> #include <vector>
#include <stdexcept> #include <stdexcept>
#include <filesystem> #include <filesystem>
#include "../content/ContentPack.h" #include "../content/ContentPack.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;
@ -58,4 +58,4 @@ public:
const fs::path& getMainRoot() const; const fs::path& getMainRoot() const;
}; };
#endif // FILES_ENGINE_PATHS_H_ #endif // FILES_ENGINE_PATHS_HPP_

6
src/files/files.cpp
View File

@ -1,9 +1,9 @@
#include "files.h" #include "files.hpp"
#include "../coders/json.h" #include "../coders/json.hpp"
#include "../coders/gzip.hpp" #include "../coders/gzip.hpp"
#include "../util/stringutil.hpp" #include "../util/stringutil.hpp"
#include "../data/dynamic.h" #include "../data/dynamic.hpp"
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>

8
src/files/files.h → src/files/files.hpp
View File

@ -1,12 +1,12 @@
#ifndef FILES_FILES_H_ #ifndef FILES_FILES_HPP_
#define FILES_FILES_H_ #define FILES_FILES_HPP_
#include <string> #include <string>
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <fstream> #include <fstream>
#include <filesystem> #include <filesystem>
#include "../typedefs.h" #include "../typedefs.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;
@ -69,4 +69,4 @@ namespace files {
std::vector<std::string> read_list(fs::path file); std::vector<std::string> read_list(fs::path file);
} }
#endif /* FILES_FILES_H_ */ #endif /* FILES_FILES_HPP_ */

4
src/files/settings_io.cpp
View File

@ -3,9 +3,9 @@
#include "../window/Events.hpp" #include "../window/Events.hpp"
#include "../window/input.hpp" #include "../window/input.hpp"
#include "../coders/toml.hpp" #include "../coders/toml.hpp"
#include "../coders/json.h" #include "../coders/json.hpp"
#include "../debug/Logger.hpp" #include "../debug/Logger.hpp"
#include "../settings.h" #include "../settings.hpp"
#include <memory> #include <memory>

2
src/files/settings_io.hpp
View File

@ -1,7 +1,7 @@
#ifndef FILES_SETTINGS_IO_HPP_ #ifndef FILES_SETTINGS_IO_HPP_
#define FILES_SETTINGS_IO_HPP_ #define FILES_SETTINGS_IO_HPP_
#include "../data/dynamic.h" #include "../data/dynamic.hpp"
#include <string> #include <string>
#include <memory> #include <memory>

6
src/frontend/ContentGfxCache.cpp
View File

@ -3,12 +3,12 @@
#include "UiDocument.hpp" #include "UiDocument.hpp"
#include "../assets/Assets.hpp" #include "../assets/Assets.hpp"
#include "../content/Content.h" #include "../content/Content.hpp"
#include "../content/ContentPack.h" #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.h" #include "../voxels/Block.hpp"
#include <string> #include <string>

2
src/frontend/ContentGfxCache.hpp
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.h" #include "../typedefs.hpp"
#include <memory> #include <memory>

10
src/frontend/LevelFrontend.cpp
View File

@ -4,13 +4,13 @@
#include "../assets/Assets.hpp" #include "../assets/Assets.hpp"
#include "../audio/audio.hpp" #include "../audio/audio.hpp"
#include "../content/Content.h" #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.h" #include "../logic/LevelController.hpp"
#include "../logic/PlayerController.h" #include "../logic/PlayerController.hpp"
#include "../voxels/Block.h" #include "../voxels/Block.hpp"
#include "../world/Level.h" #include "../world/Level.hpp"
LevelFrontend::LevelFrontend(LevelController* controller, Assets* assets) LevelFrontend::LevelFrontend(LevelController* controller, Assets* assets)
: level(controller->getLevel()), : level(controller->getLevel()),

4
src/frontend/UiDocument.cpp
View File

@ -1,10 +1,10 @@
#include "UiDocument.hpp" #include "UiDocument.hpp"
#include "../files/files.h" #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.h" #include "../logic/scripting/scripting.hpp"
UiDocument::UiDocument( UiDocument::UiDocument(
std::string id, std::string id,

2
src/frontend/UiDocument.hpp
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.h" #include "../typedefs.hpp"
#include <string> #include <string>
#include <memory> #include <memory>

18
src/frontend/debug_panel.cpp
View File

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

32
src/frontend/hud.cpp
View File

@ -5,10 +5,10 @@
#include "UiDocument.hpp" #include "UiDocument.hpp"
#include "../assets/Assets.hpp" #include "../assets/Assets.hpp"
#include "../content/Content.h" #include "../content/Content.hpp"
#include "../core_defs.hpp" #include "../core_defs.hpp"
#include "../delegates.h" #include "../delegates.hpp"
#include "../engine.h" #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"
@ -25,24 +25,24 @@
#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.h" #include "../items/Inventories.hpp"
#include "../items/Inventory.h" #include "../items/Inventory.hpp"
#include "../items/ItemDef.h" #include "../items/ItemDef.hpp"
#include "../logic/scripting/scripting.h" #include "../logic/scripting/scripting.hpp"
#include "../maths/voxmaths.h" #include "../maths/voxmaths.hpp"
#include "../objects/Player.h" #include "../objects/Player.hpp"
#include "../physics/Hitbox.h" #include "../physics/Hitbox.hpp"
#include "../typedefs.h" #include "../typedefs.hpp"
#include "../util/stringutil.hpp" #include "../util/stringutil.hpp"
#include "../voxels/Block.h" #include "../voxels/Block.hpp"
#include "../voxels/Chunk.h" #include "../voxels/Chunk.hpp"
#include "../voxels/Chunks.h" #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.h" #include "../world/Level.hpp"
#include "../world/World.h" #include "../world/World.hpp"
#include <assert.h> #include <assert.h>
#include <memory> #include <memory>

2
src/frontend/hud.hpp
View File

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

8
src/frontend/locale.cpp
View File

@ -1,11 +1,11 @@
#include "locale.hpp" #include "locale.hpp"
#include "../coders/json.h" #include "../coders/json.hpp"
#include "../coders/commons.hpp" #include "../coders/commons.hpp"
#include "../content/ContentPack.h" #include "../content/ContentPack.hpp"
#include "../files/files.h" #include "../files/files.hpp"
#include "../util/stringutil.hpp" #include "../util/stringutil.hpp"
#include "../data/dynamic.h" #include "../data/dynamic.hpp"
#include "../debug/Logger.hpp" #include "../debug/Logger.hpp"
static debug::Logger logger("locale"); static debug::Logger logger("locale");

2
src/frontend/locale.hpp
View File

@ -1,7 +1,7 @@
#ifndef FRONTEND_LOCALES_HPP_ #ifndef FRONTEND_LOCALES_HPP_
#define FRONTEND_LOCALES_HPP_ #define FRONTEND_LOCALES_HPP_
#include "../content/ContentPack.h" #include "../content/ContentPack.hpp"
#include <string> #include <string>
#include <vector> #include <vector>

12
src/frontend/menu.cpp
View File

@ -3,16 +3,16 @@
#include "locale.hpp" #include "locale.hpp"
#include "UiDocument.hpp" #include "UiDocument.hpp"
#include "../delegates.h" #include "../delegates.hpp"
#include "../engine.h" #include "../engine.hpp"
#include "../data/dynamic.h" #include "../data/dynamic.hpp"
#include "../interfaces/Task.hpp" #include "../interfaces/Task.hpp"
#include "../files/engine_paths.h" #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.h" #include "../logic/scripting/scripting.hpp"
#include "../settings.h" #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"

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

@ -5,22 +5,22 @@
#include "../../debug/Logger.hpp" #include "../../debug/Logger.hpp"
#include "../../audio/audio.hpp" #include "../../audio/audio.hpp"
#include "../../coders/imageio.hpp" #include "../../coders/imageio.hpp"
#include "../../graphics/core/PostProcessing.h" #include "../../graphics/core/PostProcessing.hpp"
#include "../../graphics/core/DrawContext.hpp" #include "../../graphics/core/DrawContext.hpp"
#include "../../graphics/core/Viewport.hpp" #include "../../graphics/core/Viewport.hpp"
#include "../../graphics/core/ImageData.hpp" #include "../../graphics/core/ImageData.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/render/WorldRenderer.hpp" #include "../../graphics/render/WorldRenderer.hpp"
#include "../../logic/LevelController.h" #include "../../logic/LevelController.hpp"
#include "../../logic/scripting/scripting_hud.hpp" #include "../../logic/scripting/scripting_hud.hpp"
#include "../../physics/Hitbox.h" #include "../../physics/Hitbox.hpp"
#include "../../voxels/Chunks.h" #include "../../voxels/Chunks.hpp"
#include "../../world/Level.h" #include "../../world/Level.hpp"
#include "../../world/World.h" #include "../../world/World.hpp"
#include "../../window/Camera.hpp" #include "../../window/Camera.hpp"
#include "../../window/Events.hpp" #include "../../window/Events.hpp"
#include "../../engine.h" #include "../../engine.hpp"
static debug::Logger logger("level-screen"); static debug::Logger logger("level-screen");

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

@ -7,7 +7,7 @@
#include "../../graphics/core/Texture.hpp" #include "../../graphics/core/Texture.hpp"
#include "../../window/Window.hpp" #include "../../window/Window.hpp"
#include "../../window/Camera.hpp" #include "../../window/Camera.hpp"
#include "../../engine.h" #include "../../engine.hpp"
MenuScreen::MenuScreen(Engine* engine) : Screen(engine) { MenuScreen::MenuScreen(Engine* engine) : Screen(engine) {
engine->resetContent(); engine->resetContent();

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

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

2
src/graphics/core/Atlas.hpp
View File

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

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

@ -4,7 +4,7 @@
#include "Texture.hpp" #include "Texture.hpp"
#include <GL/glew.h> #include <GL/glew.h>
#include "../../typedefs.h" #include "../../typedefs.hpp"
inline constexpr uint B3D_VERTEX_SIZE = 9; inline constexpr uint B3D_VERTEX_SIZE = 9;

2
src/graphics/core/Batch3D.hpp
View File

@ -2,7 +2,7 @@
#define GRAPHICS_CORE_BATCH3D_HPP_ #define GRAPHICS_CORE_BATCH3D_HPP_
#include "../../maths/UVRegion.hpp" #include "../../maths/UVRegion.hpp"
#include "../../typedefs.h" #include "../../typedefs.hpp"
#include <memory> #include <memory>
#include <stdlib.h> #include <stdlib.h>

2
src/graphics/core/DrawContext.hpp
View File

@ -4,7 +4,7 @@
#include "commons.hpp" #include "commons.hpp"
#include "Viewport.hpp" #include "Viewport.hpp"
#include "../../window/Window.hpp" #include "../../window/Window.hpp"
#include "../../typedefs.h" #include "../../typedefs.hpp"
class Batch2D; class Batch2D;
class Framebuffer; class Framebuffer;

2
src/graphics/core/Font.hpp
View File

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

2
src/graphics/core/Framebuffer.hpp
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.h" #include "../../typedefs.hpp"
#include <memory> #include <memory>

2
src/graphics/core/ImageData.hpp
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.h" #include "../../typedefs.hpp"
enum class ImageFormat { enum class ImageFormat {
rgb888, rgb888,

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

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

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

@ -1,4 +1,4 @@
#include "PostProcessing.h" #include "PostProcessing.hpp"
#include "Mesh.hpp" #include "Mesh.hpp"
#include "Shader.hpp" #include "Shader.hpp"
#include "Texture.hpp" #include "Texture.hpp"

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

2
src/graphics/core/Shader.hpp
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.h" #include "../../typedefs.hpp"
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>

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

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

2
src/graphics/core/TextureAnimation.hpp
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.h" #include "../../typedefs.hpp"
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <vector> #include <vector>

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

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

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

@ -1,10 +1,10 @@
#include "BlocksPreview.hpp" #include "BlocksPreview.hpp"
#include "../../assets/Assets.hpp" #include "../../assets/Assets.hpp"
#include "../../constants.h" #include "../../constants.hpp"
#include "../../content/Content.h" #include "../../content/Content.hpp"
#include "../../frontend/ContentGfxCache.hpp" #include "../../frontend/ContentGfxCache.hpp"
#include "../../voxels/Block.h" #include "../../voxels/Block.hpp"
#include "../../window/Camera.hpp" #include "../../window/Camera.hpp"
#include "../../window/Window.hpp" #include "../../window/Window.hpp"
#include "../core/Atlas.hpp" #include "../core/Atlas.hpp"

2
src/graphics/render/BlocksPreview.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.h" #include "../../typedefs.hpp"
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <memory> #include <memory>

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

@ -2,15 +2,15 @@
#include "../core/Mesh.hpp" #include "../core/Mesh.hpp"
#include "../../maths/UVRegion.hpp" #include "../../maths/UVRegion.hpp"
#include "../../constants.h" #include "../../constants.hpp"
#include "../../content/Content.h" #include "../../content/Content.hpp"
#include "../../voxels/Block.h" #include "../../voxels/Block.hpp"
#include "../../voxels/Chunk.h" #include "../../voxels/Chunk.hpp"
#include "../../voxels/VoxelsVolume.h" #include "../../voxels/VoxelsVolume.hpp"
#include "../../voxels/ChunksStorage.h" #include "../../voxels/ChunksStorage.hpp"
#include "../../lighting/Lightmap.h" #include "../../lighting/Lightmap.hpp"
#include "../../frontend/ContentGfxCache.hpp" #include "../../frontend/ContentGfxCache.hpp"
#include "../../settings.h" #include "../../settings.hpp"
#include <glm/glm.hpp> #include <glm/glm.hpp>

4
src/graphics/render/BlocksRenderer.hpp
View File

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

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

@ -2,9 +2,9 @@
#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.h" #include "../../voxels/Chunk.hpp"
#include "../../world/Level.h" #include "../../world/Level.hpp"
#include "../../settings.h" #include "../../settings.hpp"
#include <iostream> #include <iostream>
#include <glm/glm.hpp> #include <glm/glm.hpp>

4
src/graphics/render/ChunksRenderer.hpp
View File

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

4
src/graphics/render/Skybox.hpp
View File

@ -4,8 +4,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "../../typedefs.h" #include "../../typedefs.hpp"
#include "../../maths/fastmaths.h" #include "../../maths/fastmaths.hpp"
class Mesh; class Mesh;
class Shader; class Shader;

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

@ -4,31 +4,31 @@
#include "Skybox.hpp" #include "Skybox.hpp"
#include "../../assets/Assets.hpp" #include "../../assets/Assets.hpp"
#include "../../content/Content.h" #include "../../content/Content.hpp"
#include "../../engine.h" #include "../../engine.hpp"
#include "../../frontend/LevelFrontend.hpp" #include "../../frontend/LevelFrontend.hpp"
#include "../../items/Inventory.h" #include "../../items/Inventory.hpp"
#include "../../items/ItemDef.h" #include "../../items/ItemDef.hpp"
#include "../../items/ItemStack.h" #include "../../items/ItemStack.hpp"
#include "../../logic/PlayerController.h" #include "../../logic/PlayerController.hpp"
#include "../../maths/FrustumCulling.hpp" #include "../../maths/FrustumCulling.hpp"
#include "../../maths/voxmaths.h" #include "../../maths/voxmaths.hpp"
#include "../../objects/Player.h" #include "../../objects/Player.hpp"
#include "../../settings.h" #include "../../settings.hpp"
#include "../../voxels/Block.h" #include "../../voxels/Block.hpp"
#include "../../voxels/Chunk.h" #include "../../voxels/Chunk.hpp"
#include "../../voxels/Chunks.h" #include "../../voxels/Chunks.hpp"
#include "../../window/Camera.hpp" #include "../../window/Camera.hpp"
#include "../../window/Window.hpp" #include "../../window/Window.hpp"
#include "../../world/Level.h" #include "../../world/Level.hpp"
#include "../../world/LevelEvents.h" #include "../../world/LevelEvents.hpp"
#include "../../world/World.h" #include "../../world/World.hpp"
#include "../core/Atlas.hpp" #include "../core/Atlas.hpp"
#include "../core/Batch3D.hpp" #include "../core/Batch3D.hpp"
#include "../core/DrawContext.hpp" #include "../core/DrawContext.hpp"
#include "../core/LineBatch.hpp" #include "../core/LineBatch.hpp"
#include "../core/Mesh.hpp" #include "../core/Mesh.hpp"
#include "../core/PostProcessing.h" #include "../core/PostProcessing.hpp"
#include "../core/Shader.hpp" #include "../core/Shader.hpp"
#include "../core/Texture.hpp" #include "../core/Texture.hpp"

2
src/graphics/ui/GUI.hpp
View File

@ -1,7 +1,7 @@
#ifndef FRONTEND_GUI_GUI_HPP_ #ifndef FRONTEND_GUI_GUI_HPP_
#define FRONTEND_GUI_GUI_HPP_ #define FRONTEND_GUI_GUI_HPP_
#include "../../delegates.h" #include "../../delegates.hpp"
#include <queue> #include <queue>
#include <memory> #include <memory>

20
src/graphics/ui/elements/InventoryView.cpp
View File

@ -1,19 +1,19 @@
#include "InventoryView.hpp" #include "InventoryView.hpp"
#include "../../../assets/Assets.hpp" #include "../../../assets/Assets.hpp"
#include "../../../content/Content.h" #include "../../../content/Content.hpp"
#include "../../../frontend/LevelFrontend.hpp" #include "../../../frontend/LevelFrontend.hpp"
#include "../../../items/Inventories.h" #include "../../../items/Inventories.hpp"
#include "../../../items/Inventory.h" #include "../../../items/Inventory.hpp"
#include "../../../items/ItemDef.h" #include "../../../items/ItemDef.hpp"
#include "../../../items/ItemStack.h" #include "../../../items/ItemStack.hpp"
#include "../../../logic/scripting/scripting.h" #include "../../../logic/scripting/scripting.hpp"
#include "../../../maths/voxmaths.h" #include "../../../maths/voxmaths.hpp"
#include "../../../objects/Player.h" #include "../../../objects/Player.hpp"
#include "../../../util/stringutil.hpp" #include "../../../util/stringutil.hpp"
#include "../../../voxels/Block.h" #include "../../../voxels/Block.hpp"
#include "../../../window/Events.hpp" #include "../../../window/Events.hpp"
#include "../../../window/input.hpp" #include "../../../window/input.hpp"
#include "../../../world/Level.h" #include "../../../world/Level.hpp"
#include "../../core/Atlas.hpp" #include "../../core/Atlas.hpp"
#include "../../core/Batch2D.hpp" #include "../../core/Batch2D.hpp"
#include "../../core/Font.hpp" #include "../../core/Font.hpp"

10
src/graphics/ui/elements/InventoryView.hpp
View File

@ -1,10 +1,10 @@
#ifndef FRONTEND_INVENTORY_VIEW_H_ #ifndef FRONTEND_INVENTORY_VIEW_HPP_
#define FRONTEND_INVENTORY_VIEW_H_ #define FRONTEND_INVENTORY_VIEW_HPP_
#include "UINode.hpp" #include "UINode.hpp"
#include "Container.hpp" #include "Container.hpp"
#include "../../../typedefs.h" #include "../../../typedefs.hpp"
#include "../../../constants.h" #include "../../../constants.hpp"
#include <vector> #include <vector>
#include <functional> #include <functional>
@ -137,4 +137,4 @@ namespace gui {
}; };
} }
#endif // FRONTEND_INVENTORY_VIEW_H_ #endif // FRONTEND_INVENTORY_VIEW_HPP_

2
src/graphics/ui/elements/Plotter.hpp
View File

@ -2,7 +2,7 @@
#define GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_ #define GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_
#include "UINode.hpp" #include "UINode.hpp"
#include "../../../typedefs.h" #include "../../../typedefs.hpp"
#include <memory> #include <memory>
#include <glm/glm.hpp> #include <glm/glm.hpp>

8
src/graphics/ui/elements/UINode.hpp
View File

@ -1,7 +1,7 @@
#ifndef GRAPHICS_UI_ELEMENTS_UINODE_H_ #ifndef GRAPHICS_UI_ELEMENTS_UINODE_HPP_
#define GRAPHICS_UI_ELEMENTS_UINODE_H_ #define GRAPHICS_UI_ELEMENTS_UINODE_HPP_
#include "../../../delegates.h" #include "../../../delegates.hpp"
#include "../../../window/input.hpp" #include "../../../window/input.hpp"
#include <glm/glm.hpp> #include <glm/glm.hpp>
@ -215,4 +215,4 @@ namespace gui {
}; };
} }
#endif // GRAPHICS_UI_ELEMENTS_UINODE_H_ #endif // GRAPHICS_UI_ELEMENTS_UINODE_HPP_

4
src/graphics/ui/gui_util.cpp
View File

@ -5,10 +5,10 @@
#include "elements/Button.hpp" #include "elements/Button.hpp"
#include "gui_xml.hpp" #include "gui_xml.hpp"
#include "../../logic/scripting/scripting.h" #include "../../logic/scripting/scripting.hpp"
#include "../../frontend/locale.hpp" #include "../../frontend/locale.hpp"
#include "../../util/stringutil.hpp" #include "../../util/stringutil.hpp"
#include "../../delegates.h" #include "../../delegates.hpp"
#include <glm/glm.hpp> #include <glm/glm.hpp>

4
src/graphics/ui/gui_util.hpp
View File

@ -4,8 +4,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "GUI.hpp" #include "GUI.hpp"
#include "../../typedefs.h" #include "../../typedefs.hpp"
#include "../../delegates.h" #include "../../delegates.hpp"
namespace gui { namespace gui {
class Button; class Button;

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

@ -12,9 +12,9 @@
#include "../../frontend/menu.hpp" #include "../../frontend/menu.hpp"
#include "../../frontend/locale.hpp" #include "../../frontend/locale.hpp"
#include "../../items/Inventory.h" #include "../../items/Inventory.hpp"
#include "../../logic/scripting/scripting.h" #include "../../logic/scripting/scripting.hpp"
#include "../../maths/voxmaths.h" #include "../../maths/voxmaths.hpp"
#include "../../util/stringutil.hpp" #include "../../util/stringutil.hpp"
#include "../../window/Events.hpp" #include "../../window/Events.hpp"

6
src/interfaces/Object.h → src/interfaces/Object.hpp
View File

@ -1,5 +1,5 @@
#ifndef OBJECT_H #ifndef OBJECT_HPP_
#define OBJECT_H #define OBJECT_HPP_
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
@ -23,4 +23,4 @@ public:
virtual void destroyed() { } virtual void destroyed() { }
}; };
#endif /* OBJECT_H */ #endif // OBJECT_HPP_

9
src/interfaces/Serializable.h → src/interfaces/Serializable.hpp
View File

@ -1,8 +1,9 @@
#ifndef SERIALIZABLE_H #ifndef SERIALIZABLE_HPP_
#define SERIALIZABLE_H #define SERIALIZABLE_HPP_
#include "../coders/json.hpp"
#include <memory> #include <memory>
#include "../coders/json.h"
class Serializable { class Serializable {
public: public:
@ -11,4 +12,4 @@ public:
virtual void deserialize(dynamic::Map* src) = 0; virtual void deserialize(dynamic::Map* src) = 0;
}; };
#endif /* SERIALIZABLE_H */ #endif // SERIALIZABLE_HPP_

2
src/interfaces/Task.hpp
View File

@ -1,7 +1,7 @@
#ifndef INTERFACES_TASK_HPP_ #ifndef INTERFACES_TASK_HPP_
#define INTERFACES_TASK_HPP_ #define INTERFACES_TASK_HPP_
#include "../typedefs.h" #include "../typedefs.hpp"
/// @brief Task is a finite process interface. /// @brief Task is a finite process interface.
/// 'work' is a metric of task progress/remaining work (jobs/bytes/something other) /// 'work' is a metric of task progress/remaining work (jobs/bytes/something other)

6
src/items/Inventories.cpp
View File

@ -1,9 +1,9 @@
#include "Inventories.h" #include "Inventories.hpp"
#include <algorithm> #include <algorithm>
#include "../world/Level.h" #include "../world/Level.hpp"
#include "../world/World.h" #include "../world/World.hpp"
Inventories::Inventories(Level& level) : level(level) { Inventories::Inventories(Level& level) : level(level) {
} }

10
src/items/Inventories.h → src/items/Inventories.hpp
View File

@ -1,12 +1,12 @@
#ifndef ITEMS_INVENTORIES_H_ #ifndef ITEMS_INVENTORIES_HPP_
#define ITEMS_INVENTORIES_H_ #define ITEMS_INVENTORIES_HPP_
#include <string> #include <string>
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include "Inventory.h" #include "Inventory.hpp"
#include "../maths/util.h" #include "../maths/util.hpp"
class Level; class Level;
@ -41,4 +41,4 @@ public:
const inventories_map& getMap() const; const inventories_map& getMap() const;
}; };
#endif // ITEMS_INVENTORIES_H_ #endif // ITEMS_INVENTORIES_HPP_

3
src/items/Inventory.cpp
View File

@ -1,5 +1,6 @@
#include "Inventory.h" #include "Inventory.hpp"
#include "../data/dynamic.hpp"
#include "../content/ContentLUT.hpp" #include "../content/ContentLUT.hpp"
Inventory::Inventory(int64_t id, size_t size) : id(id), slots(size) { Inventory::Inventory(int64_t id, size_t size) : id(id), slots(size) {

19
src/items/Inventory.h → src/items/Inventory.hpp
View File

@ -1,14 +1,17 @@
#ifndef ITEMS_INVENTORY_H_ #ifndef ITEMS_INVENTORY_HPP_
#define ITEMS_INVENTORY_H_ #define ITEMS_INVENTORY_HPP_
#include "ItemStack.hpp"
#include "../typedefs.hpp"
#include "../interfaces/Serializable.hpp"
#include <vector> #include <vector>
#include <memory> #include <memory>
#include "ItemStack.h" namespace dynamic {
class Map;
#include "../typedefs.h" }
#include "../data/dynamic.h"
#include "../interfaces/Serializable.h"
class ContentLUT; class ContentLUT;
class ContentIndices; class ContentIndices;
@ -57,4 +60,4 @@ public:
static const size_t npos; static const size_t npos;
}; };
#endif // ITEMS_INVENTORY_H_ #endif // ITEMS_INVENTORY_HPP_

2
src/items/ItemDef.cpp
View File

@ -1,4 +1,4 @@
#include "ItemDef.h" #include "ItemDef.hpp"
#include "../util/stringutil.hpp" #include "../util/stringutil.hpp"
ItemDef::ItemDef(std::string name) : name(name) { ItemDef::ItemDef(std::string name) : name(name) {

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