* [editor] tilesheet editor, animation editor crash

VisualGMQ · Apr 13, 2024 · 93fa9fb · 93fa9fb
1 parent 84974af
commit 93fa9fb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/editor/src/anim_editor.hpp b/editor/src/anim_editor.hpp
@@ -5,7 +5,12 @@
 class Sequence {
 public:
     Sequence()
-        : animMgr{*nickel::ECS::Instance().World().res_mut<nickel::AnimationManager>()} {}
+        : player{*nickel::ECS::Instance()
+                      .World()
+                      .res_mut<nickel::AnimationManager>()},
+          animMgr{*nickel::ECS::Instance()
+                       .World()
+                       .res_mut<nickel::AnimationManager>()} {}
 
     int GetItemCount() const {
         if (!animMgr.Has(player.Anim())) {

diff --git a/nickel/include/anim/anim.hpp b/nickel/include/anim/anim.hpp
@@ -322,8 +322,6 @@ class AnimationPlayer final {
 
     using animation_type = Animation;
 
-    AnimationPlayer() = default;
-
     explicit AnimationPlayer(AnimationManager& mgr) : mgr_(&mgr) {}
 
     AnimationPlayer(const AnimationPlayer&) = delete;

diff --git a/nickel/src/graphics/tilesheet.cpp b/nickel/src/graphics/tilesheet.cpp
@@ -1,4 +1,5 @@
 #include "graphics/tilesheet.hpp"
+#include "misc/asset_manager.hpp"
 
 #define RAPIDXML_NO_EXCEPTIONS
 #include "rapidxml.hpp"
@@ -110,15 +111,14 @@ std::unique_ptr<Tilesheet> LoadAssetFromMeta(const toml::table& tbl) {
 TilesheetHandle TilesheetManager::Create(TextureHandle handle, uint32_t col,
                                          uint32_t row, const Margin& margin,
                                          const Spacing& spacing) {
-    // auto elem =
-    //     std::make_unique<Tilesheet>(gWorld->res<AssetManager>()->TextureMgr(),
-    //                                 handle, col, row, margin, spacing);
-    // if (elem && *elem) {
-    //     auto handle = TilesheetHandle::Create();
-    //     storeNewItem(handle, std::move(elem));
-    //     return handle;
-    // }
-    return TilesheetHandle::Null();
+    auto elem = std::make_unique<Tilesheet>(
+        ECS::Instance().World().res<AssetManager>()->TextureMgr(), handle, col,
+        row, margin, spacing);
+    if (elem && *elem) {
+        auto handle = TilesheetHandle::Create();
+        storeNewItem(handle, std::move(elem));
+        return handle;
+    }
 }
 
 TilesheetHandle TilesheetManager::Load(const std::filesystem::path& filename) {