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

[jasper/world/studio/worldobjectseteditor] Fix build for certain compilers

Browse Source
This commit is contained in:
Gary Talent 2025-01-13 21:34:23 -06:00
parent d16a6e1659
commit 37e0ead5bf
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.hpp
View File

@ -4,6 +4,8 @@
#pragma once #pragma once
#include <type_traits>
#include <ox/fs/fs.hpp> #include <ox/fs/fs.hpp>
#include <studio/undostack.hpp> #include <studio/undostack.hpp>
@ -16,7 +18,7 @@ namespace jasper::world {
template< template<
WorldObjCommand cmd, auto getVar, auto hasMerge = false, WorldObjCommand cmd, auto getVar, auto hasMerge = false,
typename ValType = decltype([] { WorldObject o; return std::move(getVar(o)); }())> typename ValType = std::remove_reference_t<decltype(getVar(*new WorldObject))>>
class EditObject: public studio::UndoCommand { class EditObject: public studio::UndoCommand {
private: private:
WorldObjectSet &m_doc; WorldObjectSet &m_doc;
@ -81,13 +83,15 @@ using EditObjectFrames = EditObject<
WorldObjCommand::EditObjectFrames, WorldObjCommand::EditObjectFrames,
[](WorldObject &obj) -> auto& { [](WorldObject &obj) -> auto& {
return obj.frames; return obj.frames;
}>; },
true>;
using EditObjectInterval = EditObject< using EditObjectInterval = EditObject<
WorldObjCommand::EditObjectInterval, WorldObjCommand::EditObjectInterval,
[](WorldObject &obj) -> auto& { [](WorldObject &obj) -> auto& {
return obj.intervalMs; return obj.intervalMs;
}>; },
true>;
using EditObjectPalette = EditObject< using EditObjectPalette = EditObject<
WorldObjCommand::EditObjectPalette, WorldObjCommand::EditObjectPalette,