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

[jasper/world] Update for new Olympic changes

Browse Source
This commit is contained in:
Gary Talent
2025-05-07 00:15:14 -05:00
parent 62a3066c7c
commit 5c125bda26
10 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.cpp
View File

@@ -11,7 +11,7 @@ CollisionMap mapIdx(auto x, auto y) noexcept {
+ static_cast<CollisionMap>(x);
}
CollisionView::CollisionView(studio::StudioContext &sctx):
CollisionView::CollisionView(studio::Context &sctx):
m_nctx(ngfx::init(sctx.tctx, {
.glInstallDrawer = false,
.glSpriteCount = 0,

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

@@ -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,

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

@@ -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});

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

@@ -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<ngfx::TileSheet> 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;