Skip to content
Snippets Groups Projects
Commit 9c70be8c authored by Joseph Walton-Rivers's avatar Joseph Walton-Rivers
Browse files

only run asset discovery for viewer when viewer is loaded

parent 0e3c14ee
No related branches found
No related tags found
No related merge requests found
...@@ -108,7 +108,6 @@ int main(int argc, const char* argv[]) { ...@@ -108,7 +108,6 @@ int main(int argc, const char* argv[]) {
auto* assetFinder = app.service<fggl::assets::CheckinAdapted>(); auto* assetFinder = app.service<fggl::assets::CheckinAdapted>();
assetFinder->discover("core"); assetFinder->discover("core");
assetFinder->discover("viewer");
// force asset loading // force asset loading
{ {
......
...@@ -109,6 +109,9 @@ namespace demo { ...@@ -109,6 +109,9 @@ namespace demo {
void Viewer::activate() { void Viewer::activate() {
Game::activate(); Game::activate();
auto* assetFinder = m_owner.service<fggl::assets::CheckinAdapted>();
assetFinder->discover("viewer");
// setup the assets we can select between // setup the assets we can select between
// TODO some form of introspection to automatically find declared/discovered assets of a given type // TODO some form of introspection to automatically find declared/discovered assets of a given type
m_assets.clear(); m_assets.clear();
......
...@@ -96,6 +96,10 @@ namespace fggl::assets { ...@@ -96,6 +96,10 @@ namespace fggl::assets {
} }
void discover( const char* packName, bool useCache = false, bool updateCache = true) { void discover( const char* packName, bool useCache = false, bool updateCache = true) {
if ( m_packs.contains(packName) ) {
return;
}
std::string packRoot = "packs/"; std::string packRoot = "packs/";
auto packDir = m_storage->resolvePath( data::StorageType::Data, packRoot + packName ); auto packDir = m_storage->resolvePath( data::StorageType::Data, packRoot + packName );
discover(packDir, useCache, updateCache); discover(packDir, useCache, updateCache);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment