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

Squashed 'deps/nostalgia/' changes from f128664a..b75bbc4d

Browse Source 
b75bbc4d [olympic,nostalgia] Change order of oxModelFieldRename args
227dd68a [ox/model] Change order of oxModelFieldRename args
02db760b [olympic] Add more ImGui helpers, studio::Editor::pushCommand
09c57545 [ox/std] Add Vector::at

git-subtree-dir: deps/nostalgia
git-subtree-split: b75bbc4d200c0f4187f5c4068ba686dad34820cd
This commit is contained in:
Gary Talent
2024-01-28 18:05:09 -06:00
parent db978290f3
commit cfc27a384b
9 changed files with 156 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.hpp
View File

@@ -40,7 +40,7 @@ oxModelBegin(TileSheetClipboard::Pixel)
oxModelEnd()
oxModelBegin(TileSheetClipboard)
oxModelFieldRename(pixels, m_pixels)
oxModelFieldRename(m_pixels, pixels)
oxModelEnd()
class CutPasteCommand: public TileSheetCommand {

6
src/nostalgia/modules/scene/include/nostalgia/scene/scenestatic.hpp
View File

@@ -58,10 +58,10 @@ struct TileDoc {
};
oxModelBegin(TileDoc)
oxModelFieldRename(subsheet_id, subsheetId)
oxModelFieldRename(subsheet_path, subsheetPath)
oxModelFieldRename(subsheetId, subsheet_id)
oxModelFieldRename(subsheetPath, subsheet_path)
oxModelField(type)
oxModelFieldRename(layer_attachments, layerAttachments)
oxModelFieldRename(layerAttachments, layer_attachments)
oxModelEnd()
struct SceneDoc {