mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-06 19:41:51 +00:00
migrate from std::filesystem::path to io::path (WIP)
This commit is contained in:
parent
1e22882284
commit
e0314803c0
72 changed files with 1189 additions and 791 deletions
|
|
@ -1,14 +1,12 @@
|
|||
#pragma once
|
||||
|
||||
#include <filesystem>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
#include "io/io.hpp"
|
||||
#include "content_fwd.hpp"
|
||||
#include "data/dv.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
class Block;
|
||||
struct BlockMaterial;
|
||||
struct ItemDef;
|
||||
|
|
@ -43,15 +41,15 @@ class ContentLoader {
|
|||
GeneratorDef& def, const std::string& full, const std::string& name
|
||||
);
|
||||
|
||||
static void loadBlockMaterial(BlockMaterial& def, const fs::path& file);
|
||||
static void loadBlockMaterial(BlockMaterial& def, const io::path& file);
|
||||
void loadBlock(
|
||||
Block& def, const std::string& name, const fs::path& file
|
||||
Block& def, const std::string& name, const io::path& file
|
||||
);
|
||||
void loadItem(
|
||||
ItemDef& def, const std::string& name, const fs::path& file
|
||||
ItemDef& def, const std::string& name, const io::path& file
|
||||
);
|
||||
void loadEntity(
|
||||
EntityDef& def, const std::string& name, const fs::path& file
|
||||
EntityDef& def, const std::string& name, const io::path& file
|
||||
);
|
||||
void loadResources(ResourceType type, const dv::value& list);
|
||||
void loadResourceAliases(ResourceType type, const dv::value& aliases);
|
||||
|
|
@ -66,7 +64,7 @@ public:
|
|||
|
||||
// Refresh pack content.json
|
||||
static bool fixPackIndices(
|
||||
const fs::path& folder,
|
||||
const io::path& folder,
|
||||
dv::value& indicesRoot,
|
||||
const std::string& contentSection
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue