Fixes

Author: Alphalaneous

changelog.md

@@ -1,3 +1,7 @@
+# 1.0.2
+- <c-dddddd>Fix a crash</c>
+- <c-dddddd>Speed up Object Search loading</c>
+
 # 1.0.1
 - <c-dddddd>Rewrite zoom logic to hopefully resolve some bugs</c>
 - <c-dddddd>Lazy load search tab</c>

mod.json

@@ -8,7 +8,7 @@
 	},
 	"id": "alphalaneous.tinker",
 	"name": "Tinker",
-	"version": "v1.0.1",
+	"version": "v1.0.2",
 	"developer": "Alphalaneous",
 	"description": "Editor Revamped",
 	"dependencies": {

src/Utils.hpp

@@ -317,4 +317,31 @@ namespace tinker::utils {
         }
 
     }
+
+    class Timestamp {
+    public:
+        Timestamp(ZStringView id) : m_id(id) {
+            m_start = m_last = std::chrono::steady_clock::now();
+        }
+
+        void snapshot(ZStringView label) {
+            auto now = std::chrono::steady_clock::now();
+
+            auto total = std::chrono::duration_cast<std::chrono::milliseconds>(now - m_start).count();
+            auto delta = std::chrono::duration_cast<std::chrono::milliseconds>(now - m_last).count();
+
+            log::debug("[{}] ({}) +{} ms (total {} ms)", m_id, label, delta, total);
+
+            m_last = now;
+        }
+
+        ~Timestamp() {
+            snapshot("end");
+        }
+
+    private:
+        std::string m_id;
+        std::chrono::time_point<std::chrono::steady_clock> m_start;
+        std::chrono::time_point<std::chrono::steady_clock> m_last;
+    };
 }

src/modules/ObjectSearch/ObjectSearch.cpp

@@ -2,6 +2,7 @@
 #include "../../ObjectNames.hpp"
 #include "../LiveColors/LiveColors.hpp"
 #include "SearchField.hpp"
+#include "../ScrollableObjects.hpp"
 #include <alphalaneous.alphas-ui-pack/include/API.hpp>
 #include <alphalaneous.editortab_api/include/EditorTabAPI.hpp>
 #include <raydeeux.gameobjectidstacksize/include/api.hpp>
@@ -29,7 +30,6 @@ bool OSEditorUI::init(LevelEditorLayer* editorLayer) {
 
     auto winSize = CCDirector::get()->getWinSize();
 
-
     alpha::editor_tabs::addTab("all-objects"_spr, alpha::editor_tabs::BUILD, [this, fields] () {
         fields->m_searchBar = alpha::editor_tabs::createEditButtonBar({});
         fields->m_searchBar->m_hasCreateItems = true;
@@ -57,6 +57,15 @@ bool OSEditorUI::init(LevelEditorLayer* editorLayer) {
                 LiveColors::get()->showMenu(true);
             }
         }
+        if (state && !fields->m_initialLoaded) {
+            auto arr = fields->m_searchField->generateItemArrayForSearch("");
+            
+            auto cols = GameManager::get()->getIntGameVariable(GameVar::EditorButtonsPerRow);
+            auto rows = GameManager::get()->getIntGameVariable(GameVar::EditorButtonRows);
+
+            fields->m_searchBar->loadFromItems(arr, cols, rows, false);
+            fields->m_initialLoaded = true;
+        }
     });
 
     runAction(CallFuncExt::create([this, fields, objectSearch] {
@@ -92,13 +101,6 @@ bool OSEditorUI::init(LevelEditorLayer* editorLayer) {
                 fields->m_orderedItems.push_back(&fields->m_items[cmi->m_objectID]);
             }
         }
-
-        auto arr = fields->m_searchField->generateItemArrayForSearch("");
-        
-        auto cols = GameManager::get()->getIntGameVariable(GameVar::EditorButtonsPerRow);
-        auto rows = GameManager::get()->getIntGameVariable(GameVar::EditorButtonRows);
-
-        fields->m_searchBar->loadFromItems(arr, cols, rows, false);
     }));
 
     return true;
@@ -337,23 +339,9 @@ void OSEditButtonBar::loadFromItems(cocos2d::CCArray* objects, int rows, int col
     checkPage();
 }
 
-void OSEditButtonBar::goToPage(int page) {
-    EditButtonBar::goToPage(page);
-    checkPage();
-}
-
-void OSEditButtonBar::onLeft(cocos2d::CCObject* sender) {
-    EditButtonBar::onLeft(sender);
-    checkPage();
-}
-
-void OSEditButtonBar::onRight(cocos2d::CCObject* sender) {
-    EditButtonBar::onRight(sender);
-    checkPage();
-}
-
 void OSEditButtonBar::checkPage() {
     if (!m_hasCreateItems) return;
+    if (ScrollableObjects::isEnabled()) return;
 
     auto pageNum = getPage();
     for (auto node : m_buttonArray->asExt<CreateMenuItem>()) {
@@ -362,4 +350,13 @@ void OSEditButtonBar::checkPage() {
             oCmi->loadRender();
         }
     }
+}
+
+void OSBoomScrollLayer::instantMoveToPage(int page) {
+    BoomScrollLayer::instantMoveToPage(page);
+
+    if (auto ebb = typeinfo_cast<EditButtonBar*>(getParent())) {
+        auto sEbb = static_cast<OSEditButtonBar*>(ebb);
+        sEbb->checkPage();
+    }
 }

src/modules/ObjectSearch/ObjectSearch.hpp

@@ -5,6 +5,7 @@
 #include <Geode/modify/EditorUI.hpp>
 #include <Geode/modify/CreateMenuItem.hpp>
 #include <Geode/modify/EditButtonBar.hpp>
+#include <Geode/modify/BoomScrollLayer.hpp>
 #include "SearchField.hpp"
 
 class $globalModule(ObjectSearch) {};
@@ -17,6 +18,7 @@ class $modify(OSEditorUI, EditorUI) {
         tinker::ui::SearchField* m_searchField;
         std::map<unsigned int, tinker::ui::SearchField::ItemInformation> m_items;
         std::vector<tinker::ui::SearchField::ItemInformation*> m_orderedItems;
+        bool m_initialLoaded = false;
     };
 
     bool init(LevelEditorLayer* editorLayer);
@@ -48,7 +50,10 @@ class $modify(OSEditButtonBar, EditButtonBar) {
     void checkPage();
 
     void loadFromItems(cocos2d::CCArray* objects, int rows, int columns, bool keepPage);
-    void goToPage(int page);
-    void onLeft(cocos2d::CCObject* sender);
-    void onRight(cocos2d::CCObject* sender);
+};
+
+class $modify(OSBoomScrollLayer, BoomScrollLayer) {
+    $registerGlobalHooks(ObjectSearch)
+
+    void instantMoveToPage(int page);
 };

src/modules/ObjectSearch/SearchField.cpp

@@ -26,7 +26,6 @@ Result<SearchField::ItemInformation> SearchField::infoForID(unsigned int id) {
 
 CCArray* SearchField::generateItemArrayForSearch(const std::string& search) {
     auto fields = m_editorUI->m_fields.self();
-
     auto arr = CCArray::createWithCapacity(fields->m_orderedItems.size());
 
     if (search.empty()) {

src/modules/ScrollableObjects.cpp

@@ -60,9 +60,15 @@ bool SOEditorUI::init(LevelEditorLayer* editorLayer) {
         }
     }));
 
+    m_fields->m_shouldLoadBars = true;
+
     return true;
 }
 
+bool SOEditorUI::shouldLoadBars() {
+    return m_fields->m_shouldLoadBars;
+}
+
 bool ScrollableObjects::canScroll() {
     auto editorUI = EditorUI::get();
     if (!editorUI) return false;
@@ -163,6 +169,10 @@ void SOEditButtonBar::loadFromItems(cocos2d::CCArray* objects, int columns, int
         fields->m_items.clear();
     }
 
+    setUserFlag("alphalaneous.editortab_api/disable-rewrite");
+    auto editorUI = EditorUI::get();
+    if (!editorUI || !static_cast<SOEditorUI*>(editorUI)->shouldLoadBars()) return;
+
     float currentX = 0;
 
     if (fields->m_scrollLayer) {
@@ -191,14 +201,9 @@ void SOEditButtonBar::loadFromItems(cocos2d::CCArray* objects, int columns, int
         fields->m_widthOffset = -26.f;
     }
 
-    setUserFlag("alphalaneous.editortab_api/disable-rewrite");
     setAnchorPoint({0.5f, 0.f});
 
-    auto editorUI = EditorUI::get();
-    if (!editorUI) return;
-
     fields->m_initialized = true;
-
     auto widthOffset = 180;
 
     auto spacerLeft = editorUI->getChildByID("spacer-line-left");
@@ -254,17 +259,19 @@ void SOEditButtonBar::loadFromItems(cocos2d::CCArray* objects, int columns, int
 
     float width = 0;
 
+
     for (auto object : objects->asExt<CCNode>()) {
         rIdx--;
         object->removeFromParentAndCleanup(false);
         object->setScale(1);
         object->setVisible(true);
 
-        if (auto cmi = typeinfo_cast<CreateMenuItem*>(object)) {
+        if (m_hasCreateItems) {
+            auto cmi = static_cast<CreateMenuItem*>(object);
             cmi->m_tabIndex = m_tabIndex;
+            cmi->m_baseScale = 1.f;
         }
-        
-        if (auto item = typeinfo_cast<CCMenuItemSpriteExtra*>(object)) {
+        else if (auto item = typeinfo_cast<CCMenuItemSpriteExtra*>(object)) {
             item->m_baseScale = 1.f;
         }
 

src/modules/ScrollableObjects.hpp

@@ -14,8 +14,13 @@ class $globalModule(ScrollableObjects) {
 class $modify(SOEditorUI, EditorUI) {
     $registerGlobalHooks(ScrollableObjects, true)
 
+    struct Fields {
+        bool m_shouldLoadBars;
+    };
+
     bool init(LevelEditorLayer* editorLayer);
     void updateCreateMenu(bool selectTab);
+    bool shouldLoadBars();
 
     static void _onModify(auto& self) {
         (void) self.setHookPriorityAfterPost("EditorUI::init", "alphalaneous.editortab_api");