mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-07 03:51:50 +00:00
Merge branch 'main' into volume-renderer
This commit is contained in:
commit
c7508d6270
35 changed files with 532 additions and 68 deletions
|
|
@ -6,6 +6,7 @@
|
|||
struct CoreParameters {
|
||||
bool headless = false;
|
||||
bool testMode = false;
|
||||
bool stdinCommands = false;
|
||||
std::filesystem::path resFolder = "res";
|
||||
std::filesystem::path userFolder = ".";
|
||||
std::filesystem::path scriptFile;
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
#include "devtools/DebuggingServer.hpp"
|
||||
#include "devtools/Editor.hpp"
|
||||
#include "devtools/Project.hpp"
|
||||
#include "devtools/stdin_cmd_reader.hpp"
|
||||
#include "EnginePaths.hpp"
|
||||
#include "frontend/locale.hpp"
|
||||
#include "frontend/menu.hpp"
|
||||
|
|
@ -191,6 +192,9 @@ void Engine::initialize(CoreParameters coreParameters) {
|
|||
if (!params.headless) {
|
||||
project->loadProjectClientScript();
|
||||
}
|
||||
if (params.stdinCommands) {
|
||||
cmd::start_stdin_cmd_reader(*this);
|
||||
}
|
||||
}
|
||||
|
||||
void Engine::loadSettings() {
|
||||
|
|
@ -419,10 +423,20 @@ EngineSettings& Engine::getSettings() {
|
|||
}
|
||||
|
||||
Assets* Engine::getAssets() {
|
||||
return assets->getStorage();
|
||||
return assets ? assets->getStorage() : nullptr;
|
||||
}
|
||||
|
||||
Assets& Engine::requireAssets() {
|
||||
if (isHeadless()) {
|
||||
throw std::runtime_error("assets are not available in headless mode");
|
||||
}
|
||||
return *assets->getStorage();
|
||||
}
|
||||
|
||||
AssetsLoader& Engine::acquireBackgroundLoader() {
|
||||
if (isHeadless()) {
|
||||
throw std::runtime_error("assets are not available in headless mode");
|
||||
}
|
||||
return assets->acquireBackgroundLoader();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -110,6 +110,7 @@ public:
|
|||
|
||||
/// @brief Get active assets storage instance
|
||||
Assets* getAssets();
|
||||
Assets& requireAssets();
|
||||
|
||||
AssetsLoader& acquireBackgroundLoader();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue