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

[jasper/world/studio] Update for Studio changes
All checks were successful
Build / build (push) Successful in 4m14s
Details

Browse Source
This commit is contained in:
Gary Talent 2025-01-26 15:44:34 -06:00
parent e86c58a087
commit 5b0bae9712
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ constexpr ox::Point fbPtToTileAddr(
} }
WorldEditorImGui::WorldEditorImGui(studio::StudioContext &sctx, ox::StringParam path): WorldEditorImGui::WorldEditorImGui(studio::StudioContext &sctx, ox::StringParam path):
Editor(std::move(path)), Editor(sctx, std::move(path)),
m_sctx{sctx}, m_sctx{sctx},
m_objSetPicker{"Object Set Chooser", keelCtx(m_sctx), FileExt_jwob}, m_objSetPicker{"Object Set Chooser", keelCtx(m_sctx), FileExt_jwob},
m_doc{*keel::readObj<WorldDoc>(keelCtx(m_sctx), itemPath()).unwrapThrow()} { m_doc{*keel::readObj<WorldDoc>(keelCtx(m_sctx), itemPath()).unwrapThrow()} {

6
src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp
View File

@ -22,10 +22,10 @@ namespace ig = studio::ig;
constexpr auto btnSize = ImVec2{22, ig::BtnSz.y}; constexpr auto btnSize = ImVec2{22, ig::BtnSz.y};
WorldObjectSetEditorImGui::WorldObjectSetEditorImGui( WorldObjectSetEditorImGui::WorldObjectSetEditorImGui(
studio::StudioContext &ctx, studio::StudioContext &sctx,
ox::StringParam path): ox::StringParam path):
Editor(std::move(path)), Editor(sctx, std::move(path)),
m_sctx{ctx}, m_sctx{sctx},
m_itemPath{itemPath()}, m_itemPath{itemPath()},
m_doc{*readObj<WorldObjectSet>(keelCtx(m_sctx), itemPath()).unwrapThrow()}, m_doc{*readObj<WorldObjectSet>(keelCtx(m_sctx), itemPath()).unwrapThrow()},
m_tileSheet{readObj<ngfx::TileSheet>(keelCtx(m_sctx), m_doc.tilesheet) m_tileSheet{readObj<ngfx::TileSheet>(keelCtx(m_sctx), m_doc.tilesheet)

2
src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.hpp
View File

@ -35,7 +35,7 @@ class WorldObjectSetEditorImGui: public studio::Editor {
} m_objEditor; } m_objEditor;
public: public:
WorldObjectSetEditorImGui(studio::StudioContext &ctx, ox::StringParam path); WorldObjectSetEditorImGui(studio::StudioContext &sctx, ox::StringParam path);
void draw(studio::StudioContext&) noexcept final; void draw(studio::StudioContext&) noexcept final;