CCControlUtils bindings

Author: hiimjasmine00

bindings/2.2074/Cocos2d.bro

@@ -5941,10 +5941,21 @@ class cocos2d::ZipUtils {
 
 [[link(win, android)]]
 class cocos2d::extension::CCControlUtils {
-    static cocos2d::CCSprite* addSpriteToTargetWithPosAndAnchor(char const*, cocos2d::CCNode*, cocos2d::CCPoint, cocos2d::CCPoint) = m1 0x3247f0, imac 0x396590;
-    static cocos2d::extension::HSV HSVfromRGB(cocos2d::extension::RGBA) = m1 0x324868, imac 0x3965f0;
-    static cocos2d::extension::RGBA RGBfromHSV(cocos2d::extension::HSV) = m1 0x324914, imac 0x3966e0;
-    static cocos2d::CCRect CCRectUnion(cocos2d::CCRect const&, cocos2d::CCRect const&) = m1 0x324a34, imac 0x396830;
+    static cocos2d::CCSprite* addSpriteToTargetWithPosAndAnchor(char const*, cocos2d::CCNode*, cocos2d::CCPoint, cocos2d::CCPoint) = m1 0x3247f0, imac 0x396590, ios 0x1d4c08;
+    static cocos2d::extension::HSV HSVfromRGB(cocos2d::extension::RGBA) = m1 0x324868, imac 0x3965f0, ios 0x1d4c80;
+    static cocos2d::extension::RGBA RGBfromHSV(cocos2d::extension::HSV) = m1 0x324914, imac 0x3966e0, ios 0x1d4d28;
+    static cocos2d::CCRect CCRectUnion(cocos2d::CCRect const&, cocos2d::CCRect const&) = m1 0x324a34, imac 0x396830, ios inline {
+        CCRect result;
+        auto x1 = std::min(p0.getMinX(), p1.getMinX());
+        auto x2 = std::max(p0.getMaxX(), p1.getMaxX());
+        auto y1 = std::min(p0.getMinY(), p1.getMinY());
+        auto y2 = std::max(p0.getMaxY(), p1.getMaxY());
+        result.origin.x = x1;
+        result.origin.y = x2;
+        result.size.width = x2 - x1;
+        result.size.height = y2 - y1;
+        return result;
+    }
 }
 
 [[link(win, android)]]

scripts/ghidra/ScriptWrapper.java

@@ -519,6 +519,9 @@ boolean typeIsStruct(DataType type, Platform platform) {
         if (platform == Platform.WINDOWS32 || platform == Platform.WINDOWS64) {
             return true;
         }
+        if (type.getName().startsWith("RGBA") || type.getName().startsWith("HSV")) {
+            return false;
+        }
         if (type.getName().startsWith("CCPoint") || type.getName().startsWith("CCSize") || type.getName().startsWith("CCRect")) {
             return true;
         }
@@ -881,6 +884,27 @@ else if (platform == Platform.ANDROID32 || platform == Platform.ANDROID64) { //
         ccHSVValue.setPackingEnabled(true);
         manager.addDataType(ccHSVValue, DataTypeConflictHandler.REPLACE_HANDLER);
 
+        // cocos2d::extension::RGBA
+
+        cat = this.createCategoryAll(category.extend("cocos2d", "extension", "RGBA"));
+        var rgba = new StructureDataType(cat, cat.getName(), 0x0);
+        rgba.add(DoubleDataType.dataType, 0x8, "r", "Red component");
+        rgba.add(DoubleDataType.dataType, 0x8, "g", "Green component");
+        rgba.add(DoubleDataType.dataType, 0x8, "b", "Blue component");
+        rgba.add(DoubleDataType.dataType, 0x8, "a", "Alpha component");
+        rgba.setPackingEnabled(true);
+        manager.addDataType(rgba, DataTypeConflictHandler.REPLACE_HANDLER);
+
+        // cocos2d::extension::HSV
+
+        cat = this.createCategoryAll(category.extend("cocos2d", "extension", "HSV"));
+        var hsv = new StructureDataType(cat, cat.getName(), 0x0);
+        hsv.add(DoubleDataType.dataType, 0x8, "h", "Hue");
+        hsv.add(DoubleDataType.dataType, 0x8, "s", "Saturation");
+        hsv.add(DoubleDataType.dataType, 0x8, "v", "Value");
+        hsv.setPackingEnabled(true);
+        manager.addDataType(hsv, DataTypeConflictHandler.REPLACE_HANDLER);
+
         // cocos2d::SEL_MenuHandler
 
         cat = this.createCategoryAll(category.extend("cocos2d", "SEL_MenuHandler"));