From 5c125bda26d25dc97ae9441441e332d396b458b4 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Wed, 7 May 2025 00:15:14 -0500 Subject: [PATCH] [jasper/world] Update for new Olympic changes --- src/jasper/modules/world/src/studio/studiomodule.cpp | 6 +++--- .../world/src/studio/worldeditor/worldeditor-imgui.cpp | 4 ++-- .../world/src/studio/worldeditor/worldeditor-imgui.hpp | 6 +++--- .../world/src/studio/worldeditor/worldeditorview.cpp | 2 +- .../world/src/studio/worldeditor/worldeditorview.hpp | 4 ++-- .../src/studio/worldobjectseteditor/collisionmapview.cpp | 2 +- .../src/studio/worldobjectseteditor/collisionmapview.hpp | 2 +- .../worldobjectseteditor/worldobjectseteditor-imgui.cpp | 4 ++-- .../worldobjectseteditor/worldobjectseteditor-imgui.hpp | 6 +++--- src/jasper/tools/icondata.cpp | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/jasper/modules/world/src/studio/studiomodule.cpp b/src/jasper/modules/world/src/studio/studiomodule.cpp index ace55f3..889d12a 100644 --- a/src/jasper/modules/world/src/studio/studiomodule.cpp +++ b/src/jasper/modules/world/src/studio/studiomodule.cpp @@ -13,14 +13,14 @@ namespace jasper::world { static class: public studio::Module { - ox::Vector editors(studio::StudioContext &ctx) const noexcept override { + ox::Vector editors(studio::Context &ctx) const noexcept override { return { studio::editorMaker(ctx, FileExt_jwob), studio::editorMaker(ctx, FileExt_jwld), }; } - ox::Vector> itemMakers(studio::StudioContext&) const noexcept override { + ox::Vector> itemMakers(studio::Context&) const noexcept override { ox::Vector> out; out.emplace_back(ox::make>( "World Object Set", "WorldObjectSets", FileExt_jwob, ox::ClawFormat::Organic)); @@ -29,7 +29,7 @@ static class: public studio::Module { return out; } - ox::Vector> itemTemplates(studio::StudioContext&) const noexcept override { + ox::Vector> itemTemplates(studio::Context&) const noexcept override { ox::Vector> out; // Person TileSheet { diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp index 0c294cf..d529e3b 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp @@ -72,7 +72,7 @@ constexpr ox::Point fbPtToTileAddr( }; } -WorldEditorImGui::WorldEditorImGui(studio::StudioContext &sctx, ox::StringParam path): +WorldEditorImGui::WorldEditorImGui(studio::Context &sctx, ox::StringParam path): Editor(sctx, std::move(path)), m_sctx{sctx}, m_objSetPicker{"Object Set Chooser", keelCtx(m_sctx), FileExt_jwob}, @@ -89,7 +89,7 @@ WorldEditorImGui::WorldEditorImGui(studio::StudioContext &sctx, ox::StringParam }); } -void WorldEditorImGui::draw(studio::StudioContext&) noexcept { +void WorldEditorImGui::draw(studio::Context&) noexcept { auto const paneSize = ImGui::GetContentRegionAvail(); { constexpr auto resourcesWidth = 300.f; diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp index 1c7ae02..7f1db39 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp @@ -21,7 +21,7 @@ class WorldEditorImGui: public studio::Editor { studio::SelectionTracker m_selTracker; ox::Optional m_selection; uint8_t m_activeLayer{}; - studio::StudioContext &m_sctx; + studio::Context &m_sctx; studio::FilePickerPopup m_objSetPicker; WorldDoc m_doc; struct ObjSetRef { @@ -49,9 +49,9 @@ class WorldEditorImGui: public studio::Editor { } m_sizeEditor; public: - WorldEditorImGui(studio::StudioContext &sctx, ox::StringParam path); + WorldEditorImGui(studio::Context &sctx, ox::StringParam path); - void draw(studio::StudioContext&) noexcept final; + void draw(studio::Context&) noexcept final; void onActivated() noexcept override; diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.cpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.cpp index e1fdb0a..ca96f0e 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.cpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.cpp @@ -8,7 +8,7 @@ namespace jasper::world { -WorldEditorView::WorldEditorView(studio::StudioContext &sctx, WorldStatic const&worldStatic): +WorldEditorView::WorldEditorView(studio::Context &sctx, WorldStatic const&worldStatic): m_sctx{sctx}, m_nctx{ngfx::init(m_sctx.tctx, {.glInstallDrawer = false}).unwrapThrow()}, m_worldStatic{worldStatic}, diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.hpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.hpp index 3c7cf89..7a4eb69 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.hpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.hpp @@ -22,7 +22,7 @@ namespace ngfx = nostalgia::gfx; class WorldEditorView: public ox::SignalHandler { private: - studio::StudioContext &m_sctx; + studio::Context &m_sctx; ox::UPtr m_nctx; WorldStatic const&m_worldStatic; int m_columns{}, m_rows{}; @@ -35,7 +35,7 @@ class WorldEditorView: public ox::SignalHandler { bool m_animateWorld{}; public: - WorldEditorView(studio::StudioContext &ctx, WorldStatic const&worldStatic); + WorldEditorView(studio::Context &ctx, WorldStatic const&worldStatic); ox::Error setupTile(uint32_t lyr, uint32_t x, uint32_t y) noexcept; diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.cpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.cpp index 60b9da8..5167d0f 100644 --- a/src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.cpp +++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.cpp @@ -11,7 +11,7 @@ CollisionMap mapIdx(auto x, auto y) noexcept { + static_cast(x); } -CollisionView::CollisionView(studio::StudioContext &sctx): +CollisionView::CollisionView(studio::Context &sctx): m_nctx(ngfx::init(sctx.tctx, { .glInstallDrawer = false, .glSpriteCount = 0, diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.hpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.hpp index 2448403..c12dd3f 100644 --- a/src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.hpp +++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.hpp @@ -28,7 +28,7 @@ class CollisionView { MapTileHighlighter m_highlighter; public: - CollisionView(studio::StudioContext &sctx); + CollisionView(studio::Context &sctx); ox::Error setup( ox::FileAddress const&tsAddr, diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp index 30252c9..e68ca48 100644 --- a/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp +++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp @@ -22,7 +22,7 @@ namespace ig = studio::ig; constexpr auto btnSize = ImVec2{22, ig::BtnSz.y}; WorldObjectSetEditorImGui::WorldObjectSetEditorImGui( - studio::StudioContext &sctx, + studio::Context &sctx, ox::StringParam path): Editor(sctx, std::move(path)), m_sctx{sctx}, @@ -43,7 +43,7 @@ WorldObjectSetEditorImGui::WorldObjectSetEditorImGui( buildPaletteDisplayNameList(); } -void WorldObjectSetEditorImGui::draw(studio::StudioContext&) noexcept { +void WorldObjectSetEditorImGui::draw(studio::Context&) noexcept { const auto paneSize = ImGui::GetContentRegionAvail(); constexpr auto resourcesWidth = 300.f; ImGui::BeginChild("ObjEditor", {paneSize.x - resourcesWidth, 0}); diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.hpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.hpp index 53c1573..fb0d433 100644 --- a/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.hpp +++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.hpp @@ -15,7 +15,7 @@ namespace jasper::world { class WorldObjectSetEditorImGui: public studio::Editor { private: - studio::StudioContext &m_sctx; + studio::Context &m_sctx; ox::String m_itemPath; WorldObjectSet m_doc; keel::AssetRef m_tileSheet; @@ -35,9 +35,9 @@ class WorldObjectSetEditorImGui: public studio::Editor { } m_objEditor; public: - WorldObjectSetEditorImGui(studio::StudioContext &sctx, ox::StringParam path); + WorldObjectSetEditorImGui(studio::Context &sctx, ox::StringParam path); - void draw(studio::StudioContext&) noexcept final; + void draw(studio::Context&) noexcept final; void onActivated() noexcept override; diff --git a/src/jasper/tools/icondata.cpp b/src/jasper/tools/icondata.cpp index f0a841c..a53bef8 100644 --- a/src/jasper/tools/icondata.cpp +++ b/src/jasper/tools/icondata.cpp @@ -5,7 +5,7 @@ namespace studio { -static constexpr ox::Array WindowIcon480Data { +static const ox::Array WindowIcon480Data { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x01, 0xe0, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, @@ -43,7 +43,7 @@ static constexpr ox::Array WindowIcon480Data { ox::SpanView WindowIcon480() noexcept { return WindowIcon480Data; } -static constexpr ox::Array WindowIcon1080Data { +static const ox::Array WindowIcon1080Data { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x04, 0x38, 0x00, 0x00, 0x04, 0x38, 0x02, 0x03, 0x00, 0x00, 0x00, 0x91,