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

[jasper] Add missing files, update for Nostalgia changes
All checks were successful
Build / build (push) Successful in 2m51s
Details

Browse Source
This commit is contained in:
Gary Talent
2024-04-21 13:15:17 -05:00
parent 26d2645174
commit eecc9da3ce
6 changed files with 166 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ WorldObjectSetEditorImGui::WorldObjectSetEditorImGui(
buildPaletteDisplayNameList();
}
void WorldObjectSetEditorImGui::draw(turbine::Context&) noexcept {
void WorldObjectSetEditorImGui::draw(studio::StudioContext&) noexcept {
const auto paneSize = ImGui::GetContentRegionAvail();
constexpr auto resourcesWidth = 300.f;
ImGui::BeginChild("ObjEditor", ImVec2(paneSize.x - resourcesWidth, 0));
@@ -122,7 +122,7 @@ void WorldObjectSetEditorImGui::loadObj() noexcept {
}
auto const&obj = activeObj();
auto &nameBuff = m_objEditor.nameBuff;
ox_strncpy(nameBuff.data(), obj.name.data(), nameBuff.size());
ox::strncpy(nameBuff.data(), obj.name.data(), nameBuff.size());
m_objEditor.palette = obj.palBank;
m_subsheet = getSubsheet(*m_tileSheet, obj.subsheetId);
int w = 0;
@@ -159,7 +159,7 @@ void WorldObjectSetEditorImGui::drawObjEditor() noexcept {
undoStack()->push(ox::make_unique<EditObjectName>(
m_doc,
m_selectedObj,
ox::String(nameBuff.data(), ox_strnlen(nameBuff.data(), nameBuff.size()))));
ox::String(nameBuff.data(), ox::strnlen(nameBuff.data(), nameBuff.size()))));
}
// SubSheet Selector
{

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

@@ -42,7 +42,7 @@ class WorldObjectSetEditorImGui: public studio::Editor {
public:
WorldObjectSetEditorImGui(studio::StudioContext &ctx, ox::StringView path);
void draw(turbine::Context&) noexcept final;
void draw(studio::StudioContext&) noexcept final;
void onActivated() noexcept override;