drinkingtea/jasper
drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

[jasper/world] Cleanup
All checks were successful
Build / build (push) Successful in 3m42s
Details

Browse Source
This commit is contained in:
Gary Talent 2025-01-11 14:13:55 -06:00
parent 73da8eaaec
commit ff7357a6d9
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jasper/modules/world/include/jasper/world/worldstatic.hpp
View File

@ -137,7 +137,9 @@ OX_MODEL_END()
[[nodiscard]] [[nodiscard]]
constexpr bool valid(WorldStatic const&ws) noexcept { constexpr bool valid(WorldStatic const&ws) noexcept {
auto const tileCnt = static_cast<size_t>(ws.columns * ws.rows); auto const tileCnt = static_cast<size_t>(ws.columns * ws.rows);
return ox::all_of(ws.map.begin(), ws.map.end(), [tileCnt](BgLayer const&v) { return
!ws.objTileRefSets.empty() &&
ox::all_of(ws.map.begin(), ws.map.end(), [tileCnt](BgLayer const&v) {
return v.tiles.size() == tileCnt; return v.tiles.size() == tileCnt;
}); });
} }
@ -192,9 +194,9 @@ class WorldStaticLoader {
TileStatic &dst, TileStatic &dst,
TileDoc const&src) noexcept; TileDoc const&src) noexcept;
private:
void reset(); void reset();
private:
ox::Result<uint8_t> setupTileResrc(DocObjRef const&docObjRef) noexcept; ox::Result<uint8_t> setupTileResrc(DocObjRef const&docObjRef) noexcept;
void deleteRefSet(uint8_t refIdx, DocObjRef const&oldObjRef) noexcept; void deleteRefSet(uint8_t refIdx, DocObjRef const&oldObjRef) noexcept;

2
src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp
View File

@ -405,7 +405,6 @@ ox::Error WorldEditorImGui::handleDepUpdate(ox::StringViewCR, ox::UUID const&uui
auto const depUpdated = ox::any_of(m_doc.objSets.begin(), m_doc.objSets.end(), objSetMatches) auto const depUpdated = ox::any_of(m_doc.objSets.begin(), m_doc.objSets.end(), objSetMatches)
|| ox::any_of(m_dependencies.pairs().begin(), m_dependencies.pairs().end(), depMatches); || ox::any_of(m_dependencies.pairs().begin(), m_dependencies.pairs().end(), depMatches);
if (depUpdated) { if (depUpdated) {
m_loader.reset();
OX_RETURN_ERROR(m_loader.loadWorldStatic()); OX_RETURN_ERROR(m_loader.loadWorldStatic());
OX_RETURN_ERROR(loadObjectSets()); OX_RETURN_ERROR(loadObjectSets());
} }
@ -429,7 +428,6 @@ ox::Error WorldEditorImGui::loadObjectSets() noexcept {
ox::Error WorldEditorImGui::undoStackChanged(studio::UndoCommand const*cmd) { ox::Error WorldEditorImGui::undoStackChanged(studio::UndoCommand const*cmd) {
if (dynamic_cast<EditWorldSizeCommand const*>(cmd)) { if (dynamic_cast<EditWorldSizeCommand const*>(cmd)) {
m_loader.reset();
OX_RETURN_ERROR(m_loader.loadWorldStatic()); OX_RETURN_ERROR(m_loader.loadWorldStatic());
} }
OX_RETURN_ERROR(m_view.setupWorld()); OX_RETURN_ERROR(m_view.setupWorld());

2
src/jasper/modules/world/src/worldstatic.cpp
View File

@ -56,7 +56,7 @@ ox::Error WorldStaticLoader::loadWorldStatic() noexcept {
} }
} }
m_loaded = true; m_loaded = true;
return {}; return keel::ensureValid(m_worldStatic);
} }
ox::Error WorldStaticLoader::updateTile( ox::Error WorldStaticLoader::updateTile(