Compare commits
4 Commits
1dc342d5c1
...
79479f681d
| Author | SHA1 | Date | |
|---|---|---|---|
| 79479f681d | |||
| 822a66a20f | |||
| f1ee6922b1 | |||
| 06b96fe5ba |
@@ -95,11 +95,9 @@ const handleTouchEnd = (event: TouchEvent) => {
|
||||
);
|
||||
};
|
||||
|
||||
const ndsScale = computed(() => {
|
||||
const scaleX = (windowSize.width.value - 40) / 235;
|
||||
const scaleY = (windowSize.height.value - 40) / 431;
|
||||
return Math.min(scaleX, scaleY);
|
||||
});
|
||||
const ndsScale = computed(() =>
|
||||
getNDS2DScale(windowSize.width.value, windowSize.height.value),
|
||||
);
|
||||
|
||||
const gallery = useGalleryStore();
|
||||
const TOP_SCREEN_OFFSET = 170;
|
||||
|
||||
@@ -151,12 +151,15 @@ onClick((x, y) => {
|
||||
}
|
||||
});
|
||||
|
||||
useKeyDown(({ key }) => {
|
||||
useKeyDown(
|
||||
({ key }) => {
|
||||
if (isAnimating.value) return;
|
||||
if (key === "NDS_X") {
|
||||
handleVisitAll();
|
||||
}
|
||||
});
|
||||
},
|
||||
{ ignoreWhenModalOpen: true },
|
||||
);
|
||||
|
||||
onRender((ctx) => {
|
||||
// slash divider
|
||||
|
||||
@@ -141,7 +141,7 @@ const cellX = (col: number) => BORDER_SIZE + col * (TILE_SIZE + BORDER_SIZE);
|
||||
const cellY = (row: number) => BORDER_SIZE + row * (TILE_SIZE + BORDER_SIZE);
|
||||
|
||||
let tiles: VisualTile[] = [];
|
||||
let animating = false;
|
||||
let moveTimeline: gsap.core.Timeline | null = null;
|
||||
|
||||
const showRestartModal = () => {
|
||||
confirmationModal.open({
|
||||
@@ -415,14 +415,14 @@ if (board.every((r) => r.every((c) => c === 0))) {
|
||||
}
|
||||
|
||||
const slide = (rowDir: number, colDir: number) => {
|
||||
if (isDead() && !confirmationModal.isOpen) {
|
||||
if (isDead()) {
|
||||
showRestartModal();
|
||||
return;
|
||||
}
|
||||
|
||||
if (animating) {
|
||||
gsap.globalTimeline.clear();
|
||||
animating = false;
|
||||
if (moveTimeline) {
|
||||
moveTimeline.kill();
|
||||
moveTimeline = null;
|
||||
buildTilesFromBoard();
|
||||
}
|
||||
|
||||
@@ -553,14 +553,14 @@ const slide = (rowDir: number, colDir: number) => {
|
||||
}
|
||||
|
||||
tiles = animTiles;
|
||||
animating = true;
|
||||
|
||||
const tl = gsap.timeline({
|
||||
onComplete: () => {
|
||||
animating = false;
|
||||
moveTimeline = null;
|
||||
buildTilesFromBoard();
|
||||
},
|
||||
});
|
||||
moveTimeline = tl;
|
||||
|
||||
for (const { tile, toX, toY } of tweens) {
|
||||
tl.to(tile, { x: toX, y: toY, duration: ANIM_DURATION, ease: "none" }, 0);
|
||||
@@ -600,7 +600,8 @@ const slide = (rowDir: number, colDir: number) => {
|
||||
}
|
||||
};
|
||||
|
||||
useKeyDown(({ key }) => {
|
||||
useKeyDown(
|
||||
({ key }) => {
|
||||
if (isAnimating.value) return;
|
||||
switch (key) {
|
||||
case "NDS_UP":
|
||||
@@ -620,7 +621,9 @@ useKeyDown(({ key }) => {
|
||||
slide(0, 1);
|
||||
break;
|
||||
}
|
||||
});
|
||||
},
|
||||
{ ignoreWhenModalOpen: true },
|
||||
);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
||||
@@ -6,11 +6,17 @@ export type KeyDownCallback = (params: {
|
||||
repeated: boolean;
|
||||
}) => void;
|
||||
|
||||
export const useKeyDown = (callback: KeyDownCallback) => {
|
||||
export const useKeyDown = (
|
||||
callback: KeyDownCallback,
|
||||
// the confirmation modal's own buttons rely on useKeyDown, so this is opt-in
|
||||
options: { ignoreWhenModalOpen?: boolean } = {},
|
||||
) => {
|
||||
const app = useAppStore();
|
||||
const confirmationModal = useConfirmationModal();
|
||||
|
||||
const handleKeyDown = (event: KeyboardEvent) => {
|
||||
if (app.lagModalOpen) return;
|
||||
if (options.ignoreWhenModalOpen && confirmationModal.isOpen) return;
|
||||
|
||||
const ndsButton = mapCodeToNDS(event.code);
|
||||
if (
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<script setup lang="ts">
|
||||
import { useWindowSize } from "@vueuse/core";
|
||||
import gsap from "gsap";
|
||||
import { LazyLagModal } from "#components";
|
||||
|
||||
@@ -30,20 +29,6 @@ const bottomScreenCanvas = computed(() => bottomScreen.value?.canvas ?? null);
|
||||
const isTouchDevice = () =>
|
||||
"ontouchstart" in window || navigator.maxTouchPoints > 0;
|
||||
|
||||
const windowSize = useWindowSize();
|
||||
|
||||
watch(
|
||||
[windowSize.width, windowSize.height],
|
||||
([width, height]) => {
|
||||
if (width / height > 614 / 667) {
|
||||
if (app.booted) app.allowHints();
|
||||
} else {
|
||||
app.disallowHints();
|
||||
}
|
||||
},
|
||||
{ immediate: true },
|
||||
);
|
||||
|
||||
const helpButton = useTemplateRef("helpButton");
|
||||
let helpAnimation: gsap.core.Timeline | null = null;
|
||||
|
||||
@@ -105,11 +90,16 @@ const hideHelpLabels = () => {
|
||||
});
|
||||
};
|
||||
|
||||
// help button is removed when hints are disallowed, no need to animate it out
|
||||
watch(
|
||||
() => app.hintsAllowed,
|
||||
(allowed) => {
|
||||
if (!allowed) hideHelpLabels();
|
||||
if (allowed) return;
|
||||
helpAnimation?.kill();
|
||||
helpAnimation = null;
|
||||
app.hintsVisible = false;
|
||||
},
|
||||
{ immediate: true },
|
||||
);
|
||||
|
||||
onMounted(async () => {
|
||||
@@ -129,9 +119,7 @@ onMounted(async () => {
|
||||
});
|
||||
}
|
||||
|
||||
const scaleX = (window.innerWidth - 40) / 235;
|
||||
const scaleY = (window.innerHeight - 40) / 431;
|
||||
const scale = Math.min(scaleX, scaleY);
|
||||
const scale = getNDS2DScale(window.innerWidth, window.innerHeight);
|
||||
|
||||
if (app.settings.renderingMode === "2d" && scale < 1) return;
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { z } from "zod/mini";
|
||||
import { useWindowSize } from "@vueuse/core";
|
||||
import type * as THREE from "three";
|
||||
|
||||
export const LOGICAL_WIDTH = 256;
|
||||
@@ -18,6 +19,24 @@ export const APP_COLORS = [
|
||||
|
||||
const STORAGE_ID = "nds-settings";
|
||||
|
||||
// 2d nds is 414x431, scaled so the screens fit, it overflows horizontally on narrow viewports
|
||||
export const getNDS2DScale = (width: number, height: number) =>
|
||||
Math.min((width - 40) / 235, (height - 40) / 431);
|
||||
|
||||
// 3d: fixed vertical fov, so buttons clip at a fixed aspect ratio (measured: 810px wide at 865px tall)
|
||||
const HINTS_MIN_ASPECT_RATIO_3D = 810 / 865;
|
||||
// 2d: horizontal span of the physical buttons (A button is ~14px from the edge)
|
||||
const NDS2D_BUTTONS_SPAN = 386;
|
||||
|
||||
const screenFitsHints = (
|
||||
width: number,
|
||||
height: number,
|
||||
renderingMode: "3d" | "2d",
|
||||
) =>
|
||||
renderingMode === "3d"
|
||||
? width / height > HINTS_MIN_ASPECT_RATIO_3D
|
||||
: NDS2D_BUTTONS_SPAN * getNDS2DScale(width, height) <= width;
|
||||
|
||||
const settingsSchema = z.object({
|
||||
color: z.object({
|
||||
col: z.number(),
|
||||
@@ -55,7 +74,9 @@ export const useAppStore = defineStore("app", {
|
||||
visitedGallery: false,
|
||||
camera: null as THREE.Camera | null,
|
||||
hintsVisible: false,
|
||||
hintsAllowed: false,
|
||||
// hints wanted by the current app state (intro done, not in gallery)
|
||||
hintsRequested: false,
|
||||
windowSize: useWindowSize(),
|
||||
lagDetected: false,
|
||||
lagModalOpen: false,
|
||||
};
|
||||
@@ -96,12 +117,11 @@ export const useAppStore = defineStore("app", {
|
||||
},
|
||||
|
||||
allowHints() {
|
||||
this.hintsAllowed = true;
|
||||
this.hintsRequested = true;
|
||||
},
|
||||
|
||||
disallowHints() {
|
||||
this.hintsAllowed = false;
|
||||
this.hintsVisible = false;
|
||||
this.hintsRequested = false;
|
||||
},
|
||||
|
||||
showHints() {
|
||||
@@ -128,5 +148,14 @@ export const useAppStore = defineStore("app", {
|
||||
row: state.settings.color.row,
|
||||
hex: APP_COLORS[state.settings.color.row]![state.settings.color.col]!,
|
||||
}),
|
||||
|
||||
// hints wanted and screen large enough
|
||||
hintsAllowed: (state) =>
|
||||
state.hintsRequested &&
|
||||
screenFitsHints(
|
||||
state.windowSize.width,
|
||||
state.windowSize.height,
|
||||
state.settings.renderingMode,
|
||||
),
|
||||
},
|
||||
});
|
||||
|
||||
@@ -67,9 +67,7 @@ export const useIntroStore = defineStore("intro", {
|
||||
)
|
||||
.call(() => {
|
||||
const app = useAppStore();
|
||||
if (window.innerWidth / window.innerHeight > 614 / 667) {
|
||||
app.allowHints();
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
import { defineNuxtModule, useLogger } from "@nuxt/kit";
|
||||
import { readdir, readFile, writeFile } from "fs/promises";
|
||||
import { join, relative, parse } from "path";
|
||||
import { mkdir, readdir, readFile, writeFile } from "fs/promises";
|
||||
import { dirname, join, relative, parse } from "path";
|
||||
import { existsSync, watch } from "fs";
|
||||
import { execSync } from "child_process";
|
||||
import { execFile } from "child_process";
|
||||
import { createHash } from "crypto";
|
||||
import { promisify } from "util";
|
||||
import sharp from "sharp";
|
||||
|
||||
const execFileAsync = promisify(execFile);
|
||||
|
||||
type AtlasRect = {
|
||||
x: number;
|
||||
y: number;
|
||||
@@ -79,6 +83,7 @@ export default defineNuxtModule({
|
||||
const templateFile = join(rootDir, "app/composables/useAssets.ts.in");
|
||||
const outputFile = join(rootDir, "app/composables/useAssets.ts");
|
||||
const atlasOutputPath = join(rootDir, "public/nds/atlas.webp");
|
||||
const atlasHashFile = join(rootDir, "node_modules/.cache/asset-generator/atlas-hash");
|
||||
|
||||
const loadImages = async (
|
||||
paths: string[],
|
||||
@@ -88,10 +93,8 @@ export default defineNuxtModule({
|
||||
await Promise.all(
|
||||
paths.map(async (path) => {
|
||||
try {
|
||||
const [metadata, buffer] = await Promise.all([
|
||||
sharp(path).metadata(),
|
||||
sharp(path).png().toBuffer(),
|
||||
]);
|
||||
const buffer = await readFile(path);
|
||||
const metadata = await sharp(buffer).metadata();
|
||||
|
||||
if (metadata.width && metadata.height) {
|
||||
images.set(path, {
|
||||
@@ -256,7 +259,10 @@ ${sp} }`;
|
||||
|
||||
const generateAssets = async () => {
|
||||
try {
|
||||
const imagePaths = await scanByExt(imagesDir, IMAGE_EXTENSIONS);
|
||||
// sorted so packing (and therefore the atlas hash) is deterministic
|
||||
const imagePaths = (
|
||||
await scanByExt(imagesDir, IMAGE_EXTENSIONS)
|
||||
).sort();
|
||||
const modelPaths = await scanByExt(modelsDir, MODEL_EXTENSIONS);
|
||||
const audioPaths = await scanByExt(audioDir, AUDIO_EXTENSIONS);
|
||||
|
||||
@@ -266,15 +272,30 @@ ${sp} }`;
|
||||
let atlasHash = "";
|
||||
let atlasWidth = 0;
|
||||
let atlasHeight = 0;
|
||||
let atlasCached = false;
|
||||
|
||||
if (imagePaths.length > 0) {
|
||||
const imageMap = await loadImages(imagePaths);
|
||||
const images = Array.from(imageMap.values());
|
||||
const images = imagePaths.flatMap((path) => imageMap.get(path) ?? []);
|
||||
|
||||
const { rects, width, height } = packImages(images);
|
||||
atlasWidth = width;
|
||||
atlasHeight = height;
|
||||
|
||||
const imageTree = buildImageTree(imagePaths, rects);
|
||||
imageCode = generateImageCode(imageTree);
|
||||
|
||||
// imageCode covers names and layout, buffers cover pixels
|
||||
const hash = createHash("sha256").update(imageCode);
|
||||
for (const img of images) hash.update(img.buffer);
|
||||
atlasHash = hash.digest("hex").slice(0, 8);
|
||||
|
||||
const cachedHash = await readFile(atlasHashFile, "utf-8").catch(
|
||||
() => null,
|
||||
);
|
||||
atlasCached = cachedHash === atlasHash && existsSync(atlasOutputPath);
|
||||
|
||||
if (!atlasCached) {
|
||||
const atlasBuffer = await sharp({
|
||||
create: {
|
||||
width,
|
||||
@@ -294,15 +315,18 @@ ${sp} }`;
|
||||
|
||||
await writeFile(atlasOutputPath, atlasBuffer);
|
||||
|
||||
execSync(
|
||||
`magick "${atlasOutputPath}" -define webp:lossless=true -define webp:method=6 "${atlasOutputPath}"`,
|
||||
{ stdio: "pipe" },
|
||||
);
|
||||
await execFileAsync("magick", [
|
||||
atlasOutputPath,
|
||||
"-define",
|
||||
"webp:lossless=true",
|
||||
"-define",
|
||||
"webp:method=6",
|
||||
atlasOutputPath,
|
||||
]);
|
||||
|
||||
atlasHash = Math.random().toString(36).slice(2, 10);
|
||||
|
||||
const imageTree = buildImageTree(imagePaths, rects);
|
||||
imageCode = generateImageCode(imageTree);
|
||||
await mkdir(dirname(atlasHashFile), { recursive: true });
|
||||
await writeFile(atlasHashFile, atlasHash, "utf-8");
|
||||
}
|
||||
}
|
||||
|
||||
const modelTree = buildModelTree(modelPaths);
|
||||
@@ -319,9 +343,16 @@ ${sp} }`;
|
||||
.replace("{{MODELS}}", modelCode)
|
||||
.replace("{{AUDIO}}", audioCode);
|
||||
|
||||
// rewriting an identical file would still invalidate it in Vite
|
||||
const previousCode = await readFile(outputFile, "utf-8").catch(
|
||||
() => null,
|
||||
);
|
||||
if (previousCode !== code) {
|
||||
await writeFile(outputFile, code, "utf-8");
|
||||
}
|
||||
|
||||
logger.success(
|
||||
`Generated assets with ${imagePaths.length} images (${atlasWidth}x${atlasHeight}), ${modelPaths.length} models and ${audioPaths.length} audio files`,
|
||||
`Generated assets with ${imagePaths.length} images (${atlasWidth}x${atlasHeight}${atlasCached ? ", cached" : ""}), ${modelPaths.length} models and ${audioPaths.length} audio files`,
|
||||
);
|
||||
} catch (error) {
|
||||
logger.error("Error generating assets:", error);
|
||||
|
||||
@@ -106,6 +106,13 @@ export default defineNuxtConfig({
|
||||
redirectOn: "root",
|
||||
},
|
||||
},
|
||||
ui: {
|
||||
// JetBrains Mono is loaded from bunny.net in app.css
|
||||
fonts: false,
|
||||
experimental: {
|
||||
componentDetection: true,
|
||||
},
|
||||
},
|
||||
image: {
|
||||
quality: 80,
|
||||
format: ["webp"],
|
||||
|
||||
26
package.json
26
package.json
@@ -20,29 +20,29 @@
|
||||
"exifr": "^7.1.3",
|
||||
"gsap": "3.13.0",
|
||||
"pinia": "3.0.4",
|
||||
"tailwindcss": "^4.1.18",
|
||||
"tailwindcss": "^4.3.3",
|
||||
"three": "^0.182.0",
|
||||
"vue": "3.5.25",
|
||||
"vue-router": "4.6.3",
|
||||
"vue": "3.5.43",
|
||||
"vue-router": "5.3.1",
|
||||
"zod": "^4.2.1"
|
||||
},
|
||||
"packageManager": "pnpm@10.30.2",
|
||||
"devDependencies": {
|
||||
"@nuxt/content": "3.8.2",
|
||||
"@nuxt/eslint": "1.10.0",
|
||||
"@nuxt/image": "2.0.0",
|
||||
"@nuxt/kit": "4.2.1",
|
||||
"@nuxt/ui": "4.3.0",
|
||||
"@nuxtjs/i18n": "10.2.1",
|
||||
"@nuxtjs/mdc": "0.18.4",
|
||||
"@nuxt/content": "3.16.1",
|
||||
"@nuxt/eslint": "1.17.0",
|
||||
"@nuxt/image": "2.1.0",
|
||||
"@nuxt/kit": "4.6.0",
|
||||
"@nuxt/ui": "4.11.3",
|
||||
"@nuxtjs/i18n": "10.6.0",
|
||||
"@nuxtjs/mdc": "0.23.2",
|
||||
"@pinia/nuxt": "0.11.3",
|
||||
"@types/node": "24.10.1",
|
||||
"@types/three": "^0.182.0",
|
||||
"better-sqlite3": "12.4.1",
|
||||
"better-sqlite3": "12.11.1",
|
||||
"eslint": "9.39.1",
|
||||
"nuxt": "4.2.1",
|
||||
"nuxt": "4.6.0",
|
||||
"prettier": "3.6.2",
|
||||
"sharp": "^0.34.5",
|
||||
"sharp": "^0.35.5",
|
||||
"typescript": "5.9.3"
|
||||
}
|
||||
}
|
||||
|
||||
19603
pnpm-lock.yaml
generated
19603
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user