toLeopard: helper colorInputToJS function

leopard-js · Dec 18, 2023 · b28277f · b28277f
1 parent c527dda
commit b28277f
Showing 1 changed file with 16 additions and 33 deletions.
diff --git a/src/io/leopard/toLeopard.ts b/src/io/leopard/toLeopard.ts
@@ -542,6 +542,16 @@ export default function toLeopard(
       return `this.sprites[${JSON.stringify(targetNameMap[input.value])}]`;
     }
 
+    function colorInputToJS(input: BlockInput.Color | BlockInput.Block): string {
+      if (input.type === "color") {
+        const { r, g, b } = input.value;
+        return `Color.rgb(${r}, ${g}, ${b})`;
+      } else {
+        const num = inputToJS(input, InputShape.Number);
+        return `Color.num(${num})`;
+      }
+    }
+
     function inputToJS(input: BlockInput.Any, desiredInputShape: InputShape): string {
       // TODO: Right now, inputs can be completely undefined if imported from
       // the .sb3 format (because sb3 is weird). This little check will replace
@@ -1405,39 +1415,17 @@ export default function toLeopard(
         case OpCode.sensing_touchingcolor: {
           satisfiesInputShape = InputShape.Boolean;
 
-          if (block.inputs.COLOR.type === "color") {
-            const { r, g, b } = block.inputs.COLOR.value;
-            blockSource = `this.touching(Color.rgb(${r}, ${g}, ${b}))`;
-          } else {
-            const num = inputToJS(block.inputs.COLOR, InputShape.Number);
-            blockSource = `this.touching(Color.num(${num}))`;
-          }
+          const color = colorInputToJS(block.inputs.COLOR);
+          blockSource = `this.touching(${color})`;
 
           break;
         }
 
         case OpCode.sensing_coloristouchingcolor: {
           satisfiesInputShape = InputShape.Boolean;
 
-          let color1: string;
-          let color2: string;
-
-          if (block.inputs.COLOR.type === "color") {
-            const { r, g, b } = block.inputs.COLOR.value;
-            color1 = `Color.rgb(${r}, ${g}, ${b})`;
-          } else {
-            const num = inputToJS(block.inputs.COLOR, InputShape.Number);
-            color1 = `Color.num(${num})`;
-          }
-
-          if (block.inputs.COLOR2.type === "color") {
-            const { r, g, b } = block.inputs.COLOR2.value;
-            color2 = `Color.rgb(${r}, ${g}, ${b})`;
-          } else {
-            const num = inputToJS(block.inputs.COLOR, InputShape.Number);
-            color2 = `Color.num(${num})`;
-          }
-
+          const color1 = colorInputToJS(block.inputs.COLOR);
+          const color2 = colorInputToJS(block.inputs.COLOR2);
           blockSource = `this.colorTouching((${color1}), (${color2}))`;
 
           break;
@@ -2289,13 +2277,8 @@ export default function toLeopard(
         case OpCode.pen_setPenColorToColor: {
           satisfiesInputShape = InputShape.Stack;
 
-          if (block.inputs.COLOR.type === "color") {
-            const { r, g, b } = block.inputs.COLOR.value;
-            blockSource = `this.penColor = Color.rgb(${r}, ${g}, ${b})`;
-          } else {
-            const num = inputToJS(block.inputs.COLOR, InputShape.Number);
-            blockSource = `this.penColor = Color.num(${num})`;
-          }
+          const color = colorInputToJS(block.inputs.COLOR);
+          blockSource = `this.penColor = (${color})`;
 
           break;
         }