From 654c509ccd6a743759d75969a2d09995f6ee5e0d Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Mon, 27 May 2024 21:13:17 -0500 Subject: [PATCH] [keel] Remove setAsset --- .../scene/src/studio/sceneeditor-imgui.cpp | 1 - .../keel/include/keel/assetmanager.hpp | 29 ------------------- .../src/olympic/keel/include/keel/media.hpp | 22 -------------- 3 files changed, 52 deletions(-) diff --git a/deps/nostalgia/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp b/deps/nostalgia/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp index beef45f..4ec3e14 100644 --- a/deps/nostalgia/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp +++ b/deps/nostalgia/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp @@ -50,7 +50,6 @@ void SceneEditorImGui::onActivated() noexcept { ox::Error SceneEditorImGui::saveItem() noexcept { const auto sctx = applicationData(m_ctx); oxReturnError(sctx->project->writeObj(itemPath(), m_editor.scene())); - oxReturnError(keelCtx(m_ctx).assetManager.setAsset(itemPath(), m_editor.scene())); return {}; } diff --git a/deps/nostalgia/src/olympic/keel/include/keel/assetmanager.hpp b/deps/nostalgia/src/olympic/keel/include/keel/assetmanager.hpp index 1820fcb..6b46134 100644 --- a/deps/nostalgia/src/olympic/keel/include/keel/assetmanager.hpp +++ b/deps/nostalgia/src/olympic/keel/include/keel/assetmanager.hpp @@ -212,28 +212,6 @@ class AssetManager { return AssetRef(out->get()); } - ox::Result> setAsset(ox::StringView const assetId, T const&obj) noexcept { - auto &p = m_cache[assetId]; - if (!p) { - p = ox::make_unique>(obj); - } else { - p->set(obj); - p->updated.emit(); - } - return AssetRef(p.get()); - } - - ox::Result> setAsset(ox::StringView const assetId, T &&obj) noexcept { - auto &p = m_cache[assetId]; - if (!p) { - p = ox::make_unique>(obj); - } else { - p->set(std::move(obj)); - p->updated.emit(); - } - return AssetRef(p.get()); - } - ox::Result> loadAsset(ox::StringView const assetId) noexcept { auto &p = m_cache[assetId]; oxRequireM(obj, m_loader(assetId)); @@ -303,13 +281,6 @@ class AssetManager { return m->getAsset(assetId); } - template - ox::Result> setAsset(ox::StringView assetId, T const&obj) noexcept { - oxRequire(m, getTypeManager()); - oxReturnError(m->setAsset(assetId, obj)); - return {}; - } - ox::Error reloadAsset(ox::StringView assetId) noexcept { m_fileTrackers[assetId].updated.emit(assetId); return {}; diff --git a/deps/nostalgia/src/olympic/keel/include/keel/media.hpp b/deps/nostalgia/src/olympic/keel/include/keel/media.hpp index 462933c..1af4e49 100644 --- a/deps/nostalgia/src/olympic/keel/include/keel/media.hpp +++ b/deps/nostalgia/src/olympic/keel/include/keel/media.hpp @@ -129,28 +129,6 @@ ox::Result> readObjNoCache( ox::Error reloadAsset(keel::Context &ctx, ox::StringView assetId) noexcept; -template -ox::Result> setAsset( - keel::Context &ctx, - ox::StringView assetId, - T const&asset) noexcept { -#ifndef OX_BARE_METAL - if (assetId.len() == 0) { - return OxError(1, "Invalid asset ID"); - } - ox::UUIDStr uuidStr; - if (assetId[0] == '/') { - oxRequire(id, ctx.pathToUuid.at(assetId)); - uuidStr = id->toString(); - assetId = uuidStr; - } - ctx.assetManager.initTypeManager(detail::makeLoader, ctx); - return ctx.assetManager.setAsset(assetId, asset); -#else - return OxError(1, "Not supported on this platform"); -#endif -} - template ox::Result> readObj( keel::Context &ctx,