PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Minor refactor

Browse Source
This commit is contained in:
MihailRis
2023-12-24 11:18:21 +03:00
parent 572734dc80
commit b7ee9a4604
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine.cpp
+9 -16
View File
@@ -36,13 +36,6 @@
#include "definitions.h" #include "definitions.h"
using std::unique_ptr;
using std::shared_ptr;
using std::string;
using std::vector;
using glm::vec3;
using gui::GUI;
namespace fs = std::filesystem; namespace fs = std::filesystem;
Engine::Engine(EngineSettings& settings, EnginePaths* paths) Engine::Engine(EngineSettings& settings, EnginePaths* paths)
@@ -71,7 +64,7 @@ Engine::Engine(EngineSettings& settings, EnginePaths* paths)
} }
Audio::initialize(); Audio::initialize();
gui = new GUI(); gui = new gui::GUI();
if (settings.ui.language == "auto") { if (settings.ui.language == "auto") {
settings.ui.language = platform::detect_locale(); settings.ui.language = platform::detect_locale();
} }
@@ -88,7 +81,7 @@ void Engine::updateTimers() {
void Engine::updateHotkeys() { void Engine::updateHotkeys() {
if (Events::jpressed(keycode::F2)) { if (Events::jpressed(keycode::F2)) {
unique_ptr<ImageData> image(Window::takeScreenshot()); std::unique_ptr<ImageData> image(Window::takeScreenshot());
image->flipY(); image->flipY();
fs::path filename = paths->getScreenshotFile("png"); fs::path filename = paths->getScreenshotFile("png");
png::write_image(filename.string(), image.get()); png::write_image(filename.string(), image.get());
@@ -100,7 +93,7 @@ void Engine::updateHotkeys() {
} }
void Engine::mainloop() { void Engine::mainloop() {
setScreen(shared_ptr<Screen>(new MenuScreen(this))); setScreen(std::make_shared<MenuScreen>(this));
std::cout << "-- preparing systems" << std::endl; std::cout << "-- preparing systems" << std::endl;
@@ -135,7 +128,7 @@ Engine::~Engine() {
std::cout << "-- engine finished" << std::endl; std::cout << "-- engine finished" << std::endl;
} }
GUI* Engine::getGUI() { gui::GUI* Engine::getGUI() {
return gui; return gui;
} }
@@ -147,7 +140,7 @@ Assets* Engine::getAssets() {
return assets.get(); return assets.get();
} }
void Engine::setScreen(shared_ptr<Screen> screen) { void Engine::setScreen(std::shared_ptr<Screen> screen) {
this->screen = screen; this->screen = screen;
} }
@@ -155,7 +148,7 @@ const Content* Engine::getContent() const {
return content.get(); return content.get();
} }
vector<ContentPack>& Engine::getContentPacks() { std::vector<ContentPack>& Engine::getContentPacks() {
return contentPacks; return contentPacks;
} }
@@ -163,7 +156,7 @@ EnginePaths* Engine::getPaths() {
return paths; return paths;
} }
void Engine::setLanguage(string locale) { void Engine::setLanguage(std::string locale) {
settings.ui.language = locale; settings.ui.language = locale;
langs::setup(paths->getResources(), locale, contentPacks); langs::setup(paths->getResources(), locale, contentPacks);
menus::create_menus(this, gui->getMenu()); menus::create_menus(this, gui->getMenu());
@@ -174,7 +167,7 @@ void Engine::loadContent() {
ContentBuilder contentBuilder; ContentBuilder contentBuilder;
setup_definitions(&contentBuilder); setup_definitions(&contentBuilder);
vector<fs::path> resRoots; std::vector<fs::path> resRoots;
for (auto& pack : contentPacks) { for (auto& pack : contentPacks) {
ContentLoader loader(&pack); ContentLoader loader(&pack);
loader.load(&contentBuilder); loader.load(&contentBuilder);
@@ -185,7 +178,7 @@ void Engine::loadContent() {
Shader::preprocessor->setPaths(resPaths.get()); Shader::preprocessor->setPaths(resPaths.get());
unique_ptr<Assets> new_assets(new Assets()); std::unique_ptr<Assets> new_assets(new Assets());
std::cout << "-- loading assets" << std::endl; std::cout << "-- loading assets" << std::endl;
AssetsLoader loader(new_assets.get(), resPaths.get()); AssetsLoader loader(new_assets.get(), resPaths.get());
AssetsLoader::createDefaults(loader); AssetsLoader::createDefaults(loader);