settings panel moved to xml (WIP)

src/frontend/menu/menu.cpp

@@ -211,12 +211,11 @@ void menus::delete_world(std::string name, Engine* engine) {
     L" ("+util::str2wstr_utf8(folder.u8string())+L")", [=]() {
         std::cout << "deleting " << folder.u8string() << std::endl;
         fs::remove_all(folder);
-        menus::refresh_menus(engine);
     });
 }
 
 void menus::create_menus(Engine* engine) {
-    create_settings_panel(engine);
+    // create_settings_panel(engine);
 
     auto menu = engine->getGUI()->getMenu();
     menu->setPageLoader([=](auto name) {
@@ -229,6 +228,3 @@ void menus::create_menus(Engine* engine) {
         return document->getRoot();
     });
 }
-
-void menus::refresh_menus(Engine* engine) {
-}

src/frontend/menu/menu.h

@@ -61,7 +61,6 @@ namespace menus {
     /// @brief Create development version label at the top-right screen corner
     void create_version_label(Engine* engine);
     void create_menus(Engine* engine);
-    void refresh_menus(Engine* engine);
 }
 
 #endif // FRONTEND_MENU_MENU_H_

src/frontend/menu/menu_pause.cpp

@@ -19,15 +19,6 @@
 
 using namespace gui;
 
-inline uint64_t randU64() {
-    srand(time(NULL));
-    return rand() ^ (rand() << 8) ^ 
-        (rand() << 16) ^ (rand() << 24) ^
-        ((uint64_t)rand() << 32) ^ 
-        ((uint64_t)rand() << 40) ^
-        ((uint64_t)rand() << 56);
-}
-
 inline uint64_t str2seed(const std::string& seedstr) {
     if (util::is_integer(seedstr)) {
         try {

src/frontend/menu/menu_settings.cpp

@@ -13,76 +13,9 @@
 using namespace gui;
 
 void menus::create_settings_panel(Engine* engine) {
-    //create_controls_panel(engine);
-
     auto menu = engine->getGUI()->getMenu();
     auto panel = menus::create_page(engine, "settings", 400, 0.0f, 1);
 
-    /* Load Distance setting track bar */{
-        panel->add(menus::create_label([=]() {
-            return langs::get(L"Load Distance", L"settings")+L": " + 
-                std::to_wstring(engine->getSettings().chunks.loadDistance);
-        }));
-
-        auto trackbar = std::make_shared<TrackBar>(3, 66, 10, 1, 3);
-        trackbar->setSupplier([=]() {
-            return engine->getSettings().chunks.loadDistance;
-        });
-        trackbar->setConsumer([=](double value) {
-            engine->getSettings().chunks.loadDistance = static_cast<uint>(value);
-        });
-        panel->add(trackbar);
-    }
-
-    /* Load Speed setting track bar */{
-        panel->add(menus::create_label([=]() {
-            return langs::get(L"Load Speed", L"settings")+L": " + 
-                std::to_wstring(engine->getSettings().chunks.loadSpeed);
-        }));
-
-        auto trackbar = std::make_shared<TrackBar>(1, 32, 10, 1, 1);
-        trackbar->setSupplier([=]() {
-            return engine->getSettings().chunks.loadSpeed;
-        });
-        trackbar->setConsumer([=](double value) {
-            engine->getSettings().chunks.loadSpeed = static_cast<uint>(value);
-        });
-        panel->add(trackbar);
-    }
-
-    /* Fog Curve setting track bar */{
-        panel->add(menus::create_label([=]() {
-            float value = engine->getSettings().graphics.fogCurve;
-            return langs::get(L"Fog Curve", L"settings")+L": " +
-                   util::to_wstring(value, 1);
-        }));
-
-        auto trackbar = std::make_shared<TrackBar>(1.0, 6.0, 1.0, 0.1, 2);
-        trackbar->setSupplier([=]() {
-            return engine->getSettings().graphics.fogCurve;
-        });
-        trackbar->setConsumer([=](double value) {
-            engine->getSettings().graphics.fogCurve = value;
-        });
-        panel->add(trackbar);
-    }
-
-    /* Fov setting track bar */{
-        panel->add(menus::create_label([=]() {
-            int fov = (int)engine->getSettings().camera.fov;
-            return langs::get(L"FOV", L"settings")+L": "+std::to_wstring(fov)+L"°";
-        }));
-
-        auto trackbar = std::make_shared<TrackBar>(30.0, 120.0, 90, 1, 4);
-        trackbar->setSupplier([=]() {
-            return engine->getSettings().camera.fov;
-        });
-        trackbar->setConsumer([=](double value) {
-            engine->getSettings().camera.fov = value;
-        });
-        panel->add(trackbar);
-    }
-
     /* V-Sync checkbox */{
         auto checkbox = std::make_shared<FullCheckBox>(
             langs::get(L"V-Sync", L"settings"), glm::vec2(400, 32)
@@ -128,7 +61,7 @@ void menus::create_settings_panel(Engine* engine) {
         util::str2wstr_utf8(langName), 
         "languages", menu));
 
-    panel->add(guiutil::gotoButton(L"Audio", "settings-audio", menu));
+    panel->add(guiutil::gotoButton(L"Audio", "settings_audio", menu));
     panel->add(guiutil::gotoButton(L"Controls", "controls", menu));
     panel->add(guiutil::backButton(menu));
 }

src/frontend/screens.cpp

@@ -51,7 +51,6 @@ Screen::~Screen() {
 MenuScreen::MenuScreen(Engine* engine_) : Screen(engine_) {
     auto menu = engine->getGUI()->getMenu();
     menu->reset();
-    menus::refresh_menus(engine);
     menu->setPage("main");
 
     uicamera.reset(new Camera(glm::vec3(), Window::height));
@@ -167,7 +166,7 @@ void LevelScreen::update(float delta) {
 
     // TODO: subscribe for setting change
     EngineSettings& settings = engine->getSettings();
-    controller->getPlayer()->camera->setFov(glm::radians(settings.camera.fov));
+    controller->getPlayer()->camera->setFov(glm::radians(settings.camera.fov.get()));
     if (settings.graphics.backlight != backlight) {
         controller->getLevel()->chunks->saveAndClear();
         backlight = settings.graphics.backlight;