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

[jasper/world] Update coding style
All checks were successful
Build / build (push) Successful in 1m47s
Details

Browse Source
This commit is contained in:
Gary Talent
2025-06-19 21:25:05 -05:00
parent a32a0a067a
commit 9b57d61ed0
28 changed files with 120 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/jasper/modules/world/src/studio/worldeditor/tileclipboard.cpp
View File

@ -6,7 +6,7 @@
namespace jasper::world { namespace jasper::world {
TileClipboard::TileClipboard(ox::UUID assetId, ox::Size selSz) noexcept: TileClipboard::TileClipboard(ox::UUID const &assetId, ox::Size selSz) noexcept:
m_assetId(assetId), m_selSz(selSz) { m_assetId(assetId), m_selSz(selSz) {
} }
@ -14,7 +14,7 @@ ox::Size TileClipboard::selectionSize() const noexcept {
return m_selSz; return m_selSz;
} }
void TileClipboard::addTile(const ModifyTilesCommand::Mod&mod) noexcept { void TileClipboard::addTile(ModifyTilesCommand::Mod const &mod) noexcept {
m_tileMods.emplace_back(mod); m_tileMods.emplace_back(mod);
} }

2
src/jasper/modules/world/src/studio/worldeditor/tileclipboard.hpp
View File

@ -21,7 +21,7 @@ class TileClipboard : public turbine::ClipboardObject<TileClipboard> {
ox::Vector<ModifyTilesCommand::Mod> m_tileMods; ox::Vector<ModifyTilesCommand::Mod> m_tileMods;
public: public:
TileClipboard(ox::UUID assetId, ox::Size selSz) noexcept; TileClipboard(ox::UUID const &assetId, ox::Size selSz) noexcept;
[[nodiscard]] [[nodiscard]]
ox::Size selectionSize() const noexcept; ox::Size selectionSize() const noexcept;

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

@ -17,7 +17,9 @@
namespace jasper::world { namespace jasper::world {
template< template<
WorldObjCommand cmd, auto getVar, auto hasMerge = false, WorldObjCommand cmd,
auto getVar,
auto hasMerge = false,
typename ValType = std::remove_reference_t<decltype(getVar(*new WorldObject))>> typename ValType = std::remove_reference_t<decltype(getVar(*new WorldObject))>>
class EditObject: public studio::UndoCommand { class EditObject: public studio::UndoCommand {
private: private:

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

@ -178,7 +178,10 @@ ox::Error WorldObjectSetEditorImGui::loadObj() noexcept {
} }
[[nodiscard]] [[nodiscard]]
static ox::Vec2 clickPos(ImVec2 const&imgSz, ImVec2 const&offset, ox::Vec2 clickPos) noexcept { static ox::Vec2 clickPos(
ImVec2 const &imgSz,
ImVec2 const &offset,
ox::Vec2 clickPos) noexcept {
clickPos.x -= offset.x; clickPos.x -= offset.x;
clickPos.y -= offset.y; clickPos.y -= offset.y;
clickPos.x /= imgSz.x; clickPos.x /= imgSz.x;

6
src/jasper/modules/world/src/world.cpp
View File

@ -11,13 +11,13 @@
namespace jasper::world { namespace jasper::world {
[[nodiscard]] [[nodiscard]]
static bool isUpdatingObj(ObjTileRefSet const&obj) noexcept { bool isUpdatingObj(ObjTileRefSet const &obj) noexcept {
return obj.frames > 1; return obj.frames > 1;
} }
World::World(ngfx::Context &nctx, WorldStatic const &worldStatic) noexcept: World::World(ngfx::Context &nctx, WorldStatic const &worldStatic) noexcept:
m_nctx(nctx), m_nctx{nctx},
m_worldStatic(worldStatic) {} m_worldStatic{worldStatic} {}
ox::Error World::setupDisplay() noexcept { ox::Error World::setupDisplay() noexcept {
if (m_worldStatic.objTileRefSets.empty()) { if (m_worldStatic.objTileRefSets.empty()) {