com.wallstop-studios.unity-helpers 2.0.0-rc74.6 → 2.0.0-rc74.8

package/Editor/Sprites/SpriteCropper.cs

@@ -352,25 +352,32 @@
                 }
             );
 
-            int cropWidth;
-            int cropHeight;
-            if (!hasVisible)
+            int origMinX = minX;
+            int origMinY = minY;
+            int origMaxX = maxX;
+            int origMaxY = maxY;
+
+            int visibleMinX = minX;
+            int visibleMinY = minY;
+            int visibleMaxX = maxX;
+            int visibleMaxY = maxY;
+
+            if (hasVisible)
             {
-                cropWidth = 1;
-                cropHeight = 1;
-                minX = 0;
-                minY = 0;
+                visibleMinX -= _leftPadding;
+                visibleMinY -= _bottomPadding;
+                visibleMaxX += _rightPadding;
+                visibleMaxY += _topPadding;
             }
             else
             {
-                minX = Mathf.Max(0, minX - _leftPadding);
-                minY = Mathf.Max(0, minY - _bottomPadding);
-                maxX = Mathf.Min(width, maxX + _rightPadding);
-                maxY = Mathf.Min(height, maxY + _topPadding);
-                cropWidth = maxX - minX + 1;
-                cropHeight = maxY - minY + 1;
+                visibleMinX = visibleMinY = 0;
+                visibleMaxX = visibleMaxY = 0;
             }
 
+            int cropWidth = visibleMaxX - visibleMinX + 1;
+            int cropHeight = visibleMaxY - visibleMinY + 1;
+
             if (_onlyNecessary && (!hasVisible || (cropWidth == width && cropHeight == height)))
             {
                 return null;
@@ -384,11 +391,33 @@
                 cropHeight,
                 y =>
                 {
-                    int sourceYOffset = (y + minY) * width;
-                    int destYOffset = y * cropWidth;
+                    int destRow = y * cropWidth;
                     for (int x = 0; x < cropWidth; ++x)
                     {
-                        croppedPixels[destYOffset + x] = pixels[sourceYOffset + x + minX];
+                        int srcX = visibleMinX + x;
+                        int srcY = visibleMinY + y;
+
+                        bool insideOriginal =
+                            srcX >= origMinX
+                            && srcX <= origMaxX
+                            && srcY >= origMinY
+                            && srcY <= origMaxY;
+
+                        if (insideOriginal)
+                        {
+                            if (0 <= srcX && srcX < width && 0 <= srcY && srcY < height)
+                            {
+                                croppedPixels[destRow + x] = pixels[srcY * width + srcX];
+                            }
+                            else
+                            {
+                                croppedPixels[destRow + x] = Color.clear;
+                            }
+                        }
+                        else
+                        {
+                            croppedPixels[destRow + x] = Color.clear;
+                        }
                     }
                 }
             );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc74.6",
+  "version": "2.0.0-rc74.8",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},
@@ -59,6 +59,8 @@
 
 
 
+
+