pxt-common-packages 9.4.7 → 9.5.1

package/libs/sprite-scaling/scaling.ts

@@ -1,15 +1,15 @@
-namespace sprites {
-    //% blockId=sprite_set_scale_ex
-    //% block="set $sprite=variables_get(mySprite) scale to $value || $direction anchor $anchor"
-    //% advanced=true
+//% color="#95078E" weight=99 icon="\u2195" block="Sprite Scaling"
+namespace scaling {
+    //% blockId=sprite_scale_to_percent_ex
+    //% block="set $sprite=variables_get(mySprite) scale to $value percent $direction anchor $anchor"
     //% expandableArgumentMode=enabled
     //% inlineInputMode=inline
-    //% value.defl=1
+    //% value.defl=150
     //% direction.defl=ScaleDirection.Uniformly
     //% anchor.defl=ScaleAnchor.Middle
-    //% help=sprites/sprite-scaling/set-scale
-    //% group="Scale" weight=90
-    export function setScale(sprite: Sprite, value: number, direction?: ScaleDirection, anchor?: ScaleAnchor): void {
+    //% help=sprites/sprite-scaling/scale
+    export function scaleToPercent(sprite: Sprite, value: number, direction?: ScaleDirection, anchor?: ScaleAnchor): void {
+        value /= 100;
         direction = direction || ScaleDirection.Uniformly;
         anchor = anchor || ScaleAnchor.Middle;
 
@@ -22,90 +22,91 @@ namespace sprites {
         sprite.setScaleCore(sx, sy, anchor);
     }
 
-    //% blockId=sprite_grow_by_percent_ex
-    //% block="grow $sprite=variables_get(mySprite) by $amount percent || $direction anchor $anchor"
-    //% advanced=true
+    //% blockId=sprite_scale_by_percent_ex
+    //% block="change $sprite=variables_get(mySprite) scale by $value percent $direction anchor $anchor"
     //% expandableArgumentMode=enabled
     //% inlineInputMode=inline
-    //% amount.defl=10
+    //% value.defl=50
     //% direction.defl=ScaleDirection.Uniformly
     //% anchor.defl=ScaleAnchor.Middle
-    //% help=sprites/sprite-scaling/grow-by-amount
-    //% group="Scale" weight=80
-    export function growByPercent(sprite: Sprite, amount: number, direction?: ScaleDirection, anchor?: ScaleAnchor): void {
-        amount /= 100;
+    //% help=sprites/sprite-scaling/scale
+    export function scaleByPercent(sprite: Sprite, value: number, direction?: ScaleDirection, anchor?: ScaleAnchor): void {
+        value /= 100;
         direction = direction || ScaleDirection.Uniformly;
         anchor = anchor || ScaleAnchor.Middle;
 
         let sx: number;
         let sy: number;
 
-        if (direction & ScaleDirection.Horizontally) sx = sprite.sx + amount;
-        if (direction & ScaleDirection.Vertically) sy = sprite.sy + amount;
+        if (direction & ScaleDirection.Horizontally) sx = sprite.sx + value;
+        if (direction & ScaleDirection.Vertically) sy = sprite.sy + value;
 
         sprite.setScaleCore(sx, sy, anchor);
     }
 
-    //% blockId=sprite_shrink_by_percent_ex
-    //% block="shrink $sprite=variables_get(mySprite) by $amount percent || $direction anchor $anchor"
-    //% advanced=true
+    //% blockId=sprite_scale_to_pixels_ex
+    //% block="set $sprite=variables_get(mySprite) scale to $value pixels $direction anchor $anchor || proportional $proportional"
     //% expandableArgumentMode=enabled
     //% inlineInputMode=inline
-    //% amount.defl=10
-    //% direction.defl=ScaleDirection.Uniformly
-    //% anchor.defl=ScaleAnchor.Middle
-    //% help=sprites/sprite-scaling/shrink-by-percent
-    //% group="Scale" weight=70
-    export function shrinkByPercent(sprite: Sprite, amount: number, direction?: ScaleDirection, anchor?: ScaleAnchor): void {
-        growByPercent(sprite, -amount, direction, anchor);
-    }
-
-    //% blockId=sprite_grow_by_pixels_ex
-    //% block="grow $sprite=variables_get(mySprite) by $amount pixels $direction || anchor $anchor proportional $proportional"
-    //% advanced=true
-    //% expandableArgumentMode=enabled
-    //% inlineInputMode=inline
-    //% amount.defl=10
+    //% value.defl=32
     //% direction.defl=ScaleDirection.Horizontally
     //% anchor.defl=ScaleAnchor.Middle
     //% proportional.defl=0
-    //% help=sprites/sprite-scaling/grow-by-pixels
-    //% group="Scale" weight=60
-    export function growByPixels(sprite: Sprite, amount: number, direction?: ScaleDirection, anchor?: ScaleAnchor, proportional?: boolean): void {
+    //% help=sprites/sprite-scaling/scale
+    export function scaleToPixels(sprite: Sprite, value: number, direction?: ScaleDirection, anchor?: ScaleAnchor, proportional?: boolean): void {
         direction = direction || ScaleDirection.Horizontally;
         anchor = anchor || ScaleAnchor.Middle;
-        if (typeof proportional !== 'boolean') proportional = direction === ScaleDirection.Uniformly;
+
+        if (proportional == null) proportional = direction === ScaleDirection.Uniformly;
 
         let sx: number;
         let sy: number;
 
         if (direction & ScaleDirection.Horizontally) {
             const imgW = sprite.image.width;
-            const newW = sprite.width + amount;
+            const newW = value;
             sx = newW / imgW;
         }
 
         if (direction & ScaleDirection.Vertically) {
             const imgH = sprite.image.height;
-            const newH = sprite.height + amount;
+            const newH = value;
             sy = newH / imgH;
         }
 
         sprite.setScaleCore(sx, sy, anchor, proportional);
     }
 
-    //% blockId=sprite_shrink_by_pixels
-    //% block="shrink $sprite=variables_get(mySprite) by $amount pixels $direction || anchor $anchor proportional $proportional"
-    //% advanced=true
+    //% blockId=sprite_scale_by_pixels_ex
+    //% block="change $sprite=variables_get(mySprite) scale by $value pixels $direction anchor $anchor || proportional $proportional"
     //% expandableArgumentMode=enabled
     //% inlineInputMode=inline
-    //% amount.defl=10
+    //% value.defl=10
     //% direction.defl=ScaleDirection.Horizontally
     //% anchor.defl=ScaleAnchor.Middle
     //% proportional.defl=0
-    //% help=sprites/sprite-scaling/grow-by-pixels
-    //% group="Scale" weight=50
-    export function shrinkByPixels(sprite: Sprite, amount: number, direction?: ScaleDirection, anchor?: ScaleAnchor, proportional?: boolean): void {
-        growByPixels(sprite, -amount, direction, anchor, proportional);
+    //% help=sprites/sprite-scaling/scale
+    export function scaleByPixels(sprite: Sprite, value: number, direction?: ScaleDirection, anchor?: ScaleAnchor, proportional?: boolean): void {
+        direction = direction || ScaleDirection.Horizontally;
+        anchor = anchor || ScaleAnchor.Middle;
+
+        if (proportional == null) proportional = direction === ScaleDirection.Uniformly;
+
+        let sx: number;
+        let sy: number;
+
+        if (direction & ScaleDirection.Horizontally) {
+            const imgW = sprite.image.width;
+            const newW = sprite.width + value;
+            sx = newW / imgW;
+        }
+
+        if (direction & ScaleDirection.Vertically) {
+            const imgH = sprite.image.height;
+            const newH = sprite.height + value;
+            sy = newH / imgH;
+        }
+
+        sprite.setScaleCore(sx, sy, anchor, proportional);
     }
 }