Fixes

Author: Alphalaneous

README.md

@@ -108,7 +108,7 @@ All things related to objects.
 ### ​  Single Deselect
 - <c-dddddd>Allows for you to hold a modifier to deselect objects within an existing selection.</c>
 
-###   Edit Tools
+### ​  Edit Tools
 - <c-dddddd>Adds a button and keybind to center the selected object to the camera poisiton.</c>
 - <c-dddddd>Adds a button and keybind to center the camera to the selected object's position.</c>
 

about.md

@@ -124,7 +124,7 @@ All things related to objects.
 ### ​  Single Deselect
 - <c-dddddd>Allows for you to hold a modifier to deselect objects within an existing selection.</c>
 
-###   Edit Tools
+### ​  Edit Tools
 - <c-dddddd>Adds a button and keybind to center the selected object to the camera poisiton.</c>
 - <c-dddddd>Adds a button and keybind to center the camera to the selected object's position.</c>
 

changelog.md

@@ -1,3 +1,9 @@
+# 1.0.10
+- <c-dddddd>Fix a crash when selecting triggers with insane duration amounts</c>
+- <c-dddddd>Fix align button alignment (lol) being wrong sometimes</c>
+- <c-dddddd>Fix a mistake in the description</c>
+- <c-dddddd>Fix scale of object groups popup</c>
+
 # 1.0.9
 - <c-dddddd>Object Groups compatibility fixes for Scrollable Toolbar, Object Tooltips, and Search</c>
 

mod.json

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

src/modules/DurationDrag/DurationControl.cpp

@@ -173,6 +173,9 @@ void DurationControl::addObject(EffectGameObject* object) {
 void DurationControl::setMenuPosition(const CCPoint& point, const CCPoint& anchor) {
     m_buttonsMenu->setPosition(point);
     m_buttonsMenu->setAnchorPoint(anchor);
+    // cocos for some reason isn't updating the positon and anchor properly so I do this
+    m_buttonsMenu->m_bTransformDirty = true;
+    m_buttonsMenu->m_bPositionDirty = true;
 }
 
 void DurationControl::updateObjects(EditorUI* editorUI) {

src/modules/DurationDrag/DurationDrag.cpp

@@ -40,7 +40,7 @@ void DDEditorUI::selectObjects(CCArray* objects, bool ignoreFilter) {
 	DurationDrag::get()->updateObjects();
 }
 
-void DurationDragDraw::drawDottedLine(const CCPoint& start, const CCPoint& end, const LineColor& color, float lineWidth, float dashLength, float gapLength) {
+void DurationDragDraw::drawDottedLine(const CCPoint& start, const CCPoint& end, const LineColor& color, float minX, float maxX, float minY, float maxY) {
     float dx = end.x - start.x;
     float dy = end.y - start.y;
     float totalDist = std::sqrt(dx * dx + dy * dy);
@@ -50,16 +50,26 @@ void DurationDragDraw::drawDottedLine(const CCPoint& start, const CCPoint& end,
     float dirX = dx / totalDist;
     float dirY = dy / totalDist;
 
+    constexpr float dashLength = 10.f;
+    constexpr float lineWidth = 2.f;
+    constexpr float gapLength = 5.f;
+
     float traveled = 0.f;
     while (traveled < totalDist) {
         float segmentLength = std::min(dashLength, totalDist - traveled);
 
         ccVertex2F segStart = { start.x + dirX * traveled, start.y + dirY * traveled };
         ccVertex2F segEnd   = { start.x + dirX * (traveled + segmentLength), start.y + dirY * (traveled + segmentLength) };
 
-        DrawGridAPI::get().drawLine(segStart, segEnd, color, lineWidth);
+        if (segStart.x > maxX || segStart.y > maxY) break;
+
+        traveled += (dashLength + gapLength);
 
-        traveled += dashLength + gapLength;
+        if (segEnd.x < minX || segEnd.y < minY) {
+            continue;
+        }
+
+        DrawGridAPI::get().drawLine(segStart, segEnd, color, lineWidth);
     }
 }
 
@@ -127,7 +137,7 @@ void DurationDragDraw::draw(DrawGridLayer* dgl, float minX, float maxX, float mi
                         end.x = std::max(end.x, 0.f);
                     }
 
-                    drawDottedLine(end, centerPoint, {145, 170, 255, 180});
+                    drawDottedLine(end, centerPoint, {145, 170, 255, 180}, minX, maxX, minY, maxY);
                 }
             }
         }
@@ -150,7 +160,7 @@ void DurationDragDraw::draw(DrawGridLayer* dgl, float minX, float maxX, float mi
 
         if (object->getPositionX() < 0 && !object->m_isSpawnTriggered) {
 
-            drawDottedLine(object->getPosition(), {0, object->getPositionY()}, color);
+            drawDottedLine(object->getPosition(), {0, object->getPositionY()}, color, minX, maxX, minY, maxY);
 
             if (object->m_objectID == 1006) {
                 drawPulseLine(object, 0);

src/modules/DurationDrag/DurationDrag.hpp

@@ -31,6 +31,6 @@ class $modify(DDEditorUI, EditorUI) {
 };
 
 class DurationDragDraw : public DrawNode {
-	static void drawDottedLine(const CCPoint& start, const CCPoint& end, const LineColor& color, float lineWidth = 2.f, float dashLength = 10.f, float gapLength = 5.f);
+	static void drawDottedLine(const CCPoint& start, const CCPoint& end, const LineColor& color, float minX, float maxX, float minY, float maxY);
 	void draw(DrawGridLayer* dgl, float minX, float maxX, float minY, float maxY);
 };

src/modules/ScrollableObjects.cpp

@@ -640,8 +640,8 @@ class $nodeModify(SOGroup, Group) {
                 removeFromParentAndCleanup(false);
                 auto nodePos = parent->convertToNodeSpace(worldPos);
                 setPosition(nodePos);
+                setScale(menu->getScale());
 
-                setScale(parent->getScale());
                 parent->addChild(this);
             }));
         });