Compare commits
No commits in common. "d259770f32107f3bd21bebd1d8a524060c7b8b78" and "791b7746f331a3ad02cfdcdbc7c3ecde0cab7779" have entirely different histories.
d259770f32
...
791b7746f3
5
deps/ox/src/ox/std/smallmap.hpp
vendored
5
deps/ox/src/ox/std/smallmap.hpp
vendored
@ -85,11 +85,6 @@ class SmallMap {
|
|||||||
return m_pairs;
|
return m_pairs;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
|
||||||
constexpr ox::Span<Pair> pairs() noexcept {
|
|
||||||
return m_pairs;
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr void clear();
|
constexpr void clear();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -154,12 +154,13 @@ ox::Result<ox::CStringView> uuidToPath(Context &ctx, ox::UUID const&uuid) noexce
|
|||||||
}
|
}
|
||||||
|
|
||||||
ox::Error reloadAsset(keel::Context &ctx, ox::StringViewCR assetId) noexcept {
|
ox::Error reloadAsset(keel::Context &ctx, ox::StringViewCR assetId) noexcept {
|
||||||
|
ox::UUIDStr uuidStr;
|
||||||
if (beginsWith(assetId, "uuid://")) {
|
if (beginsWith(assetId, "uuid://")) {
|
||||||
return ctx.assetManager.reloadAsset(substr(assetId, 7));
|
return ctx.assetManager.reloadAsset(substr(assetId, 7));
|
||||||
} else {
|
} else {
|
||||||
auto const [uuid, uuidErr] = getUuid(ctx, assetId);
|
auto const [uuid, uuidErr] = getUuid(ctx, assetId);
|
||||||
if (!uuidErr) {
|
if (!uuidErr) {
|
||||||
return ctx.assetManager.reloadAsset(uuid.toString());
|
return ctx.assetManager.reloadAsset(uuidStr);
|
||||||
} else {
|
} else {
|
||||||
return ctx.assetManager.reloadAsset(assetId);
|
return ctx.assetManager.reloadAsset(assetId);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user