voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-04 18:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add AssetsManagement

Browse source
This commit is contained in:
MihailRis 2026-01-23 12:48:54 +03:00
parent 89485dc592
commit d5f8fed633
4 changed files with 82 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/engine/Engine.cpp
View file

@ -34,6 +34,7 @@
#include "window/input.hpp"
#include "window/Window.hpp"
#include "world/Level.hpp"
#include "AssetsManagement.hpp"
#include "Mainloop.hpp"
#include "ServerMainloop.hpp"
#include "WindowControl.hpp"
@ -84,6 +85,7 @@ void Engine::onContentLoad() {
}
void Engine::initializeClient() {
assets = std::make_unique<AssetsManagement>(*this);
windowControl = std::make_unique<WindowControl>(*this);
auto [window, input] = windowControl->initialize();
@ -305,7 +307,7 @@ void Engine::renderFrame() {
screen->draw(time.getDelta());
DrawContext ctx(nullptr, *window, nullptr);
gui->draw(ctx, *assets);
gui->draw(ctx, *assets->getStorage());
}
void Engine::saveSettings() {
@ -363,33 +365,7 @@ void Engine::setLevelConsumer(OnWorldOpen levelConsumer) {
}
void Engine::loadAssets() {
logger.info() << "loading assets";
Shader::preprocessor->setPaths(&paths->resPaths);
auto content = this->content->get();
auto new_assets = std::make_unique<Assets>();
AssetsLoader loader(*this, *new_assets, paths->resPaths);
AssetsLoader::addDefaults(loader, content);
// no need
// correct log messages order is more useful
// todo: before setting to true, check if GLSLExtension thread safe
bool threading = false; // look at three upper lines
if (threading) {
auto task = loader.startTask([=](){});
task->waitForEnd();
} else {
while (loader.hasNext()) {
loader.loadNext();
}
}
assets = std::move(new_assets);
if (content) {
ModelsGenerator::prepare(*content, *assets);
}
assets->setup();
gui->onAssetsLoad(assets.get());
assets->loadAssets(content->get());
}
void Engine::loadProject() {
@ -442,7 +418,7 @@ EngineSettings& Engine::getSettings() {
}
Assets* Engine::getAssets() {
return assets.get();
return assets->getStorage();
}
EnginePaths& Engine::getPaths() {