Fix texture rotation, fix callbacks, add hex

Alphalaneous · Dec 20, 2024 · 84bc420 · 84bc420
1 parent e8ce717
commit 84bc420
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+## 1.7.5
+- Allow inputting hex colors
+- Fix sprite frame texture rotate bug
+- Fix an issue where onCreator and onGarage wouldn't work
+
 ## 1.7.4
 - Fix a crash that can occur when pressing space on the main menu
 - Fix a crash that can occur with invalid parents

diff --git a/mod.json b/mod.json
@@ -5,7 +5,7 @@
         "android": "2.2074",
         "mac": "2.2074"
     },
-    "version": "v1.7.4",
+    "version": "v1.7.5",
     "id": "alphalaneous.happy_textures",
     "name": "Happy Textures :3",
     "developer": "Alphalaneous",

diff --git a/src/UIModding.cpp b/src/UIModding.cpp
@@ -818,6 +818,18 @@ void UIModding::setColor(CCNode* node, matjson::Value attributes) {
                     }
                 }
             }
+            else if (utils::string::startsWith(colorStr, "#")) {
+                ccColor3B color = cc3bFromHexString(colorStr).unwrapOr(ccColor3B{255, 0, 255});
+                if (CCMenuItemSpriteExtra* node1 = typeinfo_cast<CCMenuItemSpriteExtra*>(node)) {
+                    node1->setColor(color);
+                    if (ButtonSprite* node2 = node1->getChildByType<ButtonSprite>(0)) {
+                        node2->setColor(color);
+                    }
+                }
+                if (CCRGBAProtocol* node1 = typeinfo_cast<CCRGBAProtocol*>(node)) {
+                    node1->setColor(color);
+                }
+            }
         }
     }
 }
@@ -975,7 +987,7 @@ void UIModding::setSprite(CCNode* node, matjson::Value attributes) {
 
         if (CCSprite* spriteNode = typeinfo_cast<CCSprite*>(node)) {
             spriteNode->setTexture(spr->getTexture());
-            spriteNode->setTextureRect(spr->getTextureRect());
+            spriteNode->setTextureRect(spr->getTextureRect(), spr->isTextureRectRotated(), spr->getContentSize());
         }
         if (CCMenuItemSpriteExtra* buttonNode = typeinfo_cast<CCMenuItemSpriteExtra*>(node)) {
 
@@ -1029,7 +1041,7 @@ void UIModding::setSprite(CCNode* node, matjson::Value attributes) {
             }
             else if (CCSprite* sprite = node->getChildByType<CCSprite>(0)) {
                 sprite->setTexture(spr->getTexture());
-                sprite->setTextureRect(spr->getTextureRect());
+                sprite->setTextureRect(spr->getTextureRect(), spr->isTextureRectRotated(), spr->getContentSize());
                 sprite->setContentSize(spr->getContentSize());
                 buttonNode->setContentSize(spr->getContentSize());
                 sprite->setPosition(buttonNode->getContentSize()/2);
@@ -1049,15 +1061,15 @@ void UIModding::setSpriteFrame(CCNode* node, matjson::Value attributes) {
                 if(spr) {
                     spriteNode->setTextureAtlas(spr->getTextureAtlas());
                     spriteNode->setTexture(spr->getTexture());
-                    spriteNode->setTextureRect(spr->getTextureRect());
+                    spriteNode->setTextureRect(spr->getTextureRect(), spr->isTextureRectRotated(), spr->getContentSize());
                 }
             }
             if (CCMenuItemSpriteExtra* buttonNode = typeinfo_cast<CCMenuItemSpriteExtra*>(node)) {
                 CCSprite* spr = Utils::getValidSpriteFrame(spriteName.c_str());
                 if (spr) {
                     if (CCSprite* spriteNode = buttonNode->getChildByType<CCSprite>(0)) {
                         spriteNode->setTexture(spr->getTexture());
-                        spriteNode->setTextureRect(spr->getTextureRect());
+                        spriteNode->setTextureRect(spr->getTextureRect(), spr->isTextureRectRotated(), spr->getContentSize());
 		                spriteNode->setTextureAtlas(spr->getTextureAtlas());
                         spriteNode->setContentSize(spr->getContentSize());
                         buttonNode->setContentSize(spr->getContentSize());

diff --git a/src/nodes/MenuLayer.h b/src/nodes/MenuLayer.h
@@ -22,6 +22,26 @@ class $modify(MyMenuLayer, MenuLayer) {
         MenuLayer::onPlay(obj);
     }
 
+    void onCreator(CCObject* obj) {
+        if (CCNode* node = typeinfo_cast<CCNode*>(obj)) {
+            if (node->getUserObject("dummy"_spr)) {
+                CCDirector::get()->pushScene(CCTransitionFade::create(0.5, CreatorLayer::scene()));
+                return;
+            }
+        }
+        MenuLayer::onCreator(obj);
+    }
+
+    void onGarage(CCObject* obj) {
+        if (CCNode* node = typeinfo_cast<CCNode*>(obj)) {
+            if (node->getUserObject("dummy"_spr)) {
+                CCDirector::get()->pushScene(CCTransitionFade::create(0.5, GJGarageLayer::scene()));
+                return;
+            }
+        }
+        MenuLayer::onGarage(obj);
+    }
+
     bool init() {
         UIModding::get()->finishedLoad = true;
         if (!MenuLayer::init()) return false;