custom block shape addon -- support for custom shapes (1/2)

Author: SharkPool-SP

src/addons/addons/custom-block-shape/userscript.js

@@ -95,15 +95,25 @@ export default async function ({ addon, console }) {
       const adjustedNotchSize = (multiplier > 1 ? multiplier - 0.05 :
           multiplier < 1 ? multiplier + 0.05 : multiplier) + ((cornerSize - 1) / 10);
       BlockSvg.CUSTOM_NOTCHES.forEach((notch) => {
-        if (!notch.ogLeft) notch.ogLeft = notch.left;
-        if (!notch.ogRight) notch.ogRight = notch.right;
+        if (!notch.ogLeft) {
+          notch.ogLeft = notch.left;
+          notch.ogRight = notch.right;
+        }
         notch.left = scalePathXY(notch.ogLeft, adjustedNotchSize, notchSize);
         notch.right = scalePathXY(notch.ogRight, adjustedNotchSize, notchSize);
       });
 
       /* Custom Shape API Support */
-      // TODO here...
+      BlockSvg.CUSTOM_SHAPES.forEach((shape) => {
+        if (!shape.ogEmptySize) {
+          shape.ogEmptySize = shape.emptyInputWidth;
+          shape.ogEmptyPath = shape.emptyInputPath;
+        }
+        shape.emptyInputWidth = shape.ogEmptySize * multiplier;
+        shape.emptyInputPath = scalePathXY(shape.ogEmptyPath, multiplier, multiplier);
+      });
 
+      BlockSvg.INPUT_SHAPE_HEXAGONAL_WIDTH = 12 * GRID_UNIT * multiplier;
       BlockSvg.INPUT_SHAPE_HEXAGONAL =
         "M " +
         4 * GRID_UNIT * multiplier +
@@ -129,7 +139,7 @@ export default async function ({ addon, console }) {
         "," +
         -4 * GRID_UNIT * multiplier +
         " z";
-      BlockSvg.INPUT_SHAPE_HEXAGONAL_WIDTH = 12 * GRID_UNIT * multiplier;
+      BlockSvg.INPUT_SHAPE_ROUND_WIDTH = 12 * GRID_UNIT * multiplier;
       BlockSvg.INPUT_SHAPE_ROUND =
         "M " +
         4 * GRID_UNIT * multiplier +
@@ -151,7 +161,55 @@ export default async function ({ addon, console }) {
         " 0 0 1 0 -" +
         8 * GRID_UNIT * multiplier +
         " z";
-      BlockSvg.INPUT_SHAPE_ROUND_WIDTH = 12 * GRID_UNIT * multiplier;
+
+      BlockSvg.INPUT_SHAPE_SQUARE_WIDTH = 12 * GRID_UNIT * multiplier;
+      BlockSvg.INPUT_SHAPE_SQUARE =
+        'm 0,4A 4,4 0 0,1 4,0'+
+        ' h ' + (12 * GRID_UNIT * multiplier - 2 * 4) +
+        'a 4,4 0 0,1 4,4' +
+        ' v ' + (8 * GRID_UNIT * multiplier - 2 * 4) +
+        ' a 4,4 0 0,1 -4,4' +
+        ' h ' + (-12 * GRID_UNIT * multiplier + 2 * 4) +
+        'a 4,4 0 0,1 -4,-4 z';
+
+      BlockSvg.INPUT_SHAPE_LEAF_WIDTH = 12 * GRID_UNIT * multiplier;
+      BlockSvg.INPUT_SHAPE_LEAF = 
+        `M ${6 * GRID_UNIT * multiplier} 0
+        l ${2 * GRID_UNIT * multiplier} 0
+        a ${4 * GRID_UNIT * multiplier} ${4 * GRID_UNIT * multiplier} 0 0 1 ${4 * GRID_UNIT * multiplier} ${4 * GRID_UNIT * multiplier}
+        l 0 ${2.4 * GRID_UNIT * multiplier}
+        a ${1.6 * GRID_UNIT * multiplier} ${1.6 * GRID_UNIT * multiplier} 0 0 1 -${1.6 * GRID_UNIT * multiplier} ${1.6 * GRID_UNIT * multiplier}
+        h -${4 * GRID_UNIT * multiplier}
+        l -${2.4 * GRID_UNIT * multiplier} 0
+        a ${4 * GRID_UNIT * multiplier} ${4 * GRID_UNIT * multiplier} 0 0 1 -${4 * GRID_UNIT * multiplier} -${4 * GRID_UNIT * multiplier}
+        l 0 -${2.4 * GRID_UNIT * multiplier}
+        a ${1.6 * GRID_UNIT * multiplier} ${1.6 * GRID_UNIT * multiplier} 0 0 1 ${1.6 * GRID_UNIT * multiplier} -${1.6 * GRID_UNIT * multiplier}
+        z`;
+
+      BlockSvg.INPUT_SHAPE_PLUS_WIDTH = 12 * GRID_UNIT * multiplier;
+      BlockSvg.INPUT_SHAPE_PLUS = 
+        `M ${9 * GRID_UNIT * multiplier} 0
+        a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 1 ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier}
+        l 0 2
+        a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 0 ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier}
+        a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 1 ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier}
+        l 0 4
+        a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 1 -${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier}
+        a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 0 -${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier}
+        l 0 2
+        a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 1 -${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier}
+        h -${6 * GRID_UNIT * multiplier}
+        a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 1 -${GRID_UNIT * multiplier} -${GRID_UNIT * multiplier}
+        l 0 -2
+        a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 0 -${GRID_UNIT * multiplier} -${GRID_UNIT * multiplier}
+        a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 1 -${GRID_UNIT * multiplier} -${GRID_UNIT * multiplier}
+        l 0 -4
+        a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 1 ${GRID_UNIT * multiplier} -${GRID_UNIT * multiplier}
+        a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 0 ${GRID_UNIT * multiplier} -${GRID_UNIT * multiplier}
+        l 0 -2
+        a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 1 ${GRID_UNIT * multiplier} -${GRID_UNIT * multiplier} 
+        z`;
+
       BlockSvg.INPUT_SHAPE_HEIGHT = 8 * GRID_UNIT * multiplier;
       BlockSvg.FIELD_HEIGHT = 8 * GRID_UNIT * multiplier; // NOTE: Determines string input heights
       BlockSvg.FIELD_WIDTH = 6 * GRID_UNIT * Math.min(multiplier, 1) + 10 * GRID_UNIT * Math.max(multiplier - 1, 0);