From a7e7cd139f735c3ce83a5ec3e9fc6a685f41cf6e Mon Sep 17 00:00:00 2001
From: Emma <emma@cyborggrizzly.com>
Date: Sat, 28 Oct 2023 07:38:29 -0600
Subject: [PATCH] moveOrigin for zoomabledoodler

---
 bundle.js         | 49 ++++++++++++++++++++++++++----------------
 main.ts           | 54 +++++++++++++++++++++++++++++++++++------------
 zoomableCanvas.ts |  7 ++++++
 3 files changed, 79 insertions(+), 31 deletions(-)

diff --git a/bundle.js b/bundle.js
index 59354ae..98e3b92 100644
--- a/bundle.js
+++ b/bundle.js
@@ -747,6 +747,13 @@ class ZoomableDoodler extends Doodler {
         this.origin.y = p.y - (p.y - this.origin.y) * scaleBy;
         this.constrainOrigin();
     }
+    moveOrigin(motion) {
+        if (this.scale > 1) {
+            this.origin.x += motion.x;
+            this.origin.y += motion.y;
+            this.constrainOrigin();
+        }
+    }
     drag(prev) {
         if (this.scale > 1) {
             const xOffset = this.mouse.x - prev.x;
@@ -839,25 +846,31 @@ img.hidden;
 document.body.append(img);
 const p = new Vector(200, 200);
 doodler.createLayer(()=>{
-    doodler.drawImageWithOutline(img, new Vector(60, 60));
-    doodler.drawScaled(1.5, ()=>{
-        doodler.line(p.copy().add(-8, 10), p.copy().add(8, 10), {
-            color: "grey",
-            weight: 2
+    const [gamepad] = navigator.getGamepads();
+    if (gamepad) {
+        const leftX = gamepad.axes[0];
+        const leftY = gamepad.axes[1];
+        p.add(Math.min(Math.max(leftX - 0.04, 0), leftX + 0.04), Math.min(Math.max(leftY - 0.04, 0), leftY + 0.04));
+        const rigthX = gamepad.axes[2];
+        const rigthY = gamepad.axes[3];
+        doodler.moveOrigin({
+            x: -rigthX * 5,
+            y: -rigthY * 5
         });
-        doodler.line(p.copy().add(-8, -10), p.copy().add(8, -10), {
-            color: "grey",
-            weight: 2
-        });
-        doodler.line(p, p.copy().add(0, 12), {
-            color: "brown",
-            weight: 4
-        });
-        doodler.line(p, p.copy().add(0, -12), {
-            color: "brown",
-            weight: 4
-        });
-    });
+        if (gamepad.buttons[7].value) {
+            doodler.scaleAt({
+                x: 200,
+                y: 200
+            }, 1 + gamepad.buttons[7].value / 5);
+        }
+        if (gamepad.buttons[6].value) {
+            doodler.scaleAt({
+                x: 200,
+                y: 200
+            }, 1 - gamepad.buttons[6].value / 5);
+        }
+    }
+    doodler.drawImageWithOutline(img, p);
 });
 document.addEventListener("keyup", (e)=>{
     e.preventDefault();
diff --git a/main.ts b/main.ts
index c781ca4..cbdefcd 100644
--- a/main.ts
+++ b/main.ts
@@ -1,6 +1,7 @@
 /// <reference types="./global.d.ts" />
 
 import { initializeDoodler, Vector } from "./mod.ts";
+import { ZoomableDoodler } from "./zoomableCanvas.ts";
 
 initializeDoodler(
   {
@@ -25,7 +26,34 @@ document.body.append(img);
 const p = new Vector(200, 200);
 
 doodler.createLayer(() => {
-  doodler.drawImageWithOutline(img, new Vector(60, 60));
+  const [gamepad] = navigator.getGamepads();
+  const deadzone = 0.04;
+  if (gamepad) {
+    const leftX = gamepad.axes[0];
+    const leftY = gamepad.axes[1];
+    p.add(
+      Math.min(Math.max(leftX - deadzone, 0), leftX + deadzone),
+      Math.min(Math.max(leftY - deadzone, 0), leftY + deadzone),
+    );
+
+    const rigthX = gamepad.axes[2];
+    const rigthY = gamepad.axes[3];
+    (doodler as ZoomableDoodler).moveOrigin({ x: -rigthX * 5, y: -rigthY * 5 });
+
+    if (gamepad.buttons[7].value) {
+      (doodler as ZoomableDoodler).scaleAt(
+        { x: 200, y: 200 },
+        1 + (gamepad.buttons[7].value / 5),
+      );
+    }
+    if (gamepad.buttons[6].value) {
+      (doodler as ZoomableDoodler).scaleAt(
+        { x: 200, y: 200 },
+        1 - (gamepad.buttons[6].value / 5),
+      );
+    }
+  }
+  doodler.drawImageWithOutline(img, p);
   // doodler.line(new Vector(100, 100), new Vector(200, 200))
   // doodler.dot(new Vector(300, 300))
   // doodler.fillCircle(movingVector, 6, { color: 'red' });
@@ -46,18 +74,18 @@ doodler.createLayer(() => {
 
   // doodler.drawSprite(img, new Vector(0, 40), 80, 20, new Vector(100, 300), 80, 20)
 
-  doodler.drawScaled(1.5, () => {
-    doodler.line(p.copy().add(-8, 10), p.copy().add(8, 10), {
-      color: "grey",
-      weight: 2,
-    });
-    doodler.line(p.copy().add(-8, -10), p.copy().add(8, -10), {
-      color: "grey",
-      weight: 2,
-    });
-    doodler.line(p, p.copy().add(0, 12), { color: "brown", weight: 4 });
-    doodler.line(p, p.copy().add(0, -12), { color: "brown", weight: 4 });
-  });
+  // doodler.drawScaled(1.5, () => {
+  //   doodler.line(p.copy().add(-8, 10), p.copy().add(8, 10), {
+  //     color: "grey",
+  //     weight: 2,
+  //   });
+  //   doodler.line(p.copy().add(-8, -10), p.copy().add(8, -10), {
+  //     color: "grey",
+  //     weight: 2,
+  //   });
+  //   doodler.line(p, p.copy().add(0, 12), { color: "brown", weight: 4 });
+  //   doodler.line(p, p.copy().add(0, -12), { color: "brown", weight: 4 });
+  // });
 });
 
 document.addEventListener("keyup", (e) => {
diff --git a/zoomableCanvas.ts b/zoomableCanvas.ts
index 5bc62bd..35a01ce 100644
--- a/zoomableCanvas.ts
+++ b/zoomableCanvas.ts
@@ -197,6 +197,13 @@ export class ZoomableDoodler extends Doodler {
     this.origin.y = p.y - (p.y - this.origin.y) * scaleBy;
     this.constrainOrigin();
   }
+  moveOrigin(motion: Point) {
+    if (this.scale > 1) {
+      this.origin.x += motion.x;
+      this.origin.y += motion.y;
+      this.constrainOrigin();
+    }
+  }
   drag(prev: Point) {
     if (this.scale > 1) {
       const xOffset = this.mouse.x - prev.x;