More world generators support

This commit is contained in:
Onran
2024-02-21 11:54:10 +09:00
committed by GitHub
parent 399bd9c362
commit 9cc2f93cfd
9 changed files with 209 additions and 30 deletions
+35 -2
View File
@@ -19,6 +19,7 @@
#include "../files/WorldConverter.h"
#include "../files/WorldFiles.h"
#include "../world/World.h"
#include "../world/WorldTypes.h"
#include "../world/Level.h"
#include "../window/Events.h"
#include "../window/Window.h"
@@ -38,6 +39,10 @@ using glm::vec4;
namespace fs = std::filesystem;
using namespace gui;
namespace menus {
std::string worldType;
}
inline uint64_t randU64() {
srand(time(NULL));
return rand() ^ (rand() << 8) ^
@@ -168,6 +173,28 @@ void create_languages_panel(Engine* engine) {
panel->add(guiutil::backButton(menu));
}
void create_world_types_panel(Engine* engine) {
auto menu = engine->getGUI()->getMenu();
auto panel = create_page(engine, "world_types", 400, 0.5f, 1);
panel->setScrollable(true);
std::vector<std::string> worldTypes = WorldTypes::getWorldTypes();
std::sort(worldTypes.begin(), worldTypes.end());
for (std::string& type : worldTypes) {
std::string& fullName = util::wstr2str_utf8(langs::get(util::str2wstr_utf8(type), L"world.types"));
auto button = std::make_shared<Button>(
util::str2wstr_utf8(fullName),
vec4(10.f),
[=](GUI*) {
menus::worldType = type;
menu->back();
}
);
panel->add(button);
}
panel->add(guiutil::backButton(menu));
}
void open_world(std::string name, Engine* engine) {
auto paths = engine->getPaths();
auto folder = paths->getWorldsFolder()/fs::u8path(name);
@@ -414,6 +441,8 @@ void create_new_world_panel(Engine* engine) {
auto seedInput = std::make_shared<TextBox>(seedstr, vec4(6.0f));
panel->add(seedInput);
panel->add(guiutil::gotoButton(langs::get(L"World type", L"world"), "world_types", engine->getGUI()->getMenu()));
panel->add(create_button( L"Create World", vec4(10), vec4(1, 20, 1, 1),
[=](GUI*) {
if (!nameInput->validate())
@@ -450,11 +479,12 @@ void create_new_world_panel(Engine* engine) {
}
Level* level = World::create(
name, folder, seed,
name, menus::worldType, folder, seed,
engine->getSettings(),
engine->getContent(),
engine->getContentPacks()
);
menus::worldType = WorldTypes::getDefaultWorldType();
engine->setScreen(std::make_shared<LevelScreen>(engine, level));
}));
panel->add(guiutil::backButton(engine->getGUI()->getMenu()));
@@ -641,15 +671,18 @@ void create_pause_panel(Engine* engine) {
}
void menus::create_menus(Engine* engine) {
menus::worldType = WorldTypes::getDefaultWorldType();
create_new_world_panel(engine);
create_settings_panel(engine);
create_controls_panel(engine);
create_pause_panel(engine);
create_languages_panel(engine);
create_world_types_panel(engine);
create_main_menu_panel(engine);
}
void menus::refresh_menus(Engine* engine) {
create_main_menu_panel(engine);
create_new_world_panel(engine);
}
create_world_types_panel(engine);
}