teletilting

This commit is contained in:
Gavin McDonald
2025-06-27 18:14:06 -04:00
parent a0e4f54ed9
commit 2ae4c6a77b
7 changed files with 93 additions and 38 deletions

View File

@@ -1,6 +1,6 @@
'use client'; 'use client';
import { createContext, useContext, useState, ReactNode } from 'react'; import { createContext, useContext, useEffect, useState, ReactNode } from 'react';
import useSocket from '@/hooks/useSocket'; import useSocket from '@/hooks/useSocket';
import type { GameUpdate, Tilt } from '@/types'; import type { GameUpdate, Tilt } from '@/types';
@@ -17,12 +17,13 @@ const gameStart: GameUpdate = {
notes: false, notes: false,
cardStyle: 'color', cardStyle: 'color',
}, },
tilts: Array.from({ length: 5 }, () => []),
}; };
export interface AppContext { export interface AppContext {
gameData: GameUpdate; gameData: GameUpdate;
noGame: boolean; noGame: boolean;
tilts: Tilt[]; tilt: Tilt[];
selectCardIndex: number; selectCardIndex: number;
flipCard: (cardIndex: number) => void; flipCard: (cardIndex: number) => void;
handleSettings: (gameData: GameUpdate) => void; handleSettings: (gameData: GameUpdate) => void;
@@ -30,7 +31,7 @@ export interface AppContext {
select: (cardID: string) => void; select: (cardID: string) => void;
setGameID: (gameID: string) => void; setGameID: (gameID: string) => void;
setSelectCardIndex: (cardIndex: number) => void; setSelectCardIndex: (cardIndex: number) => void;
setTilts: (tilts: Tilt[]) => void; setTilt: (tilt: Tilt[]) => void;
} }
export function AppProvider({ children }: { children: ReactNode }) { export function AppProvider({ children }: { children: ReactNode }) {
@@ -38,14 +39,22 @@ export function AppProvider({ children }: { children: ReactNode }) {
const [gameID, setGameID] = useState(''); const [gameID, setGameID] = useState('');
const [noGame, setNoGame] = useState(false); const [noGame, setNoGame] = useState(false);
const [selectCardIndex, setSelectCardIndex] = useState(-1); const [selectCardIndex, setSelectCardIndex] = useState(-1);
const [tilts, setTilts] = useState<Tilt[]>([]); const [tilt, setTilt] = useState<Tilt[]>([]);
const { flipCard, redraw, select, handleSettings } = useSocket({ const { flipCard, redraw, select, handleSettings, emitTilt } = useSocket({
gameID, gameID,
setGameData, setGameData,
setNoGame, setNoGame,
}); });
useEffect(() => {
const cardIndex = tilt.findIndex((tilt) => !!tilt);
if (tilt[cardIndex]) {
emitTilt(cardIndex, tilt[cardIndex]);
}
}, [tilt]);
const handleSelect = (cardID: string) => { const handleSelect = (cardID: string) => {
setSelectCardIndex(-1); setSelectCardIndex(-1);
@@ -55,7 +64,7 @@ export function AppProvider({ children }: { children: ReactNode }) {
const appInterface = { const appInterface = {
gameData, gameData,
noGame, noGame,
tilts, tilt,
selectCardIndex, selectCardIndex,
flipCard, flipCard,
handleSettings, handleSettings,
@@ -63,7 +72,7 @@ export function AppProvider({ children }: { children: ReactNode }) {
select: handleSelect, select: handleSelect,
setGameID, setGameID,
setSelectCardIndex, setSelectCardIndex,
setTilts, setTilt,
}; };
return <AppContext.Provider value={appInterface}>{children}</AppContext.Provider>; return <AppContext.Provider value={appInterface}>{children}</AppContext.Provider>;

View File

@@ -55,7 +55,7 @@ export default function Card({ card, cardIndex }: CardProps) {
<ToolTip content={tooltip || getTooltip()}> <ToolTip content={tooltip || getTooltip()}>
<TiltCard <TiltCard
className={`h-[21vh] w-[15vh] relative perspective transition-transform duration-200 z-0 hover:z-10 hover:scale-150 ${isDM ? 'cursor-pointer' : ''} `} className={`h-[21vh] w-[15vh] relative perspective transition-transform duration-200 z-0 hover:z-10 hover:scale-150 ${isDM ? 'cursor-pointer' : ''} `}
cardID={position.id} cardIndex={cardIndex}
> >
<div <div
className={`absolute inset-0 transition-transform duration-500 transform-style-preserve-3d ${flipped ? 'rotate-y-180' : ''}`} className={`absolute inset-0 transition-transform duration-500 transform-style-preserve-3d ${flipped ? 'rotate-y-180' : ''}`}

View File

@@ -1,39 +1,51 @@
import { useEffect, useRef } from 'react'; import { useEffect, useRef } from 'react';
import { useAppContext } from '@/app/AppContext'; import { useAppContext } from '@/app/AppContext';
import type { Tilt } from '@/types';
export default function TiltCard({ export default function TiltCard({
children, children,
cardID, cardIndex,
className = '', className = '',
}: { }: {
children: React.ReactNode; children: React.ReactNode;
cardID: string; cardIndex: number;
className?: string; className?: string;
}) { }) {
const cardRef = useRef<HTMLDivElement>(null); const cardRef = useRef<HTMLDivElement>(null);
const { tilts, setTilts } = useAppContext(); const { gameData, setTilt } = useAppContext();
const card = cardRef.current;
useEffect(() => { useEffect(() => {
const card = cardRef.current;
if (!card) return; if (!card) return;
const tilt = tilts.find((tilt) => tilt.cardID === cardID); const tilt = gameData.tilts[cardIndex];
if (!tilt) { if (!tilt) {
card.style.transform = `rotateX(0deg) rotateY(0deg)`; card.style.transform = `rotateX(0deg) rotateY(0deg)`;
return; return;
} }
const { rotateX, rotateY } = tilt; const tilted = tilt.filter(({ rotateX, rotateY }) => rotateX || rotateY);
const { totalX, totalY } = tilted.reduce(
({ totalX, totalY }, { rotateX, rotateY }) => ({
totalX: totalX + rotateX,
totalY: totalY + rotateY,
}),
{ totalX: 0, totalY: 0 },
);
const rotateX = totalX / tilted.length;
const rotateY = totalY / tilted.length;
if (rotateX || rotateY) { if (rotateX || rotateY) {
card.style.transform = `rotateX(${rotateX}deg) rotateY(${rotateY}deg)`; card.style.transform = `rotateX(${rotateX}deg) rotateY(${rotateY}deg)`;
} else { } else {
card.style.transform = `rotateX(0deg) rotateY(0deg)`; card.style.transform = `rotateX(0deg) rotateY(0deg)`;
} }
}, [tilts]); }, [gameData]);
const handleMouseMove = (e: React.MouseEvent) => { const handleMouseMove = (e: React.MouseEvent) => {
const card = cardRef.current;
if (!card) return; if (!card) return;
const rect = card.getBoundingClientRect(); const rect = card.getBoundingClientRect();
@@ -45,13 +57,14 @@ export default function TiltCard({
const rotateX = ((y - centerY) / centerY) * -20; const rotateX = ((y - centerY) / centerY) * -20;
const rotateY = ((x - centerX) / centerX) * 20; const rotateY = ((x - centerX) / centerX) * 20;
setTilts([...tilts.filter((tilt) => tilt.cardID !== cardID), { cardID, rotateX, rotateY }]); const newTilt: Tilt[] = [];
newTilt[cardIndex] = { rotateX, rotateY };
setTilt(newTilt);
}; };
const handleMouseLeave = () => { const handleMouseLeave = () => {
if (!card) return; setTilt([]);
setTilts(tilts.filter((tilt) => tilt.cardID !== cardID));
}; };
return ( return (

View File

@@ -1,7 +1,8 @@
import { useEffect } from 'react'; import { useEffect } from 'react';
import { socket } from '@/socket'; import { socket } from '@/socket';
import throttle from '@/tools/throttle';
import type { GameUpdate } from '@/types'; import type { GameUpdate, Tilt } from '@/types';
interface UseSocketProps { interface UseSocketProps {
gameID: string; gameID: string;
@@ -44,6 +45,13 @@ export default function useSocket({ gameID, setGameData, setNoGame }: UseSocketP
}); });
}; };
const handleSettings = (gameData: GameUpdate) => {
socket.emit('settings', {
gameID,
gameData,
});
};
const redraw = (cardIndex: number) => { const redraw = (cardIndex: number) => {
socket.emit('redraw', { socket.emit('redraw', {
gameID, gameID,
@@ -59,17 +67,18 @@ export default function useSocket({ gameID, setGameData, setNoGame }: UseSocketP
}); });
}; };
const handleSettings = (gameData: GameUpdate) => { const emitTilt = throttle((cardIndex: number, tilt: Tilt) => {
socket.emit('settings', { socket.emit('tilt', {
gameID, cardIndex,
gameData, tilt,
}); });
}; }, 33.3);
return { return {
flipCard, flipCard,
handleSettings,
redraw, redraw,
select, select,
handleSettings, emitTilt,
}; };
} }

View File

@@ -2,7 +2,7 @@ import Deck from '@/lib/TarokkaDeck';
import generateID from '@/tools/simpleID'; import generateID from '@/tools/simpleID';
import parseMilliseconds from '@/tools/parseMilliseconds'; import parseMilliseconds from '@/tools/parseMilliseconds';
import { HOUR, DAY } from '@/constants/time'; import { HOUR, DAY } from '@/constants/time';
import { GameState, GameUpdate, Settings } from '@/types'; import { GameState, GameUpdate, Settings, Tilt } from '@/types';
const deck = new Deck(); const deck = new Deck();
@@ -91,6 +91,7 @@ export default class GameStore {
notes: true, notes: true,
cardStyle: 'color', cardStyle: 'color',
}, },
tilts: Array.from({ length: 5 }, () => []),
}; };
this.totalCreated++; this.totalCreated++;
@@ -157,6 +158,21 @@ export default class GameStore {
return this.gameUpdate(game); return this.gameUpdate(game);
} }
tilt(playerID: string, cardIndex: number, { rotateX, rotateY }: Tilt) {
const game = this.getGameByPlayerID(playerID);
const cardTilts = game.tilts[cardIndex];
if (!cardTilts) throw new Error(`Card tilts ${cardIndex} not found`);
game.tilts[cardIndex] = [
...cardTilts.filter((tilt) => tilt.playerID !== playerID),
{ playerID, rotateX, rotateY },
];
game.lastUpdated = Date.now();
return this.gameUpdate(game);
}
updateSettings(gameID: string, settings: Settings) { updateSettings(gameID: string, settings: Settings) {
const game = this.getGame(gameID); const game = this.getGame(gameID);
@@ -173,10 +189,18 @@ export default class GameStore {
return game; return game;
} }
gameUpdate(game: GameState): GameUpdate { getGameByPlayerID(playerID: string): GameState {
const { dmID, spectatorID, cards, settings } = game; const game = this.players.get(playerID);
return { dmID, spectatorID, cards, settings }; if (!game) throw new Error(`Player ${playerID} not found`);
return game;
}
gameUpdate(game: GameState): GameUpdate {
const { dmID, spectatorID, cards, settings, tilts } = game;
return { dmID, spectatorID, cards, settings, tilts };
} }
playerExit(playerID: string): GameState | null { playerExit(playerID: string): GameState | null {
@@ -185,9 +209,7 @@ export default class GameStore {
return null; return null;
} else { } else {
const game = this.players.get(playerID); const game = this.getGameByPlayerID(playerID);
if (!game) throw new Error(`Player ${playerID} not found`);
this.players.delete(playerID); this.players.delete(playerID);
return this.leaveGame(game, playerID); return this.leaveGame(game, playerID);

View File

@@ -119,10 +119,10 @@ app.prepare().then(() => {
} }
}); });
socket.on('tilt', ({ gameID, tilt }: { gameID: string; tilt: Tilt }) => { socket.on('tilt', ({ cardIndex, tilt }: { cardIndex: number; tilt: Tilt }) => {
try { try {
const gameState = gameStore.getGame(gameID); const gameState = gameStore.tilt(socket.id, cardIndex, tilt);
broadcast('tilt', gameState); broadcast('game-update', gameState);
} catch (e) { } catch (e) {
const error = e instanceof Error ? e.message : e; const error = e instanceof Error ? e.message : e;
console.error(Date.now(), 'Error[tilt]', error); console.error(Date.now(), 'Error[tilt]', error);

View File

@@ -82,6 +82,7 @@ export interface GameState {
cards: TarokkaGameCard[]; cards: TarokkaGameCard[];
lastUpdated: number; lastUpdated: number;
settings: Settings; settings: Settings;
tilts: Tilt[][];
} }
export interface GameUpdate { export interface GameUpdate {
@@ -89,6 +90,7 @@ export interface GameUpdate {
spectatorID: string; spectatorID: string;
cards: TarokkaGameCard[]; cards: TarokkaGameCard[];
settings: Settings; settings: Settings;
tilts: Tilt[][];
} }
export interface ClientUpdate { export interface ClientUpdate {
@@ -105,7 +107,7 @@ export interface Layout {
} }
export interface Tilt { export interface Tilt {
cardID: string; playerID?: string;
rotateX: number; rotateX: number;
rotateY: number; rotateY: number;
} }