update project includes format
This commit is contained in:
parent
6c4fb417c5
commit
f43cc93cd2
@ -11,7 +11,7 @@
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include <graphics/core/TextureAnimation.hpp>
|
||||
#include "graphics/core/TextureAnimation.hpp"
|
||||
|
||||
class Assets;
|
||||
|
||||
|
||||
@ -4,19 +4,19 @@
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
|
||||
#include <coders/imageio.hpp>
|
||||
#include <constants.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <content/ContentPack.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include <files/engine_paths.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <graphics/core/Texture.hpp>
|
||||
#include <logic/scripting/scripting.hpp>
|
||||
#include <objects/rigging.hpp>
|
||||
#include <util/ThreadPool.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include "coders/imageio.hpp"
|
||||
#include "constants.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "content/ContentPack.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "files/engine_paths.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "graphics/core/Texture.hpp"
|
||||
#include "logic/scripting/scripting.hpp"
|
||||
#include "objects/rigging.hpp"
|
||||
#include "util/ThreadPool.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "Assets.hpp"
|
||||
#include "assetload_funcs.hpp"
|
||||
|
||||
|
||||
@ -9,9 +9,9 @@
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
#include <delegates.hpp>
|
||||
#include <interfaces/Task.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include "delegates.hpp"
|
||||
#include "interfaces/Task.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "Assets.hpp"
|
||||
|
||||
namespace dynamic {
|
||||
|
||||
@ -4,25 +4,25 @@
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
|
||||
#include <audio/audio.hpp>
|
||||
#include <coders/GLSLExtension.hpp>
|
||||
#include <coders/commons.hpp>
|
||||
#include <coders/imageio.hpp>
|
||||
#include <coders/json.hpp>
|
||||
#include <coders/obj.hpp>
|
||||
#include <constants.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <files/engine_paths.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <frontend/UiDocument.hpp>
|
||||
#include <graphics/core/Atlas.hpp>
|
||||
#include <graphics/core/Font.hpp>
|
||||
#include <graphics/core/ImageData.hpp>
|
||||
#include <graphics/core/Model.hpp>
|
||||
#include <graphics/core/Shader.hpp>
|
||||
#include <graphics/core/Texture.hpp>
|
||||
#include <graphics/core/TextureAnimation.hpp>
|
||||
#include <objects/rigging.hpp>
|
||||
#include "audio/audio.hpp"
|
||||
#include "coders/GLSLExtension.hpp"
|
||||
#include "coders/commons.hpp"
|
||||
#include "coders/imageio.hpp"
|
||||
#include "coders/json.hpp"
|
||||
#include "coders/obj.hpp"
|
||||
#include "constants.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "files/engine_paths.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "frontend/UiDocument.hpp"
|
||||
#include "graphics/core/Atlas.hpp"
|
||||
#include "graphics/core/Font.hpp"
|
||||
#include "graphics/core/ImageData.hpp"
|
||||
#include "graphics/core/Model.hpp"
|
||||
#include "graphics/core/Shader.hpp"
|
||||
#include "graphics/core/Texture.hpp"
|
||||
#include "graphics/core/TextureAnimation.hpp"
|
||||
#include "objects/rigging.hpp"
|
||||
#include "Assets.hpp"
|
||||
#include "AssetsLoader.hpp"
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
#include <debug/Logger.hpp>
|
||||
#include "debug/Logger.hpp"
|
||||
#include "alutil.hpp"
|
||||
|
||||
static debug::Logger logger("al-audio");
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include <audio/audio.hpp>
|
||||
#include "typedefs.hpp"
|
||||
#include "audio/audio.hpp"
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <OpenAL/al.h>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
#include <memory>
|
||||
#include <type_traits>
|
||||
|
||||
#include <debug/Logger.hpp>
|
||||
#include "debug/Logger.hpp"
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <OpenAL/al.h>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
#include <string>
|
||||
#include <type_traits>
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <OpenAL/al.h>
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
#include <stdexcept>
|
||||
#include <utility>
|
||||
|
||||
#include <coders/ogg.hpp>
|
||||
#include <coders/wav.hpp>
|
||||
#include "coders/ogg.hpp"
|
||||
#include "coders/wav.hpp"
|
||||
#include "AL/ALAudio.hpp"
|
||||
#include "NoAudio.hpp"
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
#include <stdexcept>
|
||||
#include <utility>
|
||||
|
||||
#include <files/engine_paths.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include "files/engine_paths.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
#include <data/dynamic.hpp>
|
||||
#include "data/dynamic.hpp"
|
||||
#include "byte_utils.hpp"
|
||||
#include "gzip.hpp"
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <data/dynamic_fwd.hpp>
|
||||
#include "data/dynamic_fwd.hpp"
|
||||
|
||||
namespace dynamic {
|
||||
class Map;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
/* byteorder: little-endian */
|
||||
class ByteBuilder {
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
#include <sstream>
|
||||
#include <stdexcept>
|
||||
|
||||
#include <util/stringutil.hpp>
|
||||
#include "util/stringutil.hpp"
|
||||
|
||||
inline double power(double base, int64_t power) {
|
||||
double result = 1.0;
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
|
||||
#include <data/dynamic.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include "data/dynamic.hpp"
|
||||
#include "typedefs.hpp"
|
||||
|
||||
inline int is_box(int c) {
|
||||
switch (c) {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
namespace gzip {
|
||||
const unsigned char MAGIC[] = "\x1F\x8B";
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#include <functional>
|
||||
#include <unordered_map>
|
||||
|
||||
#include <graphics/core/ImageData.hpp>
|
||||
#include "graphics/core/ImageData.hpp"
|
||||
#include "png.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
#include <memory>
|
||||
#include <sstream>
|
||||
|
||||
#include <data/dynamic.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include "data/dynamic.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "commons.hpp"
|
||||
|
||||
using namespace json;
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include <data/dynamic.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include "data/dynamic.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "binary_json.hpp"
|
||||
|
||||
namespace json {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#include "obj.hpp"
|
||||
|
||||
#include <graphics/core/Model.hpp>
|
||||
#include "graphics/core/Model.hpp"
|
||||
#include "commons.hpp"
|
||||
|
||||
using namespace model;
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include <audio/audio.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include "audio/audio.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "typedefs.hpp"
|
||||
|
||||
static debug::Logger logger("ogg");
|
||||
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include <debug/Logger.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <graphics/core/GLTexture.hpp>
|
||||
#include <graphics/core/ImageData.hpp>
|
||||
#include "debug/Logger.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "graphics/core/GLTexture.hpp"
|
||||
#include "graphics/core/ImageData.hpp"
|
||||
|
||||
static debug::Logger logger("png-coder");
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef CODERS_RLE_HPP_
|
||||
#define CODERS_RLE_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
namespace rle {
|
||||
size_t encode(const ubyte* src, size_t length, ubyte* dst);
|
||||
|
||||
@ -6,10 +6,10 @@
|
||||
#include <iomanip>
|
||||
#include <sstream>
|
||||
|
||||
#include <data/dynamic.hpp>
|
||||
#include <data/setting.hpp>
|
||||
#include <files/settings_io.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include "data/dynamic.hpp"
|
||||
#include "data/setting.hpp"
|
||||
#include "files/settings_io.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "commons.hpp"
|
||||
|
||||
using namespace toml;
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include <data/dynamic.hpp>
|
||||
#include "data/dynamic.hpp"
|
||||
|
||||
class SettingsHandler;
|
||||
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <audio/audio.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include "audio/audio.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
#include <stdexcept>
|
||||
#include <utility>
|
||||
|
||||
#include <util/stringutil.hpp>
|
||||
#include "util/stringutil.hpp"
|
||||
|
||||
using namespace xml;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef CONSTANTS_HPP_
|
||||
#define CONSTANTS_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
#include <limits>
|
||||
#include <string>
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
#include <stdexcept>
|
||||
#include <utility>
|
||||
|
||||
#include <items/ItemDef.hpp>
|
||||
#include <logic/scripting/scripting.hpp>
|
||||
#include <objects/EntityDef.hpp>
|
||||
#include <objects/rigging.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include "items/ItemDef.hpp"
|
||||
#include "logic/scripting/scripting.hpp"
|
||||
#include "objects/EntityDef.hpp"
|
||||
#include "objects/rigging.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "ContentPack.hpp"
|
||||
|
||||
ContentIndices::ContentIndices(
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include <data/dynamic_fwd.hpp>
|
||||
#include "data/dynamic_fwd.hpp"
|
||||
#include "content_fwd.hpp"
|
||||
|
||||
using DrawGroups = std::set<ubyte>;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#include "ContentBuilder.hpp"
|
||||
|
||||
#include <objects/rigging.hpp>
|
||||
#include "objects/rigging.hpp"
|
||||
|
||||
ContentBuilder::~ContentBuilder() = default;
|
||||
|
||||
|
||||
@ -7,9 +7,9 @@
|
||||
|
||||
#include "Content.hpp"
|
||||
#include "ContentPack.hpp"
|
||||
#include <items/ItemDef.hpp>
|
||||
#include <objects/EntityDef.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include "items/ItemDef.hpp"
|
||||
#include "objects/EntityDef.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
|
||||
template <class T>
|
||||
class ContentUnitBuilder {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include <coders/json.hpp>
|
||||
#include <constants.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <items/ItemDef.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include "coders/json.hpp"
|
||||
#include "constants.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "items/ItemDef.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "Content.hpp"
|
||||
|
||||
ContentLUT::ContentLUT(
|
||||
|
||||
@ -6,9 +6,9 @@
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include <constants.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include "constants.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "Content.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
@ -6,18 +6,18 @@
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
#include <coders/json.hpp>
|
||||
#include <core_defs.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <items/ItemDef.hpp>
|
||||
#include <logic/scripting/scripting.hpp>
|
||||
#include <objects/rigging.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include <util/listutil.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include "coders/json.hpp"
|
||||
#include "core_defs.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "items/ItemDef.hpp"
|
||||
#include "logic/scripting/scripting.hpp"
|
||||
#include "objects/rigging.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "util/listutil.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "Content.hpp"
|
||||
#include "ContentBuilder.hpp"
|
||||
#include "ContentPack.hpp"
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
#include <iostream>
|
||||
#include <utility>
|
||||
|
||||
#include <coders/json.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <files/engine_paths.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include "coders/json.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "files/engine_paths.hpp"
|
||||
#include "files/files.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
class EnginePaths;
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
#include <queue>
|
||||
#include <sstream>
|
||||
|
||||
#include <util/listutil.hpp>
|
||||
#include "util/listutil.hpp"
|
||||
|
||||
PacksManager::PacksManager() = default;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef CONTENT_CONTENT_FWD_HPP_
|
||||
#define CONTENT_CONTENT_FWD_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
class Content;
|
||||
class ContentPackRuntime;
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
#include "core_defs.hpp"
|
||||
|
||||
#include <items/ItemDef.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <content/ContentBuilder.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <files/engine_paths.hpp>
|
||||
#include <window/Window.hpp>
|
||||
#include <window/Events.hpp>
|
||||
#include <window/input.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include "items/ItemDef.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "content/ContentBuilder.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "files/engine_paths.hpp"
|
||||
#include "window/Window.hpp"
|
||||
#include "window/Events.hpp"
|
||||
#include "window/input.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
|
||||
// All in-game definitions (blocks, items, etc..)
|
||||
void corecontent::setup(EnginePaths* paths, ContentBuilder* builder) {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#include "dynamic.hpp"
|
||||
|
||||
#include <coders/json.hpp>
|
||||
#include "coders/json.hpp"
|
||||
|
||||
using namespace dynamic;
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#include <string>
|
||||
#include <variant>
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
namespace dynamic {
|
||||
class Map;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#include "setting.hpp"
|
||||
|
||||
#include <util/stringutil.hpp>
|
||||
#include "util/stringutil.hpp"
|
||||
|
||||
std::string NumberSetting::toString() const {
|
||||
switch (getFormat()) {
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include <delegates.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include "delegates.hpp"
|
||||
#include "typedefs.hpp"
|
||||
|
||||
enum class setting_format { simple, percent };
|
||||
|
||||
|
||||
@ -2,42 +2,42 @@
|
||||
|
||||
#define GLEW_STATIC
|
||||
|
||||
#include <debug/Logger.hpp>
|
||||
#include <assets/AssetsLoader.hpp>
|
||||
#include <audio/audio.hpp>
|
||||
#include <coders/GLSLExtension.hpp>
|
||||
#include <coders/imageio.hpp>
|
||||
#include <coders/json.hpp>
|
||||
#include <coders/toml.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <content/ContentBuilder.hpp>
|
||||
#include <content/ContentLoader.hpp>
|
||||
#include <core_defs.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <files/settings_io.hpp>
|
||||
#include <frontend/locale.hpp>
|
||||
#include <frontend/menu.hpp>
|
||||
#include <frontend/screens/Screen.hpp>
|
||||
#include <frontend/screens/MenuScreen.hpp>
|
||||
#include <graphics/core/Batch2D.hpp>
|
||||
#include <graphics/core/DrawContext.hpp>
|
||||
#include <graphics/core/ImageData.hpp>
|
||||
#include <graphics/core/Shader.hpp>
|
||||
#include <graphics/ui/GUI.hpp>
|
||||
#include <objects/rigging.hpp>
|
||||
#include <logic/EngineController.hpp>
|
||||
#include <logic/CommandsInterpreter.hpp>
|
||||
#include <logic/scripting/scripting.hpp>
|
||||
#include <util/listutil.hpp>
|
||||
#include <util/platform.hpp>
|
||||
#include <voxels/DefaultWorldGenerator.hpp>
|
||||
#include <voxels/FlatWorldGenerator.hpp>
|
||||
#include <window/Camera.hpp>
|
||||
#include <window/Events.hpp>
|
||||
#include <window/input.hpp>
|
||||
#include <window/Window.hpp>
|
||||
#include <world/WorldGenerators.hpp>
|
||||
#include <settings.hpp>
|
||||
#include "debug/Logger.hpp"
|
||||
#include "assets/AssetsLoader.hpp"
|
||||
#include "audio/audio.hpp"
|
||||
#include "coders/GLSLExtension.hpp"
|
||||
#include "coders/imageio.hpp"
|
||||
#include "coders/json.hpp"
|
||||
#include "coders/toml.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "content/ContentBuilder.hpp"
|
||||
#include "content/ContentLoader.hpp"
|
||||
#include "core_defs.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "files/settings_io.hpp"
|
||||
#include "frontend/locale.hpp"
|
||||
#include "frontend/menu.hpp"
|
||||
#include "frontend/screens/Screen.hpp"
|
||||
#include "frontend/screens/MenuScreen.hpp"
|
||||
#include "graphics/core/Batch2D.hpp"
|
||||
#include "graphics/core/DrawContext.hpp"
|
||||
#include "graphics/core/ImageData.hpp"
|
||||
#include "graphics/core/Shader.hpp"
|
||||
#include "graphics/ui/GUI.hpp"
|
||||
#include "objects/rigging.hpp"
|
||||
#include "logic/EngineController.hpp"
|
||||
#include "logic/CommandsInterpreter.hpp"
|
||||
#include "logic/scripting/scripting.hpp"
|
||||
#include "util/listutil.hpp"
|
||||
#include "util/platform.hpp"
|
||||
#include "voxels/DefaultWorldGenerator.hpp"
|
||||
#include "voxels/FlatWorldGenerator.hpp"
|
||||
#include "window/Camera.hpp"
|
||||
#include "window/Events.hpp"
|
||||
#include "window/input.hpp"
|
||||
#include "window/Window.hpp"
|
||||
#include "world/WorldGenerators.hpp"
|
||||
#include "settings.hpp"
|
||||
|
||||
#include <iostream>
|
||||
#include <assert.h>
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
#ifndef ENGINE_HPP_
|
||||
#define ENGINE_HPP_
|
||||
|
||||
#include <delegates.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include "delegates.hpp"
|
||||
#include "typedefs.hpp"
|
||||
|
||||
#include <assets/Assets.hpp>
|
||||
#include <content/content_fwd.hpp>
|
||||
#include <content/ContentPack.hpp>
|
||||
#include <content/PacksManager.hpp>
|
||||
#include <files/engine_paths.hpp>
|
||||
#include <util/ObjectsKeeper.hpp>
|
||||
#include "assets/Assets.hpp"
|
||||
#include "content/content_fwd.hpp"
|
||||
#include "content/ContentPack.hpp"
|
||||
#include "content/PacksManager.hpp"
|
||||
#include "files/engine_paths.hpp"
|
||||
#include "util/ObjectsKeeper.hpp"
|
||||
|
||||
#include <filesystem>
|
||||
#include <memory>
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
#include <stdexcept>
|
||||
#include <utility>
|
||||
|
||||
#include <content/ContentLUT.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <objects/Player.hpp>
|
||||
#include <util/ThreadPool.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include "content/ContentLUT.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "objects/Player.hpp"
|
||||
#include "util/ThreadPool.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "WorldFiles.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
#include <memory>
|
||||
#include <queue>
|
||||
|
||||
#include <delegates.hpp>
|
||||
#include <interfaces/Task.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include "delegates.hpp"
|
||||
#include "interfaces/Task.hpp"
|
||||
#include "typedefs.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
@ -8,28 +8,28 @@
|
||||
#include <sstream>
|
||||
#include <utility>
|
||||
|
||||
#include <coders/byte_utils.hpp>
|
||||
#include <coders/json.hpp>
|
||||
#include <constants.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <core_defs.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include <items/Inventory.hpp>
|
||||
#include <items/ItemDef.hpp>
|
||||
#include <lighting/Lightmap.hpp>
|
||||
#include <maths/voxmaths.hpp>
|
||||
#include <objects/EntityDef.hpp>
|
||||
#include <objects/Player.hpp>
|
||||
#include <physics/Hitbox.hpp>
|
||||
#include <settings.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include <util/data_io.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include <voxels/voxel.hpp>
|
||||
#include <window/Camera.hpp>
|
||||
#include <world/World.hpp>
|
||||
#include "coders/byte_utils.hpp"
|
||||
#include "coders/json.hpp"
|
||||
#include "constants.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "core_defs.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "items/Inventory.hpp"
|
||||
#include "items/ItemDef.hpp"
|
||||
#include "lighting/Lightmap.hpp"
|
||||
#include "maths/voxmaths.hpp"
|
||||
#include "objects/EntityDef.hpp"
|
||||
#include "objects/Player.hpp"
|
||||
#include "physics/Hitbox.hpp"
|
||||
#include "settings.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "util/data_io.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "voxels/voxel.hpp"
|
||||
#include "window/Camera.hpp"
|
||||
#include "world/World.hpp"
|
||||
|
||||
#define WORLD_FORMAT_MAGIC ".VOXWLD"
|
||||
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <content/ContentPack.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include "content/ContentPack.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "WorldRegions.hpp"
|
||||
#include "files.hpp"
|
||||
#define GLM_ENABLE_EXPERIMENTAL
|
||||
#include "glm/gtx/hash.hpp"
|
||||
#include <glm/gtx/hash.hpp>
|
||||
|
||||
inline constexpr uint WORLD_FORMAT_VERSION = 1;
|
||||
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include <coders/byte_utils.hpp>
|
||||
#include <coders/rle.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <items/Inventory.hpp>
|
||||
#include <maths/voxmaths.hpp>
|
||||
#include <util/data_io.hpp>
|
||||
#include "coders/byte_utils.hpp"
|
||||
#include "coders/rle.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "items/Inventory.hpp"
|
||||
#include "maths/voxmaths.hpp"
|
||||
#include "util/data_io.hpp"
|
||||
|
||||
#define REGION_FORMAT_MAGIC ".VOXREG"
|
||||
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
#include <mutex>
|
||||
#include <unordered_map>
|
||||
|
||||
#include <data/dynamic_fwd.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include <util/BufferPool.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include "data/dynamic_fwd.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "util/BufferPool.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "files.hpp"
|
||||
#define GLM_ENABLE_EXPERIMENTAL
|
||||
#include "glm/gtx/hash.hpp"
|
||||
#include <glm/gtx/hash.hpp>
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
#include <filesystem>
|
||||
#include <sstream>
|
||||
#include <stack>
|
||||
#include <typedefs.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include "typedefs.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include <utility>
|
||||
|
||||
#include "WorldFiles.hpp"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <content/ContentPack.hpp>
|
||||
#include "content/ContentPack.hpp"
|
||||
|
||||
|
||||
class files_access_error : public std::runtime_error {
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
#include <memory>
|
||||
#include <stdexcept>
|
||||
|
||||
#include <coders/commons.hpp>
|
||||
#include <coders/gzip.hpp>
|
||||
#include <coders/json.hpp>
|
||||
#include <coders/toml.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include "coders/commons.hpp"
|
||||
#include "coders/gzip.hpp"
|
||||
#include "coders/json.hpp"
|
||||
#include "coders/toml.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
|
||||
#include <coders/json.hpp>
|
||||
#include <coders/toml.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include <settings.hpp>
|
||||
#include <window/Events.hpp>
|
||||
#include <window/input.hpp>
|
||||
#include "coders/json.hpp"
|
||||
#include "coders/toml.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "settings.hpp"
|
||||
#include "window/Events.hpp"
|
||||
#include "window/input.hpp"
|
||||
|
||||
static debug::Logger logger("settings_io");
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include <data/dynamic.hpp>
|
||||
#include "data/dynamic.hpp"
|
||||
|
||||
class Setting;
|
||||
struct EngineSettings;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
#include "UiDocument.hpp"
|
||||
|
||||
#include <assets/Assets.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <content/ContentPack.hpp>
|
||||
#include <core_defs.hpp>
|
||||
#include <graphics/core/Atlas.hpp>
|
||||
#include <maths/UVRegion.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include "assets/Assets.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "content/ContentPack.hpp"
|
||||
#include "core_defs.hpp"
|
||||
#include "graphics/core/Atlas.hpp"
|
||||
#include "maths/UVRegion.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef FRONTEND_BLOCKS_GFX_CACHE_HPP_
|
||||
#define FRONTEND_BLOCKS_GFX_CACHE_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
#include <memory>
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
#include "ContentGfxCache.hpp"
|
||||
|
||||
#include <assets/Assets.hpp>
|
||||
#include <audio/audio.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <graphics/core/Atlas.hpp>
|
||||
#include <graphics/render/BlocksPreview.hpp>
|
||||
#include <logic/LevelController.hpp>
|
||||
#include <logic/PlayerController.hpp>
|
||||
#include <objects/Player.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include <world/Level.hpp>
|
||||
#include "assets/Assets.hpp"
|
||||
#include "audio/audio.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "graphics/core/Atlas.hpp"
|
||||
#include "graphics/render/BlocksPreview.hpp"
|
||||
#include "logic/LevelController.hpp"
|
||||
#include "logic/PlayerController.hpp"
|
||||
#include "objects/Player.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "world/Level.hpp"
|
||||
|
||||
LevelFrontend::LevelFrontend(
|
||||
Player* currentPlayer, LevelController* controller, Assets* assets
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
#include <utility>
|
||||
|
||||
#include <files/files.hpp>
|
||||
#include <graphics/ui/elements/UINode.hpp>
|
||||
#include <graphics/ui/elements/InventoryView.hpp>
|
||||
#include <graphics/ui/gui_xml.hpp>
|
||||
#include <logic/scripting/scripting.hpp>
|
||||
#include "files/files.hpp"
|
||||
#include "graphics/ui/elements/UINode.hpp"
|
||||
#include "graphics/ui/elements/InventoryView.hpp"
|
||||
#include "graphics/ui/gui_xml.hpp"
|
||||
#include "logic/scripting/scripting.hpp"
|
||||
|
||||
UiDocument::UiDocument(
|
||||
std::string id,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef FRONTEND_UI_DOCUMENT_HPP_
|
||||
#define FRONTEND_UI_DOCUMENT_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <memory>
|
||||
|
||||
@ -1,25 +1,25 @@
|
||||
#include <audio/audio.hpp>
|
||||
#include <delegates.hpp>
|
||||
#include <engine.hpp>
|
||||
#include <settings.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <graphics/core/Mesh.hpp>
|
||||
#include <graphics/ui/elements/CheckBox.hpp>
|
||||
#include <graphics/ui/elements/TextBox.hpp>
|
||||
#include <graphics/ui/elements/TrackBar.hpp>
|
||||
#include <graphics/ui/elements/InputBindBox.hpp>
|
||||
#include <graphics/render/WorldRenderer.hpp>
|
||||
#include <logic/scripting/scripting.hpp>
|
||||
#include <objects/Player.hpp>
|
||||
#include <objects/Entities.hpp>
|
||||
#include <objects/EntityDef.hpp>
|
||||
#include <physics/Hitbox.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include <voxels/Chunks.hpp>
|
||||
#include <world/Level.hpp>
|
||||
#include <world/World.hpp>
|
||||
#include "audio/audio.hpp"
|
||||
#include "delegates.hpp"
|
||||
#include "engine.hpp"
|
||||
#include "settings.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "graphics/core/Mesh.hpp"
|
||||
#include "graphics/ui/elements/CheckBox.hpp"
|
||||
#include "graphics/ui/elements/TextBox.hpp"
|
||||
#include "graphics/ui/elements/TrackBar.hpp"
|
||||
#include "graphics/ui/elements/InputBindBox.hpp"
|
||||
#include "graphics/render/WorldRenderer.hpp"
|
||||
#include "logic/scripting/scripting.hpp"
|
||||
#include "objects/Player.hpp"
|
||||
#include "objects/Entities.hpp"
|
||||
#include "objects/EntityDef.hpp"
|
||||
#include "physics/Hitbox.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "voxels/Chunks.hpp"
|
||||
#include "world/Level.hpp"
|
||||
#include "world/World.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <memory>
|
||||
|
||||
@ -4,45 +4,45 @@
|
||||
#include "LevelFrontend.hpp"
|
||||
#include "UiDocument.hpp"
|
||||
|
||||
#include <assets/Assets.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <core_defs.hpp>
|
||||
#include <delegates.hpp>
|
||||
#include <engine.hpp>
|
||||
#include <graphics/core/Atlas.hpp>
|
||||
#include <graphics/core/Batch2D.hpp>
|
||||
#include <graphics/core/Batch3D.hpp>
|
||||
#include <graphics/core/DrawContext.hpp>
|
||||
#include <graphics/core/Font.hpp>
|
||||
#include <graphics/core/Mesh.hpp>
|
||||
#include <graphics/core/Shader.hpp>
|
||||
#include <graphics/core/Texture.hpp>
|
||||
#include <graphics/render/WorldRenderer.hpp>
|
||||
#include <graphics/ui/elements/InventoryView.hpp>
|
||||
#include <graphics/ui/elements/Menu.hpp>
|
||||
#include <graphics/ui/elements/Panel.hpp>
|
||||
#include <graphics/ui/elements/Plotter.hpp>
|
||||
#include <graphics/ui/elements/UINode.hpp>
|
||||
#include <graphics/ui/gui_util.hpp>
|
||||
#include <graphics/ui/GUI.hpp>
|
||||
#include <items/Inventories.hpp>
|
||||
#include <items/Inventory.hpp>
|
||||
#include <items/ItemDef.hpp>
|
||||
#include <logic/scripting/scripting.hpp>
|
||||
#include <maths/voxmaths.hpp>
|
||||
#include <objects/Player.hpp>
|
||||
#include <physics/Hitbox.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include <voxels/Chunks.hpp>
|
||||
#include <window/Camera.hpp>
|
||||
#include <window/Events.hpp>
|
||||
#include <window/input.hpp>
|
||||
#include <window/Window.hpp>
|
||||
#include <world/Level.hpp>
|
||||
#include <world/World.hpp>
|
||||
#include "assets/Assets.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "core_defs.hpp"
|
||||
#include "delegates.hpp"
|
||||
#include "engine.hpp"
|
||||
#include "graphics/core/Atlas.hpp"
|
||||
#include "graphics/core/Batch2D.hpp"
|
||||
#include "graphics/core/Batch3D.hpp"
|
||||
#include "graphics/core/DrawContext.hpp"
|
||||
#include "graphics/core/Font.hpp"
|
||||
#include "graphics/core/Mesh.hpp"
|
||||
#include "graphics/core/Shader.hpp"
|
||||
#include "graphics/core/Texture.hpp"
|
||||
#include "graphics/render/WorldRenderer.hpp"
|
||||
#include "graphics/ui/elements/InventoryView.hpp"
|
||||
#include "graphics/ui/elements/Menu.hpp"
|
||||
#include "graphics/ui/elements/Panel.hpp"
|
||||
#include "graphics/ui/elements/Plotter.hpp"
|
||||
#include "graphics/ui/elements/UINode.hpp"
|
||||
#include "graphics/ui/gui_util.hpp"
|
||||
#include "graphics/ui/GUI.hpp"
|
||||
#include "items/Inventories.hpp"
|
||||
#include "items/Inventory.hpp"
|
||||
#include "items/ItemDef.hpp"
|
||||
#include "logic/scripting/scripting.hpp"
|
||||
#include "maths/voxmaths.hpp"
|
||||
#include "objects/Player.hpp"
|
||||
#include "physics/Hitbox.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "voxels/Chunks.hpp"
|
||||
#include "window/Camera.hpp"
|
||||
#include "window/Events.hpp"
|
||||
#include "window/input.hpp"
|
||||
#include "window/Window.hpp"
|
||||
#include "world/Level.hpp"
|
||||
#include "world/World.hpp"
|
||||
|
||||
#include <assert.h>
|
||||
#include <memory>
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
#ifndef FRONTEND_HUD_HPP_
|
||||
#define FRONTEND_HUD_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include <util/ObjectsKeeper.hpp>
|
||||
#include "typedefs.hpp"
|
||||
#include "util/ObjectsKeeper.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <memory>
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
#include <utility>
|
||||
|
||||
#include <coders/json.hpp>
|
||||
#include <coders/commons.hpp>
|
||||
#include <content/ContentPack.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include "coders/json.hpp"
|
||||
#include "coders/commons.hpp"
|
||||
#include "content/ContentPack.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
|
||||
static debug::Logger logger("locale");
|
||||
|
||||
|
||||
@ -4,19 +4,19 @@
|
||||
#include "UiDocument.hpp"
|
||||
#include "screens/MenuScreen.hpp"
|
||||
|
||||
#include <delegates.hpp>
|
||||
#include <engine.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <interfaces/Task.hpp>
|
||||
#include <files/engine_paths.hpp>
|
||||
#include <graphics/ui/elements/Menu.hpp>
|
||||
#include <graphics/ui/gui_util.hpp>
|
||||
#include <graphics/ui/GUI.hpp>
|
||||
#include <logic/scripting/scripting.hpp>
|
||||
#include <settings.hpp>
|
||||
#include <coders/commons.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include <window/Window.hpp>
|
||||
#include "delegates.hpp"
|
||||
#include "engine.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "interfaces/Task.hpp"
|
||||
#include "files/engine_paths.hpp"
|
||||
#include "graphics/ui/elements/Menu.hpp"
|
||||
#include "graphics/ui/gui_util.hpp"
|
||||
#include "graphics/ui/GUI.hpp"
|
||||
#include "logic/scripting/scripting.hpp"
|
||||
#include "settings.hpp"
|
||||
#include "coders/commons.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "window/Window.hpp"
|
||||
|
||||
#include <filesystem>
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
#ifndef FRONTEND_MENU_MENU_HPP_
|
||||
#define FRONTEND_MENU_MENU_HPP_
|
||||
|
||||
#include <data/dynamic.hpp>
|
||||
#include <graphics/ui/elements/Menu.hpp>
|
||||
#include "data/dynamic.hpp"
|
||||
#include "graphics/ui/elements/Menu.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@ -1,31 +1,31 @@
|
||||
#include "LevelScreen.hpp"
|
||||
|
||||
#include <core_defs.hpp>
|
||||
#include <frontend/hud.hpp>
|
||||
#include <frontend/LevelFrontend.hpp>
|
||||
#include <audio/audio.hpp>
|
||||
#include <coders/imageio.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include <engine.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <graphics/core/DrawContext.hpp>
|
||||
#include <graphics/core/ImageData.hpp>
|
||||
#include <graphics/core/PostProcessing.hpp>
|
||||
#include <graphics/core/Viewport.hpp>
|
||||
#include <graphics/render/WorldRenderer.hpp>
|
||||
#include <graphics/ui/elements/Menu.hpp>
|
||||
#include <graphics/ui/GUI.hpp>
|
||||
#include <logic/LevelController.hpp>
|
||||
#include <logic/scripting/scripting_hud.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include <physics/Hitbox.hpp>
|
||||
#include <voxels/Chunks.hpp>
|
||||
#include <window/Camera.hpp>
|
||||
#include <window/Events.hpp>
|
||||
#include <window/Window.hpp>
|
||||
#include <world/Level.hpp>
|
||||
#include <world/World.hpp>
|
||||
#include "core_defs.hpp"
|
||||
#include "frontend/hud.hpp"
|
||||
#include "frontend/LevelFrontend.hpp"
|
||||
#include "audio/audio.hpp"
|
||||
#include "coders/imageio.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "engine.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "graphics/core/DrawContext.hpp"
|
||||
#include "graphics/core/ImageData.hpp"
|
||||
#include "graphics/core/PostProcessing.hpp"
|
||||
#include "graphics/core/Viewport.hpp"
|
||||
#include "graphics/render/WorldRenderer.hpp"
|
||||
#include "graphics/ui/elements/Menu.hpp"
|
||||
#include "graphics/ui/GUI.hpp"
|
||||
#include "logic/LevelController.hpp"
|
||||
#include "logic/scripting/scripting_hud.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "physics/Hitbox.hpp"
|
||||
#include "voxels/Chunks.hpp"
|
||||
#include "window/Camera.hpp"
|
||||
#include "window/Events.hpp"
|
||||
#include "window/Window.hpp"
|
||||
#include "world/Level.hpp"
|
||||
#include "world/World.hpp"
|
||||
|
||||
static debug::Logger logger("level-screen");
|
||||
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
#include "MenuScreen.hpp"
|
||||
|
||||
#include <graphics/ui/GUI.hpp>
|
||||
#include <graphics/ui/elements/Menu.hpp>
|
||||
#include <graphics/core/Batch2D.hpp>
|
||||
#include <graphics/core/Shader.hpp>
|
||||
#include <graphics/core/Texture.hpp>
|
||||
#include <maths/UVRegion.hpp>
|
||||
#include <window/Window.hpp>
|
||||
#include <window/Camera.hpp>
|
||||
#include <engine.hpp>
|
||||
#include "graphics/ui/GUI.hpp"
|
||||
#include "graphics/ui/elements/Menu.hpp"
|
||||
#include "graphics/core/Batch2D.hpp"
|
||||
#include "graphics/core/Shader.hpp"
|
||||
#include "graphics/core/Texture.hpp"
|
||||
#include "maths/UVRegion.hpp"
|
||||
#include "window/Window.hpp"
|
||||
#include "window/Camera.hpp"
|
||||
#include "engine.hpp"
|
||||
|
||||
MenuScreen::MenuScreen(Engine* engine) : Screen(engine) {
|
||||
engine->resetContent();
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#include "Screen.hpp"
|
||||
|
||||
#include <graphics/core/Batch2D.hpp>
|
||||
#include <engine.hpp>
|
||||
#include "graphics/core/Batch2D.hpp"
|
||||
#include "engine.hpp"
|
||||
|
||||
Screen::Screen(Engine* engine)
|
||||
: engine(engine),
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef FRONTEND_SCREENS_SCREEN_HPP_
|
||||
#define FRONTEND_SCREENS_SCREEN_HPP_
|
||||
|
||||
#include <util/ObjectsKeeper.hpp>
|
||||
#include "util/ObjectsKeeper.hpp"
|
||||
|
||||
class Engine;
|
||||
class Batch2D;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
#include "Texture.hpp"
|
||||
#include "ImageData.hpp"
|
||||
#include <maths/LMPacker.hpp>
|
||||
#include "maths/LMPacker.hpp"
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
#include <vector>
|
||||
#include <optional>
|
||||
#include <unordered_map>
|
||||
#include <maths/UVRegion.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include "maths/UVRegion.hpp"
|
||||
#include "typedefs.hpp"
|
||||
|
||||
class ImageData;
|
||||
class Texture;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#include "Mesh.hpp"
|
||||
#include "Texture.hpp"
|
||||
#include "gl_util.hpp"
|
||||
#include <maths/UVRegion.hpp>
|
||||
#include "maths/UVRegion.hpp"
|
||||
|
||||
#include <GL/glew.h>
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
#include "commons.hpp"
|
||||
#include <maths/UVRegion.hpp>
|
||||
#include "maths/UVRegion.hpp"
|
||||
|
||||
class Mesh;
|
||||
class Texture;
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
#include "Texture.hpp"
|
||||
|
||||
#include <GL/glew.h>
|
||||
#include <typedefs.hpp>
|
||||
#include <maths/UVRegion.hpp>
|
||||
#include "typedefs.hpp"
|
||||
#include "maths/UVRegion.hpp"
|
||||
|
||||
/// xyz, uv, rgba
|
||||
inline constexpr uint B3D_VERTEX_SIZE = 9;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef GRAPHICS_CORE_BATCH3D_HPP_
|
||||
#define GRAPHICS_CORE_BATCH3D_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
#include "commons.hpp"
|
||||
|
||||
#include <memory>
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
#include "Batch2D.hpp"
|
||||
#include "Framebuffer.hpp"
|
||||
#include <window/Window.hpp>
|
||||
#include "window/Window.hpp"
|
||||
|
||||
static void set_blend_mode(BlendMode mode) {
|
||||
switch (mode) {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
#include "commons.hpp"
|
||||
#include "Viewport.hpp"
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
class Batch2D;
|
||||
class Framebuffer;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
class Texture;
|
||||
class Batch2D;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef GRAPHICS_CORE_FRAMEBUFFER_HPP_
|
||||
#define GRAPHICS_CORE_FRAMEBUFFER_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
#include <memory>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef GRAPHICS_CORE_IMAGE_DATA_HPP_
|
||||
#define GRAPHICS_CORE_IMAGE_DATA_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
#include <memory>
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#define GRAPHICS_CORE_MESH_HPP_
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
struct vattr {
|
||||
ubyte size;
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
#include <GL/glew.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#include <coders/GLSLExtension.hpp>
|
||||
#include "coders/GLSLExtension.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef GRAPHICS_CORE_SHADER_HPP_
|
||||
#define GRAPHICS_CORE_SHADER_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <memory>
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
#ifndef GRAPHICS_CORE_TEXTURE_HPP_
|
||||
#define GRAPHICS_CORE_TEXTURE_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include <maths/UVRegion.hpp>
|
||||
#include "typedefs.hpp"
|
||||
#include "maths/UVRegion.hpp"
|
||||
#include "ImageData.hpp"
|
||||
|
||||
#include <memory>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
|
||||
#define GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
#include <vector>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
class Viewport {
|
||||
uint width;
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
#include "BlocksPreview.hpp"
|
||||
|
||||
#include <assets/Assets.hpp>
|
||||
#include <constants.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <frontend/ContentGfxCache.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include <window/Camera.hpp>
|
||||
#include <window/Window.hpp>
|
||||
#include <graphics/core/Atlas.hpp>
|
||||
#include <graphics/core/Batch3D.hpp>
|
||||
#include <graphics/core/Framebuffer.hpp>
|
||||
#include <graphics/core/DrawContext.hpp>
|
||||
#include <graphics/core/Shader.hpp>
|
||||
#include <graphics/core/Texture.hpp>
|
||||
#include <graphics/core/Viewport.hpp>
|
||||
#include "assets/Assets.hpp"
|
||||
#include "constants.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "frontend/ContentGfxCache.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "window/Camera.hpp"
|
||||
#include "window/Window.hpp"
|
||||
#include "graphics/core/Atlas.hpp"
|
||||
#include "graphics/core/Batch3D.hpp"
|
||||
#include "graphics/core/Framebuffer.hpp"
|
||||
#include "graphics/core/DrawContext.hpp"
|
||||
#include "graphics/core/Shader.hpp"
|
||||
#include "graphics/core/Texture.hpp"
|
||||
#include "graphics/core/Viewport.hpp"
|
||||
|
||||
#include <glm/ext.hpp>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
|
||||
#define GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
#include <memory>
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
#include "BlocksRenderer.hpp"
|
||||
|
||||
#include <graphics/core/Mesh.hpp>
|
||||
#include <maths/UVRegion.hpp>
|
||||
#include <constants.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include <voxels/VoxelsVolume.hpp>
|
||||
#include <voxels/ChunksStorage.hpp>
|
||||
#include <lighting/Lightmap.hpp>
|
||||
#include <frontend/ContentGfxCache.hpp>
|
||||
#include <settings.hpp>
|
||||
#include "graphics/core/Mesh.hpp"
|
||||
#include "maths/UVRegion.hpp"
|
||||
#include "constants.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "voxels/VoxelsVolume.hpp"
|
||||
#include "voxels/ChunksStorage.hpp"
|
||||
#include "lighting/Lightmap.hpp"
|
||||
#include "frontend/ContentGfxCache.hpp"
|
||||
#include "settings.hpp"
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
#include <vector>
|
||||
#include <memory>
|
||||
#include <glm/glm.hpp>
|
||||
#include <voxels/voxel.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include "voxels/voxel.hpp"
|
||||
#include "typedefs.hpp"
|
||||
|
||||
class Content;
|
||||
class Mesh;
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
#include "ChunksRenderer.hpp"
|
||||
#include "BlocksRenderer.hpp"
|
||||
#include <debug/Logger.hpp>
|
||||
#include <graphics/core/Mesh.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include <world/Level.hpp>
|
||||
#include <settings.hpp>
|
||||
#include "debug/Logger.hpp"
|
||||
#include "graphics/core/Mesh.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "world/Level.hpp"
|
||||
#include "settings.hpp"
|
||||
|
||||
#include <iostream>
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
@ -7,9 +7,9 @@
|
||||
#include <unordered_map>
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
#include <voxels/Block.hpp>
|
||||
#include <voxels/ChunksStorage.hpp>
|
||||
#include <util/ThreadPool.hpp>
|
||||
#include "voxels/Block.hpp"
|
||||
#include "voxels/ChunksStorage.hpp"
|
||||
#include "util/ThreadPool.hpp"
|
||||
|
||||
class Mesh;
|
||||
class Chunk;
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
#include "ModelBatch.hpp"
|
||||
|
||||
#include <graphics/core/Mesh.hpp>
|
||||
#include <graphics/core/Model.hpp>
|
||||
#include <graphics/core/Atlas.hpp>
|
||||
#include <graphics/core/Texture.hpp>
|
||||
#include <assets/Assets.hpp>
|
||||
#include <window/Window.hpp>
|
||||
#include <voxels/Chunks.hpp>
|
||||
#include <lighting/Lightmap.hpp>
|
||||
#include "graphics/core/Mesh.hpp"
|
||||
#include "graphics/core/Model.hpp"
|
||||
#include "graphics/core/Atlas.hpp"
|
||||
#include "graphics/core/Texture.hpp"
|
||||
#include "assets/Assets.hpp"
|
||||
#include "window/Window.hpp"
|
||||
#include "voxels/Chunks.hpp"
|
||||
#include "lighting/Lightmap.hpp"
|
||||
|
||||
#define GLM_ENABLE_EXPERIMENTAL
|
||||
#include <glm/ext/matrix_transform.hpp>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef GRAPHICS_RENDER_MODEL_BATCH_HPP_
|
||||
#define GRAPHICS_RENDER_MODEL_BATCH_HPP_
|
||||
|
||||
#include <maths/UVRegion.hpp>
|
||||
#include "maths/UVRegion.hpp"
|
||||
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
#include "Skybox.hpp"
|
||||
#include <assets/Assets.hpp>
|
||||
#include <graphics/core/Shader.hpp>
|
||||
#include <graphics/core/Mesh.hpp>
|
||||
#include <graphics/core/Batch3D.hpp>
|
||||
#include <graphics/core/Texture.hpp>
|
||||
#include <graphics/core/Cubemap.hpp>
|
||||
#include <graphics/core/Framebuffer.hpp>
|
||||
#include <graphics/core/DrawContext.hpp>
|
||||
#include <window/Window.hpp>
|
||||
#include <window/Camera.hpp>
|
||||
#include <maths/UVRegion.hpp>
|
||||
#include "assets/Assets.hpp"
|
||||
#include "graphics/core/Shader.hpp"
|
||||
#include "graphics/core/Mesh.hpp"
|
||||
#include "graphics/core/Batch3D.hpp"
|
||||
#include "graphics/core/Texture.hpp"
|
||||
#include "graphics/core/Cubemap.hpp"
|
||||
#include "graphics/core/Framebuffer.hpp"
|
||||
#include "graphics/core/DrawContext.hpp"
|
||||
#include "window/Window.hpp"
|
||||
#include "window/Camera.hpp"
|
||||
#include "maths/UVRegion.hpp"
|
||||
|
||||
#include <cmath>
|
||||
#include <iostream>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user