From 903c66b1d9d4e06e777dc74d9cd36415d3d37667 Mon Sep 17 00:00:00 2001
From: dylan <>
Date: Thu, 4 Apr 2024 08:58:39 -0700
Subject: [PATCH] comment out gpio stuff

---
 src/client/GamePage.tsx                  | 44 ++++++++-------
 src/client/pico8-client/Pico8Console.tsx | 11 ++--
 src/client/pico8-client/renderCart.ts    | 69 +++++++++++++++---------
 3 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/src/client/GamePage.tsx b/src/client/GamePage.tsx
index f543db7..4a3beed 100644
--- a/src/client/GamePage.tsx
+++ b/src/client/GamePage.tsx
@@ -19,19 +19,19 @@ export const GamePage = () => {
 		url: `/api/ws/room?room=${room}`,
 		// url: "wss://echo.websocket.org",
 		onMessage({message}) {
-			const msg = message as any;
-			if (msg.type === "gpio") {
-				if (picoRef.current) {
-					const handle = picoRef.current.getPicoConsoleHandle();
-					if (handle) {
-						console.log("updating pico gpio");
-						(handle.gpio as any).dontSend = true;
-						handle.gpio.length = 0;
-						handle.gpio.push(...msg.gpio);
-						(handle.gpio as any).dontSend = false;
-					}
-				}
-			}
+			// const msg = message as any;
+			// if (msg.type === "gpio") {
+			// 	if (picoRef.current) {
+			// 		const handle = picoRef.current.getPicoConsoleHandle();
+			// 		if (handle) {
+			// 			console.log("updating pico gpio");
+			// 			(handle.gpio as any).dontSend = true;
+			// 			handle.gpio.length = 0;
+			// 			handle.gpio.push(...msg.gpio);
+			// 			(handle.gpio as any).dontSend = false;
+			// 		}
+			// 	}
+			// }
 			console.log('message', message);
 		}
 	})
@@ -95,13 +95,17 @@ export const GamePage = () => {
 						border: 2px solid limegreen;
 					}
 				`}>
-					<Pico8Console ref={picoRef} carts={info.release.carts} onGpioChange={(gpio: number[]) => {
-						console.log("sending gpio");
-						socket.sendMessage({
-							type: "gpio",
-							gpio,
-						});
-					}} />
+					<Pico8Console
+						ref={picoRef}
+						carts={info.release.carts}
+						// onGpioChange={(gpio: number[]) => {
+						// console.log("sending gpio");
+						// socket.sendMessage({
+						// 	type: "gpio",
+						// 	gpio,
+						// });
+						// }}
+					/>
 				</div>
 				<div className={css`
 					display: flex;
diff --git a/src/client/pico8-client/Pico8Console.tsx b/src/client/pico8-client/Pico8Console.tsx
index fcdbbce..2a70fc7 100644
--- a/src/client/pico8-client/Pico8Console.tsx
+++ b/src/client/pico8-client/Pico8Console.tsx
@@ -8,13 +8,16 @@ export type Pico8ConsoleImperatives = {
 
 export type Pico8ConsoleProps = {
 	carts: PicoCart[],
-	onGpioChange?(gpio: number[]): void,
+	// onGpioChange?(gpio: number[]): void,
 }
 
-const noop = () => {};
+// const noop = () => {};
 
 export const Pico8Console = forwardRef((props: Pico8ConsoleProps, forwardedRef: ForwardedRef<Pico8ConsoleImperatives>) => {
-	const {carts, onGpioChange = noop} = props;
+	const {
+		carts,
+		// onGpioChange = noop
+	} = props;
 	const [playing, setPlaying] = useState(false);
 	const ref = useRef<HTMLDivElement>(null);
 	const [handle, setHandle] = useState<PicoPlayerHandle | null>(null);
@@ -33,7 +36,7 @@ export const Pico8Console = forwardRef((props: Pico8ConsoleProps, forwardedRef:
 			picoConsole.canvas.focus();
 		}
 		setHandle(picoConsole);
-		picoConsole.gpio.subscribe(onGpioChange);
+		// picoConsole.gpio.subscribe(onGpioChange);
 		picoConsole.canvas.addEventListener('keydown',(event) => {
 			if (["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"].includes(event.key)) {
 				event.preventDefault();
diff --git a/src/client/pico8-client/renderCart.ts b/src/client/pico8-client/renderCart.ts
index f9f8df5..98702d2 100644
--- a/src/client/pico8-client/renderCart.ts
+++ b/src/client/pico8-client/renderCart.ts
@@ -35,7 +35,10 @@ export type PicoPlayerHandle = {
 		rightClick: boolean;
 	}) => void;
 	setGamepadCount: (count: number) => void;
-	gpio: number[] & {subscribe: (f: (gpio: number[]) => void) => void}; // read + write (should be 256-tuple)
+	gpio: (
+		number[]
+		// & {subscribe: (f: (gpio: number[]) => void) => void}
+	); // read + write (should be 256-tuple)
 
 	// state
 	readonly state: {
@@ -97,8 +100,7 @@ export const makePicoConsole = async (props: {
 	handle.pico8_state = {};
 	handle.pico8_buttons = [0,0,0,0,0,0,0,0];
 	handle.pico8_mouse = [0,0,0];
-	let gpioChanged = (gpio: number[]) => {};
-	const gpioInner = [
+	handle.pico8_gpio = [
 		0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 		0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 		0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -116,27 +118,46 @@ export const makePicoConsole = async (props: {
 		0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 		0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 	];
-	handle.pico8_gpio = new Proxy(gpioInner, {
-		get(target, prop) {
-			return target[prop as any];
-		},
-		set(target, prop, newValue) {
-			const t = target as any;
-			if (t.setting) {
-				return false;
-			}
-			const prev = [...target];
-			target[prop as any] = newValue;
-			const next = [...target];
-			if (!t.dontSend && prev.some((p, i) => p !== next[i])) {
-				gpioChanged(target);
-			}
-			return true;
-		}
-	});
-	(handle as any).pico8_gpio.subscribe = (f: (gpio: number[]) => void) => {
-		gpioChanged = f;
-	}
+	// let gpioChanged = (gpio: number[]) => {};
+	// const gpioInner = [
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	// ];
+	// handle.pico8_gpio = new Proxy(gpioInner, {
+	// 	get(target, prop) {
+	// 		return target[prop as any];
+	// 	},
+	// 	set(target, prop, newValue) {
+	// 		const t = target as any;
+	// 		if (t.setting) {
+	// 			return false;
+	// 		}
+	// 		const prev = [...target];
+	// 		target[prop as any] = newValue;
+	// 		const next = [...target];
+	// 		if (!t.dontSend && prev.some((p, i) => p !== next[i])) {
+	// 			gpioChanged(target);
+	// 		}
+	// 		return true;
+	// 	}
+	// });
+	// (handle as any).pico8_gpio.subscribe = (f: (gpio: number[]) => void) => {
+	// 	gpioChanged = f;
+	// }
 	handle.pico8_gamepads = {count: 0};
 	return {
 		raw: handle,