Skip to content

Commit

Permalink
Auto content packs detection
Browse files Browse the repository at this point in the history
  • Loading branch information
@MihailRis
MihailRis committed Dec 20, 2023
1 parent bcfdc55 commit 3ad9034
Show file tree
Hide file tree
Showing 8 changed files with 93 additions and 100 deletions.
2 changes: 1 addition & 1 deletion res/content/base/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "base",
"title": "Base",
"version": "0.15",
"version": "0.16",
"description": "basic content package"
}
16 changes: 12 additions & 4 deletions src/engine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@ using std::unique_ptr;
using std::shared_ptr;
using std::string;
using std::vector;
using std::filesystem::path;
using glm::vec3;
using gui::GUI;

namespace fs = std::filesystem;

Engine::Engine(EngineSettings& settings, EnginePaths* paths)
: settings(settings), paths(paths) {
if (Window::initialize(settings.display)){
Expand All @@ -53,7 +54,7 @@ Engine::Engine(EngineSettings& settings, EnginePaths* paths)
auto resdir = paths->getResources();

std::cout << "-- loading assets" << std::endl;
std::vector<path> roots {resdir};
std::vector<fs::path> roots {resdir};
resPaths.reset(new ResPaths(resdir, roots));
assets.reset(new Assets());
AssetsLoader loader(assets.get(), resPaths.get());
Expand Down Expand Up @@ -89,7 +90,7 @@ void Engine::updateHotkeys() {
if (Events::jpressed(keycode::F2)) {
unique_ptr<ImageData> image(Window::takeScreenshot());
image->flipY();
path filename = paths->getScreenshotFile("png");
fs::path filename = paths->getScreenshotFile("png");
png::write_image(filename.string(), image.get());
std::cout << "saved screenshot as " << filename << std::endl;
}
Expand Down Expand Up @@ -173,7 +174,7 @@ void Engine::loadContent() {
ContentBuilder contentBuilder;
setup_definitions(&contentBuilder);

vector<path> resRoots;
vector<fs::path> resRoots;
for (auto& pack : contentPacks) {
ContentLoader loader(&pack);
loader.load(&contentBuilder);
Expand All @@ -197,3 +198,10 @@ void Engine::loadContent() {
}
assets->extend(*new_assets.get());
}

void Engine::loadAllPacks() {
auto resdir = paths->getResources();
contentPacks.clear();
ContentPack::scan(resdir/fs::path("content"), contentPacks);
loadContent();
}
1 change: 1 addition & 0 deletions src/engine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class Engine {
std::vector<ContentPack>& getContentPacks();
void setLanguage(std::string locale);
void loadContent();
void loadAllPacks();
};

#endif // SRC_ENGINE_H_
80 changes: 45 additions & 35 deletions src/files/WorldFiles.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ using std::ios;
using std::string;
using std::unique_ptr;
using std::unordered_map;
using std::filesystem::path;
namespace fs = std::filesystem;

WorldRegion::WorldRegion() {
Expand Down Expand Up @@ -88,7 +87,7 @@ uint WorldRegion::getSize(uint x, uint z) {
return sizes[z * REGION_SIZE + x];
}

WorldFiles::WorldFiles(path directory, const DebugSettings& settings)
WorldFiles::WorldFiles(fs::path directory, const DebugSettings& settings)
: directory(directory),
generatorTestMode(settings.generatorTestMode),
doWriteLights(settings.doWriteLights) {
Expand Down Expand Up @@ -178,17 +177,17 @@ void WorldFiles::put(Chunk* chunk){
}
}

path WorldFiles::getRegionsFolder() const {
return directory/path("regions");
fs::path WorldFiles::getRegionsFolder() const {
return directory/fs::path("regions");
}

path WorldFiles::getLightsFolder() const {
return directory/path("lights");
fs::path WorldFiles::getLightsFolder() const {
return directory/fs::path("lights");
}

path WorldFiles::getRegionFilename(int x, int y) const {
fs::path WorldFiles::getRegionFilename(int x, int y) const {
string filename = std::to_string(x) + "_" + std::to_string(y) + ".bin";
return path(filename);
return fs::path(filename);
}

bool WorldFiles::parseRegionFilename(const string& name, int& x, int& y) {
Expand All @@ -206,16 +205,20 @@ bool WorldFiles::parseRegionFilename(const string& name, int& x, int& y) {
return true;
}

path WorldFiles::getPlayerFile() const {
return directory/path("player.json");
fs::path WorldFiles::getPlayerFile() const {
return directory/fs::path("player.json");
}

path WorldFiles::getWorldFile() const {
return directory/path("world.json");
fs::path WorldFiles::getWorldFile() const {
return directory/fs::path("world.json");
}

path WorldFiles::getIndicesFile() const {
return directory/path("indices.json");
fs::path WorldFiles::getIndicesFile() const {
return directory/fs::path("indices.json");
}

fs::path WorldFiles::getPacksFile() const {
return directory/fs::path("packs.list");
}

ubyte* WorldFiles::getChunk(int x, int z){
Expand All @@ -230,7 +233,7 @@ light_t* WorldFiles::getLights(int x, int z) {
}

ubyte* WorldFiles::getData(unordered_map<ivec2, WorldRegion*>& regions,
const path& folder,
const fs::path& folder,
int x, int z) {
int regionX = floordiv(x, REGION_SIZE);
int regionZ = floordiv(z, REGION_SIZE);
Expand All @@ -255,7 +258,7 @@ ubyte* WorldFiles::getData(unordered_map<ivec2, WorldRegion*>& regions,
return nullptr;
}

ubyte* WorldFiles::readChunkData(int x, int z, uint32_t& length, path filename){
ubyte* WorldFiles::readChunkData(int x, int z, uint32_t& length, fs::path filename){
if (generatorTestMode)
return nullptr;

Expand Down Expand Up @@ -293,7 +296,7 @@ ubyte* WorldFiles::readChunkData(int x, int z, uint32_t& length, path filename){
return data;
}

void WorldFiles::writeRegion(int x, int y, WorldRegion* entry, path filename){
void WorldFiles::writeRegion(int x, int y, WorldRegion* entry, fs::path filename){
ubyte** region = entry->getChunks();
uint32_t* sizes = entry->getSizes();
for (size_t i = 0; i < REGION_VOL; i++) {
Expand Down Expand Up @@ -336,7 +339,7 @@ void WorldFiles::writeRegion(int x, int y, WorldRegion* entry, path filename){
}

void WorldFiles::writeRegions(unordered_map<ivec2, WorldRegion*>& regions,
const path& folder) {
const fs::path& folder) {
for (auto it : regions){
WorldRegion* region = it.second;
if (region->getChunks() == nullptr || !region->isUnsaved())
Expand All @@ -347,25 +350,32 @@ void WorldFiles::writeRegions(unordered_map<ivec2, WorldRegion*>& regions,
}

void WorldFiles::write(const World* world, const Content* content) {
{
path directory = getRegionsFolder();
if (!fs::is_directory(directory)) {
fs::create_directories(directory);
}
}
{
path directory = getLightsFolder();
if (!fs::is_directory(directory)) {
fs::create_directories(directory);
}
}
if (world)
fs::path regionsFolder = getRegionsFolder();
fs::path lightsFolder = getLightsFolder();

fs::create_directories(regionsFolder);
fs::create_directories(lightsFolder);

if (world) {
writeWorldInfo(world);
writePacks(world);
}
if (generatorTestMode)
return;

writeIndices(content->indices);
writeRegions(regions, getRegionsFolder());
writeRegions(lights, getLightsFolder());
writeRegions(regions, regionsFolder);
writeRegions(lights, lightsFolder);
}

void WorldFiles::writePacks(const World* world) {
const auto& packs = world->getPacks();
std::stringstream ss;
ss << "# autogenerated; do not modify\n";
for (const auto& pack : packs) {
ss << pack.id << "\n";
}
files::write_string(getPacksFile(), ss.str());
}

void WorldFiles::writeIndices(const ContentIndices* indices) {
Expand Down Expand Up @@ -397,7 +407,7 @@ void WorldFiles::writeWorldInfo(const World* world) {
}

bool WorldFiles::readWorldInfo(World* world) {
path file = getWorldFile();
fs::path file = getWorldFile();
if (!fs::is_regular_file(file)) {
std::cerr << "warning: world.json does not exists" << std::endl;
return false;
Expand Down Expand Up @@ -443,7 +453,7 @@ void WorldFiles::writePlayer(Player* player){
}

bool WorldFiles::readPlayer(Player* player) {
path file = getPlayerFile();
fs::path file = getPlayerFile();
if (!fs::is_regular_file(file)) {
std::cerr << "warning: player.json does not exists" << std::endl;
return false;
Expand Down
2 changes: 2 additions & 0 deletions src/files/WorldFiles.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class WorldFiles {
std::filesystem::path getPlayerFile() const;
std::filesystem::path getWorldFile() const;
std::filesystem::path getIndicesFile() const;
std::filesystem::path getPacksFile() const;

WorldRegion* getRegion(std::unordered_map<glm::ivec2, WorldRegion*>& regions,
int x, int z);
Expand Down Expand Up @@ -114,6 +115,7 @@ class WorldFiles {
void writePlayer(Player* player);
/* @param world world info to save (nullable) */
void write(const World* world, const Content* content);
void writePacks(const World* world);
void writeIndices(const ContentIndices* indices);
};

Expand Down
59 changes: 7 additions & 52 deletions src/frontend/menu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,39 +66,6 @@ Button* create_button(std::wstring text,
return btn;
}

void show_content_select(GUI* gui, Engine* engine) {
PagesControl* menu = gui->getMenu();
Panel* panel = new Panel(vec2(200, 200), vec4(8.0f), 8.0f);

auto resdir = engine->getPaths()->getResources();
std::vector<ContentPack> allpacks;
ContentPack::scan(resdir / fs::path("content"), allpacks);

for (ContentPack& pack : allpacks) {
bool selected = false;
for (ContentPack& spack : engine->getContentPacks()) {
if (spack.id == pack.id) {
selected = true;
break;
}
}
Panel* checkpanel = new Panel(vec2(400, 32), vec4(5.0f), 1.0f);
checkpanel->color(vec4(0.0f));
checkpanel->orientation(Orientation::horizontal);

CheckBox* checkbox = new CheckBox(selected);
checkbox->margin(vec4(0.0f, 0.0f, 5.0f, 0.0f));

checkpanel->add(checkbox);
checkpanel->add(new Label(langs::get(util::str2wstr_utf8(pack.title), L"pack-title")));

panel->add(checkpanel);
}
panel->add(guiutil::backButton(menu));
menu->add("content-select", panel);
menu->set("content-select");
}

void show_content_missing(Engine* engine, const Content* content, ContentLUT* lut) {
auto* gui = engine->getGUI();
auto* menu = gui->getMenu();
Expand Down Expand Up @@ -214,7 +181,7 @@ void open_world(std::string name, Engine* engine) {
show_convert_request(engine, content, lut, folder);
}
} else {
Level* level = World::load(folder, settings, content);
Level* level = World::load(folder, settings, content, packs);
engine->setScreen(std::make_shared<LevelScreen>(engine, level));
}
}
Expand Down Expand Up @@ -249,8 +216,6 @@ void create_main_menu_panel(Engine* engine, PagesControl* menu) {
panel->add(guiutil::gotoButton(L"New World", "new-world", menu));
panel->add(create_worlds_panel(engine));
panel->add(guiutil::gotoButton(L"Settings", "settings", menu));
panel->add(guiutil::gotoButton(L"Content", "content", menu));

panel->add((new Button(langs::get(L"Quit", L"menu"), vec4(10.f)))
->listenAction([](GUI* gui) {
Window::setShouldClose(true);
Expand Down Expand Up @@ -295,11 +260,6 @@ void create_new_world_panel(Engine* engine, PagesControl* menu) {
panel->add(seedInput);
}

panel->add((new Button(langs::get(L"Content", L"menu"), vec4(10.0f)))
->listenAction([=](GUI* gui){
show_content_select(gui, engine);
}));

vec4 basecolor = worldNameInput->color();
panel->add(create_button( L"Create World", vec4(10), vec4(1, 20, 1, 1),
[=](GUI*) {
Expand Down Expand Up @@ -330,18 +290,13 @@ void create_new_world_panel(Engine* engine, PagesControl* menu) {
auto folder = paths->getWorldsFolder()/fs::u8path(nameutf8);
fs::create_directories(folder);

// TODO: complete and move somewhere
auto resdir = engine->getPaths()->getResources();
auto& packs = engine->getContentPacks();
packs.clear();
packs.push_back(ContentPack::read(resdir/fs::path("content/base")));
engine->loadContent();

engine->loadAllPacks();
Level* level = World::create(nameutf8,
folder,
seed,
engine->getSettings(),
engine->getContent());
folder,
seed,
engine->getSettings(),
engine->getContent(),
engine->getContentPacks());
engine->setScreen(std::make_shared<LevelScreen>(engine, level));
}));
panel->add(guiutil::backButton(menu));
Expand Down
18 changes: 13 additions & 5 deletions src/world/World.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ World::World(string name,
path directory,
uint64_t seed,
EngineSettings& settings,
const Content* content)
const Content* content,
const std::vector<ContentPack> packs)
: settings(settings),
content(content),
packs(packs),
name(name),
seed(seed) {
wfile = new WorldFiles(directory, settings.debug);
Expand Down Expand Up @@ -71,8 +73,9 @@ Level* World::create(string name,
path directory,
uint64_t seed,
EngineSettings& settings,
const Content* content) {
World* world = new World(name, directory, seed, settings, content);
const Content* content,
const std::vector<ContentPack>& packs) {
World* world = new World(name, directory, seed, settings, content, packs);
Player* player = new Player(vec3(0, DEF_PLAYER_Y, 0), DEF_PLAYER_SPEED);
return new Level(world, content, player, settings);
}
Expand All @@ -88,8 +91,9 @@ ContentLUT* World::checkIndices(const path& directory,

Level* World::load(path directory,
EngineSettings& settings,
const Content* content) {
unique_ptr<World> world (new World(".", directory, 0, settings, content));
const Content* content,
const std::vector<ContentPack>& packs) {
unique_ptr<World> world (new World(".", directory, 0, settings, content, packs));
auto& wfile = world->wfile;

if (!wfile->readWorldInfo(world.get())) {
Expand All @@ -103,3 +107,7 @@ Level* World::load(path directory,
world.release();
return level;
}

const std::vector<ContentPack>& World::getPacks() const {
return packs;
}
Loading

0 comments on commit 3ad9034

Please sign in to comment.