data/
This commit is contained in:
parent
b6adb72a35
commit
8f9c7eb7ff
@ -8,7 +8,7 @@
|
|||||||
#include <constants.hpp>
|
#include <constants.hpp>
|
||||||
#include <content/Content.hpp>
|
#include <content/Content.hpp>
|
||||||
#include <content/ContentPack.hpp>
|
#include <content/ContentPack.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <debug/Logger.hpp>
|
#include <debug/Logger.hpp>
|
||||||
#include <files/engine_paths.hpp>
|
#include <files/engine_paths.hpp>
|
||||||
#include <files/files.hpp>
|
#include <files/files.hpp>
|
||||||
|
|||||||
@ -11,7 +11,7 @@
|
|||||||
#include <coders/json.hpp>
|
#include <coders/json.hpp>
|
||||||
#include <coders/obj.hpp>
|
#include <coders/obj.hpp>
|
||||||
#include <constants.hpp>
|
#include <constants.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <files/engine_paths.hpp>
|
#include <files/engine_paths.hpp>
|
||||||
#include <files/files.hpp>
|
#include <files/files.hpp>
|
||||||
#include "../frontend/UiDocument.hpp"
|
#include "../frontend/UiDocument.hpp"
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include "byte_utils.hpp"
|
#include "byte_utils.hpp"
|
||||||
#include "gzip.hpp"
|
#include "gzip.hpp"
|
||||||
|
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "../data/dynamic_fwd.hpp"
|
#include <data/dynamic_fwd.hpp>
|
||||||
|
|
||||||
namespace dynamic {
|
namespace dynamic {
|
||||||
class Map;
|
class Map;
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <typedefs.hpp>
|
#include <typedefs.hpp>
|
||||||
|
|
||||||
inline int is_box(int c) {
|
inline int is_box(int c) {
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <util/stringutil.hpp>
|
#include <util/stringutil.hpp>
|
||||||
#include "commons.hpp"
|
#include "commons.hpp"
|
||||||
|
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <typedefs.hpp>
|
#include <typedefs.hpp>
|
||||||
#include "binary_json.hpp"
|
#include "binary_json.hpp"
|
||||||
|
|
||||||
|
|||||||
@ -6,8 +6,8 @@
|
|||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include "../data/setting.hpp"
|
#include <data/setting.hpp>
|
||||||
#include <files/settings_io.hpp>
|
#include <files/settings_io.hpp>
|
||||||
#include <util/stringutil.hpp>
|
#include <util/stringutil.hpp>
|
||||||
#include "commons.hpp"
|
#include "commons.hpp"
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
|
|
||||||
class SettingsHandler;
|
class SettingsHandler;
|
||||||
|
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "../data/dynamic_fwd.hpp"
|
#include <data/dynamic_fwd.hpp>
|
||||||
#include "content_fwd.hpp"
|
#include "content_fwd.hpp"
|
||||||
|
|
||||||
using DrawGroups = std::set<ubyte>;
|
using DrawGroups = std::set<ubyte>;
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include <constants.hpp>
|
#include <constants.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <typedefs.hpp>
|
#include <typedefs.hpp>
|
||||||
#include "Content.hpp"
|
#include "Content.hpp"
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
#include <coders/json.hpp>
|
#include <coders/json.hpp>
|
||||||
#include <core_defs.hpp>
|
#include <core_defs.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <debug/Logger.hpp>
|
#include <debug/Logger.hpp>
|
||||||
#include <files/files.hpp>
|
#include <files/files.hpp>
|
||||||
#include <items/ItemDef.hpp>
|
#include <items/ItemDef.hpp>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
#include <coders/json.hpp>
|
#include <coders/json.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <files/engine_paths.hpp>
|
#include <files/engine_paths.hpp>
|
||||||
#include <files/files.hpp>
|
#include <files/files.hpp>
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
#include <content/ContentLUT.hpp>
|
#include <content/ContentLUT.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <debug/Logger.hpp>
|
#include <debug/Logger.hpp>
|
||||||
#include <files/files.hpp>
|
#include <files/files.hpp>
|
||||||
#include <objects/Player.hpp>
|
#include <objects/Player.hpp>
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
#include <constants.hpp>
|
#include <constants.hpp>
|
||||||
#include <content/Content.hpp>
|
#include <content/Content.hpp>
|
||||||
#include <core_defs.hpp>
|
#include <core_defs.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <debug/Logger.hpp>
|
#include <debug/Logger.hpp>
|
||||||
#include <items/Inventory.hpp>
|
#include <items/Inventory.hpp>
|
||||||
#include <items/ItemDef.hpp>
|
#include <items/ItemDef.hpp>
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
#include <coders/byte_utils.hpp>
|
#include <coders/byte_utils.hpp>
|
||||||
#include <coders/rle.hpp>
|
#include <coders/rle.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <items/Inventory.hpp>
|
#include <items/Inventory.hpp>
|
||||||
#include "../maths/voxmaths.hpp"
|
#include "../maths/voxmaths.hpp"
|
||||||
#include <util/data_io.hpp>
|
#include <util/data_io.hpp>
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
#include "../data/dynamic_fwd.hpp"
|
#include <data/dynamic_fwd.hpp>
|
||||||
#include <typedefs.hpp>
|
#include <typedefs.hpp>
|
||||||
#include <util/BufferPool.hpp>
|
#include <util/BufferPool.hpp>
|
||||||
#include <voxels/Chunk.hpp>
|
#include <voxels/Chunk.hpp>
|
||||||
|
|||||||
@ -11,7 +11,7 @@
|
|||||||
#include <coders/gzip.hpp>
|
#include <coders/gzip.hpp>
|
||||||
#include <coders/json.hpp>
|
#include <coders/json.hpp>
|
||||||
#include <coders/toml.hpp>
|
#include <coders/toml.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <util/stringutil.hpp>
|
#include <util/stringutil.hpp>
|
||||||
|
|
||||||
namespace fs = std::filesystem;
|
namespace fs = std::filesystem;
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
|
|
||||||
class Setting;
|
class Setting;
|
||||||
struct EngineSettings;
|
struct EngineSettings;
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
#include <content/ContentPack.hpp>
|
#include <content/ContentPack.hpp>
|
||||||
#include <files/files.hpp>
|
#include <files/files.hpp>
|
||||||
#include <util/stringutil.hpp>
|
#include <util/stringutil.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <debug/Logger.hpp>
|
#include <debug/Logger.hpp>
|
||||||
|
|
||||||
static debug::Logger logger("locale");
|
static debug::Logger logger("locale");
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
#include <delegates.hpp>
|
#include <delegates.hpp>
|
||||||
#include <engine.hpp>
|
#include <engine.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include "../interfaces/Task.hpp"
|
#include "../interfaces/Task.hpp"
|
||||||
#include <files/engine_paths.hpp>
|
#include <files/engine_paths.hpp>
|
||||||
#include <graphics/ui/elements/Menu.hpp>
|
#include <graphics/ui/elements/Menu.hpp>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#ifndef FRONTEND_MENU_MENU_HPP_
|
#ifndef FRONTEND_MENU_MENU_HPP_
|
||||||
#define FRONTEND_MENU_MENU_HPP_
|
#define FRONTEND_MENU_MENU_HPP_
|
||||||
|
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <graphics/ui/elements/Menu.hpp>
|
#include <graphics/ui/elements/Menu.hpp>
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
#define GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
|
#define GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
|
||||||
|
|
||||||
#include "UINode.hpp"
|
#include "UINode.hpp"
|
||||||
#include "../../../data/dynamic_fwd.hpp"
|
#include <data/dynamic_fwd.hpp>
|
||||||
|
|
||||||
namespace gui {
|
namespace gui {
|
||||||
class TrackBar : public UINode {
|
class TrackBar : public UINode {
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#include "Inventory.hpp"
|
#include "Inventory.hpp"
|
||||||
|
|
||||||
#include <content/ContentLUT.hpp>
|
#include <content/ContentLUT.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.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) {
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
|
|
||||||
namespace cmd {
|
namespace cmd {
|
||||||
enum class ArgType { number, integer, enumvalue, selector, string };
|
enum class ArgType { number, integer, enumvalue, selector, string };
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#include <coders/json.hpp>
|
#include <coders/json.hpp>
|
||||||
#include "../../../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include "api_lua.hpp"
|
#include "api_lua.hpp"
|
||||||
|
|
||||||
static int l_json_stringify(lua::State* L) {
|
static int l_json_stringify(lua::State* L) {
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#include <coders/toml.hpp>
|
#include <coders/toml.hpp>
|
||||||
#include "../../../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include "api_lua.hpp"
|
#include "api_lua.hpp"
|
||||||
|
|
||||||
using namespace scripting;
|
using namespace scripting;
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "../../../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <delegates.hpp>
|
#include <delegates.hpp>
|
||||||
#include "../scripting_functional.hpp"
|
#include "../scripting_functional.hpp"
|
||||||
#include "lua_util.hpp"
|
#include "lua_util.hpp"
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "../../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <delegates.hpp>
|
#include <delegates.hpp>
|
||||||
#include <typedefs.hpp>
|
#include <typedefs.hpp>
|
||||||
#include "scripting_functional.hpp"
|
#include "scripting_functional.hpp"
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "../../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include <delegates.hpp>
|
#include <delegates.hpp>
|
||||||
#include <typedefs.hpp>
|
#include <typedefs.hpp>
|
||||||
|
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
#include <assets/Assets.hpp>
|
#include <assets/Assets.hpp>
|
||||||
#include <content/Content.hpp>
|
#include <content/Content.hpp>
|
||||||
#include "../data/dynamic_util.hpp"
|
#include <data/dynamic_util.hpp>
|
||||||
#include <debug/Logger.hpp>
|
#include <debug/Logger.hpp>
|
||||||
#include <engine.hpp>
|
#include <engine.hpp>
|
||||||
#include <graphics/core/DrawContext.hpp>
|
#include <graphics/core/DrawContext.hpp>
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
#include <optional>
|
#include <optional>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include "../physics/Hitbox.hpp"
|
#include "../physics/Hitbox.hpp"
|
||||||
#include <typedefs.hpp>
|
#include <typedefs.hpp>
|
||||||
#include <util/Clock.hpp>
|
#include <util/Clock.hpp>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include "../interfaces/Object.hpp"
|
#include "../interfaces/Object.hpp"
|
||||||
#include "../interfaces/Serializable.hpp"
|
#include "../interfaces/Serializable.hpp"
|
||||||
#include <settings.hpp>
|
#include <settings.hpp>
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include <assets/Assets.hpp>
|
#include <assets/Assets.hpp>
|
||||||
#include <coders/json.hpp>
|
#include <coders/json.hpp>
|
||||||
#include "../data/dynamic_util.hpp"
|
#include <data/dynamic_util.hpp>
|
||||||
#include <graphics/core/Model.hpp>
|
#include <graphics/core/Model.hpp>
|
||||||
#include <graphics/render/ModelBatch.hpp>
|
#include <graphics/render/ModelBatch.hpp>
|
||||||
|
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
#include "data/setting.hpp"
|
#include <data/setting.hpp>
|
||||||
#include <constants.hpp>
|
#include <constants.hpp>
|
||||||
#include <typedefs.hpp>
|
#include <typedefs.hpp>
|
||||||
|
|
||||||
|
|||||||
@ -167,7 +167,7 @@ void Events::setPosition(float xpos, float ypos) {
|
|||||||
|
|
||||||
#include <coders/json.hpp>
|
#include <coders/json.hpp>
|
||||||
#include <coders/toml.hpp>
|
#include <coders/toml.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
|
|
||||||
std::string Events::writeBindings() {
|
std::string Events::writeBindings() {
|
||||||
dynamic::Map obj;
|
dynamic::Map obj;
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#include "Level.hpp"
|
#include "Level.hpp"
|
||||||
|
|
||||||
#include <content/Content.hpp>
|
#include <content/Content.hpp>
|
||||||
#include "../data/dynamic_util.hpp"
|
#include <data/dynamic_util.hpp>
|
||||||
#include <items/Inventories.hpp>
|
#include <items/Inventories.hpp>
|
||||||
#include <items/Inventory.hpp>
|
#include <items/Inventory.hpp>
|
||||||
#include "../lighting/Lighting.hpp"
|
#include "../lighting/Lighting.hpp"
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include <content/ContentPack.hpp>
|
#include <content/ContentPack.hpp>
|
||||||
#include "../data/dynamic.hpp"
|
#include <data/dynamic.hpp>
|
||||||
#include "../interfaces/Serializable.hpp"
|
#include "../interfaces/Serializable.hpp"
|
||||||
#include <typedefs.hpp>
|
#include <typedefs.hpp>
|
||||||
#include <util/timeutil.hpp>
|
#include <util/timeutil.hpp>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user