From ba723b443bfdb32de54db8cfa07426f8aa855b5f Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Thu, 19 Nov 2026 23:43:22 -0600 Subject: [PATCH] migrate mixer --- .claude/skills/commit-message/SKILL.md | 23 ++ .zed/settings.json | 3 + .../core/src/blitzkit/api/server/0_base.ts | 63 ++-- packages/i18n/strings/en.json | 13 + .../src/components/Dialog/index.module.css | 3 +- .../components/MixerFallback/index.module.css | 3 + .../src/components/MixerFallback/index.tsx | 14 + .../Model.tsx => MixerModel/index.tsx} | 51 ++-- .../MixerModuleChooser/index.module.css | 40 +++ .../components/MixerModuleChooser/index.tsx | 186 ++++++++++++ .../MixerModuleSeparator/index.module.css | 10 + .../components/MixerModuleSeparator/index.tsx | 10 + .../MixerScene/components/MixerFallback.tsx | 13 - .../MixerScene/components/Selector.tsx | 28 -- .../src/components/MixerScene/index.tsx | 12 +- .../ModuleButtons/ConsumableButton.tsx | 75 ----- .../ModuleButtons/EquipmentButton.tsx | 23 -- .../GenericTankComponentButton.tsx | 48 ---- .../components/ModuleButtons/ModuleButton.tsx | 21 -- .../ModuleButtons/ProvisionButton.tsx | 23 -- .../components/ModuleButtons/ShellButton.tsx | 16 -- .../ModuleButtons/TankComponentButton.tsx | 78 ----- .../website/src/components/NavbarMobile.astro | 25 +- .../src/components/Progress/index.module.css | 15 + .../website/src/components/Progress/index.tsx | 15 + .../src/components/ScreenshotButton.tsx | 106 ------- .../src/components/ScreenshotButton/index.tsx | 124 ++++++++ .../src/components/Scroller/index.module.css | 2 +- .../SegmentedControl/index.module.css | 2 +- .../src/components/Switch/index.module.css | 4 +- .../TankSandboxLoader/index.module.css | 19 +- .../components/TankSandboxLoader/index.tsx | 13 +- .../TankSearch/components/QuickLink.tsx | 28 -- .../TankSearch/components/TierFilter.tsx | 53 ---- .../src/components/TankSearch/index.tsx | 2 + .../index.module.css | 2 +- .../index.module.css | 2 +- .../TankopediaOptions/index.module.css | 2 +- .../TankopediaQuickInputs/index.module.css | 2 +- .../TankopediaSkinSwitcher/index.module.css | 2 +- .../TankopediaToys/index.module.css | 4 +- .../components/Thicknesses/index.module.css | 2 +- .../src/components/ToolOpenGraph.astro | 5 +- packages/website/src/constants/tools.ts | 1 - packages/website/src/layouts/BaseLayout.astro | 14 +- .../[...locale]/guesser/_index.module.css | 3 +- .../[...locale]/mixer/_index.module.css | 45 +++ .../[...locale]/mixer/_index.tsx | 268 +++--------------- .../mixer/{_index.astro => index.astro} | 2 +- 49 files changed, 659 insertions(+), 859 deletions(-) create mode 100644 .claude/skills/commit-message/SKILL.md create mode 100644 .zed/settings.json create mode 100644 packages/website/src/components/MixerFallback/index.module.css create mode 100644 packages/website/src/components/MixerFallback/index.tsx rename packages/website/src/components/{MixerScene/components/Model.tsx => MixerModel/index.tsx} (91%) create mode 100644 packages/website/src/components/MixerModuleChooser/index.module.css create mode 100644 packages/website/src/components/MixerModuleChooser/index.tsx create mode 100644 packages/website/src/components/MixerModuleSeparator/index.module.css create mode 100644 packages/website/src/components/MixerModuleSeparator/index.tsx delete mode 100644 packages/website/src/components/MixerScene/components/MixerFallback.tsx delete mode 100644 packages/website/src/components/MixerScene/components/Selector.tsx delete mode 100644 packages/website/src/components/ModuleButtons/ConsumableButton.tsx delete mode 100644 packages/website/src/components/ModuleButtons/EquipmentButton.tsx delete mode 100644 packages/website/src/components/ModuleButtons/GenericTankComponentButton.tsx delete mode 100644 packages/website/src/components/ModuleButtons/ModuleButton.tsx delete mode 100644 packages/website/src/components/ModuleButtons/ProvisionButton.tsx delete mode 100644 packages/website/src/components/ModuleButtons/ShellButton.tsx delete mode 100644 packages/website/src/components/ModuleButtons/TankComponentButton.tsx create mode 100644 packages/website/src/components/Progress/index.module.css create mode 100644 packages/website/src/components/Progress/index.tsx delete mode 100644 packages/website/src/components/ScreenshotButton.tsx create mode 100644 packages/website/src/components/ScreenshotButton/index.tsx delete mode 100644 packages/website/src/components/TankSearch/components/QuickLink.tsx delete mode 100644 packages/website/src/components/TankSearch/components/TierFilter.tsx create mode 100644 packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.module.css rename packages/website/src/pages/[...chunk_default]/[...locale]/mixer/{_index.astro => index.astro} (90%) diff --git a/.claude/skills/commit-message/SKILL.md b/.claude/skills/commit-message/SKILL.md new file mode 100644 index 000000000..b2fd0be3e --- /dev/null +++ b/.claude/skills/commit-message/SKILL.md @@ -0,0 +1,23 @@ +--- +name: commit-message +description: Read the git diff and write a commit message in the repo's existing style. Use when the user asks for a commit message or runs /commit-message. Only prints the message; never stages, commits, or pushes. +disable-model-invocation: true +allowed-tools: Bash(git diff:*), Bash(git log:*), Bash(git status:*) +--- + +# Commit message + +Write a commit message for the current changes. Do not stage, commit, or push anything; the user does that themselves. + +## Context + +- Recent commits: !`git log --format=%s -20` +- Staged stat: !`git diff --cached --stat` +- Unstaged stat: !`git diff --stat` + +## Steps + +1. Use the staged diff (`git diff --cached`) if anything is staged; otherwise use the unstaged diff (`git diff`). Read the actual hunks for anything the stat doesn't explain. Skim large deletions and pure-formatting churn rather than reading them line by line. +2. Find the one main thing the change does. Renames, moves into the flat `Name/index.tsx` layout, CSS tweaks, and formatting churn are usually side effects of that, not separate items. +3. Match the style of the recent commits: one line, all lowercase, no trailing period, no conventional-commit prefix, no body, usually 2–6 words (e.g. `migrate 404 page`, `no internal css`, `fix embed redirector`). +4. Reply with only the message in a code block. No preamble, no summary, no bullet list, no suggestions. diff --git a/.zed/settings.json b/.zed/settings.json new file mode 100644 index 000000000..69350c2a9 --- /dev/null +++ b/.zed/settings.json @@ -0,0 +1,3 @@ +{ + "language_servers": ["!eslint", "..."] +} diff --git a/packages/core/src/blitzkit/api/server/0_base.ts b/packages/core/src/blitzkit/api/server/0_base.ts index 95a92cd9a..4d0ec290f 100644 --- a/packages/core/src/blitzkit/api/server/0_base.ts +++ b/packages/core/src/blitzkit/api/server/0_base.ts @@ -127,35 +127,35 @@ export abstract class ServerBlitzKitAPI0 extends AbstractBlitzKitAPI { .then((files) => files.filter((nation) => nation !== "common")); this.optionalDevices = await this.vfs.xml<{ root: OptionalDevices }>( - "Data/XML/item_defs/vehicles/common/optional_devices.xml", + "Data/XML/item_defs/vehicles/common/optional_devices.xml" ); this.optionalDeviceSlots = await this.vfs.xml<{ root: OptionalDeviceSlots; }>("Data/XML/item_defs/vehicles/common/optional_device_slots.xml"); this.tankmenAvatar = await this.vfs.xml<{ root: TankmenAvatar }>( - "Data/XML/item_defs/tankmen/avatar.xml", + "Data/XML/item_defs/tankmen/avatar.xml" ); this.mapsYaml = await this.vfs.yaml("Data/maps.yaml"); this.camouflagesXml = await this.vfs.xml<{ root: CamouflagesXml }>( - "Data/XML/item_defs/vehicles/common/camouflages.xml", + "Data/XML/item_defs/vehicles/common/camouflages.xml" ); this.camouflagesYaml = await this.vfs.yaml( - "Data/camouflages.yaml", + "Data/camouflages.yaml" ); this.squadBattleTypeStyles = await this.vfs.yaml( - `Data/UI/Screens3/Lobby/Hangar/Squad/SquadBattleType.yaml`, + `Data/UI/Screens3/Lobby/Hangar/Squad/SquadBattleType.yaml` ); this.gameTypeSelectorStyles = await this.vfs.yaml( - `Data/UI/Screens/Lobby/Hangar/GameTypeSelector.yaml`, + `Data/UI/Screens/Lobby/Hangar/GameTypeSelector.yaml` ); this.combatRoles = await this.vfs.yaml( - `Data/XML/item_defs/vehicles/common/combat_roles.yaml`, + `Data/XML/item_defs/vehicles/common/combat_roles.yaml` ); this.tierEqualizer = await this.vfs.csv( // spell:disable-next-line `Data/XML/item_defs/vehicles/common/tier_equializer.csv`, - { delimiter: ";" }, + { delimiter: ";" } ); this.version = (await this.vfs.text("Data/version.txt")).split(" ")[0]; @@ -163,46 +163,49 @@ export abstract class ServerBlitzKitAPI0 extends AbstractBlitzKitAPI { console.log("Fetching game localizations..."); await Promise.all( - locales.supported.map(async ({ locale }) => { + locales.supported.map(async (supported) => { const root = `../../temp/game-strings/${this.version}`; - const cachePath = `${root}/${locale}.json`; + const cachePath = `${root}/${supported.locale}.json`; if (existsSync(cachePath)) { - console.log(` Cache hit for ${locale}`); + console.log(` Cache hit for ${supported.locale}`); const content = await readFile(cachePath, "utf-8"); - this.stringsI18n[locale] = JSON.parse(content) as BlitzStrings; + this.stringsI18n[supported.locale] = JSON.parse( + content + ) as BlitzStrings; return; } - console.log(` Cache miss for ${locale} (this will take a while...)`); + console.log( + ` Cache miss for ${supported.locale} (this will take a while...)` + ); - const blitzLocale = locales.supported.find( - (l) => l.locale === locale, - )!.variant_blitz_local; + const localLocale = supported.variant_blitz_local ?? supported.locale; + const cdnLocale = supported.variant_blitz_cdn ?? supported.locale; const networkStrings = (await fetch( - `https://stufficons.wgcdn.co/localizations/${blitzLocale}.yaml`, + `https://stufficons.wgcdn.co/localizations/${cdnLocale}.yaml` ) .then((response) => response.text()) .then(parseYaml)) as BlitzStrings; const localStrings = await this.vfs.yaml( - `Data/Strings/${blitzLocale}.yaml`, + `Data/Strings/${localLocale}.yaml` ); const combined = { ...networkStrings, ...localStrings }; await mkdir(root, { recursive: true }); await writeFile(cachePath, JSON.stringify(combined)); - this.stringsI18n[locale] = combined; - }), + this.stringsI18n[supported.locale] = combined; + }) ); console.log("Fetching consumable and provision data..."); for (const match of ( await this.vfs.text( - `Data/XML/item_defs/vehicles/common/consumables/list.xml`, + `Data/XML/item_defs/vehicles/common/consumables/list.xml` ) ).matchAll(//g)) { if (match[1] === "prototypes") continue; @@ -211,15 +214,15 @@ export abstract class ServerBlitzKitAPI0 extends AbstractBlitzKitAPI { this.consumablesCommon, ( await this.vfs.xml<{ root: ConsumablesCommon }>( - `Data/XML/item_defs/vehicles/common/consumables/${match[1]}.xml`, + `Data/XML/item_defs/vehicles/common/consumables/${match[1]}.xml` ) - ).root, + ).root ); } for (const match of ( await this.vfs.text( - `Data/XML/item_defs/vehicles/common/provisions/list.xml`, + `Data/XML/item_defs/vehicles/common/provisions/list.xml` ) ).matchAll(//g)) { if (match[1] === "prototypes") continue; @@ -228,15 +231,15 @@ export abstract class ServerBlitzKitAPI0 extends AbstractBlitzKitAPI { this.provisionsCommon, ( await this.vfs.xml<{ root: ConsumablesCommon }>( - `Data/XML/item_defs/vehicles/common/provisions/${match[1]}.xml`, + `Data/XML/item_defs/vehicles/common/provisions/${match[1]}.xml` ) - ).root, + ).root ); } for (const nation of this.nationsDir!) { const tankList = await this.vfs.xml<{ root: VehicleDefinitionList }>( - `Data/XML/item_defs/vehicles/${nation}/list.xml`, + `Data/XML/item_defs/vehicles/${nation}/list.xml` ); for (const tankKey in tankList.root) { @@ -255,7 +258,7 @@ export abstract class ServerBlitzKitAPI0 extends AbstractBlitzKitAPI { protected getTankFilterIds( name: string, definitionKey: string, - filter: "include" | "exclude", + filter: "include" | "exclude" ) { const keys = name.trim().split(/\s+/).filter(Boolean); @@ -264,7 +267,7 @@ export abstract class ServerBlitzKitAPI0 extends AbstractBlitzKitAPI { if (id === undefined) { console.warn( - `Skipping unavailable tank "${key}" in ${filter} vehicle filter for "${definitionKey}"`, + `Skipping unavailable tank "${key}" in ${filter} vehicle filter for "${definitionKey}"` ); return []; } @@ -301,7 +304,7 @@ export function Cache(disableInDev = false) { const cache = new WeakMap>>(); return function ( - target: (this: This, ...args: Arguments) => Promise, + target: (this: This, ...args: Arguments) => Promise // TODO: evaluate if we need context to make the error trace easier // context: ClassMethodDecoratorContext< // This, diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json index f010a371e..6ae42d16d 100644 --- a/packages/i18n/strings/en.json +++ b/packages/i18n/strings/en.json @@ -4,6 +4,11 @@ "settings": "Settings" }, + "mixer": { + "screenshot": "Screenshot", + "randomize": "Randomize" + }, + "guesser": { "help": { "title": "Partially reveal tank?", @@ -545,6 +550,14 @@ "common": { "name": "BlitzKit", + "screenshot": { + "title": "Screenshot", + "description": "Screenshot the tank with a transparent background.", + "cancel": "Cancel", + "download": "Download", + "copy": "Copy" + }, + "search": { "hint_players": "Search players...", "hint_tanks": "Search tanks...", diff --git a/packages/website/src/components/Dialog/index.module.css b/packages/website/src/components/Dialog/index.module.css index 1d8f747ea..3d00ae05a 100644 --- a/packages/website/src/components/Dialog/index.module.css +++ b/packages/website/src/components/Dialog/index.module.css @@ -18,8 +18,7 @@ gap: var(--space-4); box-sizing: border-box; - width: calc(100dvw - 2 * var(--space-4)); - max-width: 40rem; + max-width: min(40rem, calc(100dvw - 2 * var(--space-4))); max-height: calc(100dvh - 2 * var(--space-4)); padding: var(--space-4); overflow: hidden; diff --git a/packages/website/src/components/MixerFallback/index.module.css b/packages/website/src/components/MixerFallback/index.module.css new file mode 100644 index 000000000..229389c3f --- /dev/null +++ b/packages/website/src/components/MixerFallback/index.module.css @@ -0,0 +1,3 @@ +.progress { + width: 10rem; +} diff --git a/packages/website/src/components/MixerFallback/index.tsx b/packages/website/src/components/MixerFallback/index.tsx new file mode 100644 index 000000000..b1b8e56c3 --- /dev/null +++ b/packages/website/src/components/MixerFallback/index.tsx @@ -0,0 +1,14 @@ +import { Html } from "@react-three/drei"; +import { useStableProgress } from "../../hooks/useStableProgress"; +import { Progress } from "../Progress"; +import styles from "./index.module.css"; + +export function MixerFallback() { + const progress = useStableProgress(); + + return ( + + + + ); +} diff --git a/packages/website/src/components/MixerScene/components/Model.tsx b/packages/website/src/components/MixerModel/index.tsx similarity index 91% rename from packages/website/src/components/MixerScene/components/Model.tsx rename to packages/website/src/components/MixerModel/index.tsx index e00a1646c..251b4595d 100644 --- a/packages/website/src/components/MixerScene/components/Model.tsx +++ b/packages/website/src/components/MixerModel/index.tsx @@ -2,19 +2,20 @@ import { useThree, type ThreeEvent } from "@react-three/fiber"; import type { QuicklimeEvent } from "quicklime"; import { useCallback, useEffect, useRef } from "react"; import { Group, Vector2 } from "three"; -import { api } from "../../../api/dynamic"; -import { jsxTree } from "../../../core/blitzkit/jsxTree"; +import { api } from "../../api/dynamic"; +import { jsxTree } from "../../core/blitzkit/jsxTree"; import { modelTransformEvent, type ModelTransformEventData, -} from "../../../core/blitzkit/modelTransform"; -import { controlsEnabledEvent } from "../../../core/controlsEnabled"; -import { useModel } from "../../../hooks/useModel"; -import { Mixer } from "../../../stores/mixer"; +} from "../../core/blitzkit/modelTransform"; +import { controlsEnabledEvent } from "../../core/controlsEnabled"; +import { useModel } from "../../hooks/useModel"; +import { Mixer } from "../../stores/mixer"; const modelDefinitions = await api.models(); -export function Model() { +// TODO: combine this and others with tank model or at least find a mutual way to handle tank assembly +export function MixerModel() { const canvas = useThree((state) => state.gl.domElement); const turretGroup = useRef(null!); @@ -86,7 +87,7 @@ export function Model() { function handleModelTransform( event: QuicklimeEvent, ) { - turretGroup.current.rotation.z = event.data.yaw; + turretGroup.current.rotation.y = event.data.yaw; gunGroup.current.rotation.x = event.data.pitch; } @@ -98,7 +99,7 @@ export function Model() { }, []); return ( - + <> {hullNodes.map((node) => { const isHull = node.name === "hull"; const isWheel = node.name.startsWith("chassis_wheel_"); @@ -116,18 +117,18 @@ export function Model() { {turretNodes.map((node) => { @@ -163,12 +164,12 @@ export function Model() { turretTankModel.turret_origin!.x + turretTrackModel.origin!.x + turretModel.gun_origin!.x, - turretTankModel.turret_origin!.z + - turretTrackModel.origin!.z + - turretModel.gun_origin!.z, turretTankModel.turret_origin!.y + turretTrackModel.origin!.y + turretModel.gun_origin!.y, + turretTankModel.turret_origin!.z + + turretTrackModel.origin!.z + + turretModel.gun_origin!.z, ]} > {turretNodes.map((node) => { const isCurrentMantlet = node.name === - `gun_${turretModel.guns[turret.turret.guns.at(-1)!.id].model_id.toString().padStart(2, "0")}_mask`; + `gun_${turretModel.guns[ + turret.turret.guns.at(-1)!.id + ].model_id + .toString() + .padStart(2, "0")}_mask`; // const isCurrentGun = // node.name === // `gun_${gunModel.model_id.toString().padStart(2, "0")}`; @@ -219,12 +224,12 @@ export function Model() { -gunTankModel.turret_origin!.x - gunTrackModel.origin!.x - gunTurretModel.gun_origin!.x, - -gunTankModel.turret_origin!.z - - gunTrackModel.origin!.z - - gunTurretModel.gun_origin!.z, -gunTankModel.turret_origin!.y - gunTrackModel.origin!.y - gunTurretModel.gun_origin!.y, + -gunTankModel.turret_origin!.z - + gunTrackModel.origin!.z - + gunTurretModel.gun_origin!.z, ]} > {gunNodes.map((node) => { @@ -259,6 +264,6 @@ export function Model() { - + ); } diff --git a/packages/website/src/components/MixerModuleChooser/index.module.css b/packages/website/src/components/MixerModuleChooser/index.module.css new file mode 100644 index 000000000..c1d8310e7 --- /dev/null +++ b/packages/website/src/components/MixerModuleChooser/index.module.css @@ -0,0 +1,40 @@ +.mixer-module-chooser { + display: flex; +} + +.trigger { + position: relative; + overflow: clip; +} + +.sizer { + width: var(--space-6); + height: var(--space-5); +} + +.tank-image, +.skeleton { + position: absolute; + inset: 0; +} + +.tank-image { + background-size: auto 125%; + background-position: center; + background-repeat: no-repeat; +} + +.module-button { + position: relative; +} + +.popover-list { + display: flex; + flex-direction: column; + gap: var(--space-2); +} + +.popover-row { + display: flex; + gap: var(--space-2); +} diff --git a/packages/website/src/components/MixerModuleChooser/index.tsx b/packages/website/src/components/MixerModuleChooser/index.tsx new file mode 100644 index 000000000..e0727962c --- /dev/null +++ b/packages/website/src/components/MixerModuleChooser/index.tsx @@ -0,0 +1,186 @@ +import { alias, romanize } from "@blitzkit/core"; +import type { + GunDefinition, + TankDefinition, + TurretDefinition, +} from "@blitzkit/protos"; +import { CaretUpIcon } from "@radix-ui/react-icons"; +import { useState } from "react"; +import { api } from "../../api/dynamic"; +import { useStrings } from "../../hooks/useStrings"; +import type { MaybeSkeletonComponentProps } from "../../types/maybeSkeletonComponentProps"; +import { Button } from "../Button"; +import { Dialog } from "../Dialog"; +import { Discriminator } from "../Discriminator"; +import { IconButton } from "../IconButton"; +import { Popover } from "../Popover"; +import { Skeleton } from "../Skeleton"; +import { TankSearch } from "../TankSearch"; +import styles from "./index.module.css"; + +const tankDefinitions = await api.tanks(); + +type MixerModuleChooserProps = MaybeSkeletonComponentProps & { + tank: number; + onSelect: ( + tank: TankDefinition, + turret?: TurretDefinition, + gun?: GunDefinition + ) => void; + turret?: number; + gun?: number; +}; + +export function MixerModuleChooser({ + skeleton, + tank, + onSelect, + turret, + gun, +}: MixerModuleChooserProps) { + const strings = useStrings(); + const [open, setOpen] = useState(false); + const tankDefinition = tankDefinitions.tanks[tank]; + const turretDefinition = tankDefinition.turrets.find((t) => t.id === turret); + const gunDefinition = turretDefinition?.guns.find((g) => g.id === gun); + const topTurret = tankDefinition.turrets.at(-1)!; + const subSelector = + turret !== undefined && + (tankDefinition.turrets.length > 1 || + (gun !== undefined && turretDefinition!.guns.length > 1)); + + return ( +
+ + + + + + + + + + + {strings.website.common.tank_search.select_dialog_title} + + + + + { + onSelect?.(tank); + setOpen(false); + }} + /> + + + + + + {subSelector && ( + + + + + + + + +
+ {tankDefinition.turrets.length > 1 && ( +
+ {tankDefinition.turrets.map((turret) => ( + { + onSelect?.(tankDefinition, turret); + }} + > + turret + + + {romanize(turret.tier)} + + + ))} +
+ )} + + {turretDefinition && turretDefinition.guns.length > 1 && ( +
+ {turretDefinition.guns.map((gun) => ( + { + onSelect?.(tankDefinition, turretDefinition, gun); + }} + > + gun + + + {romanize(gun.tier)} + + + ))} +
+ )} +
+
+
+ )} +
+ ); +} diff --git a/packages/website/src/components/MixerModuleSeparator/index.module.css b/packages/website/src/components/MixerModuleSeparator/index.module.css new file mode 100644 index 000000000..983cc6175 --- /dev/null +++ b/packages/website/src/components/MixerModuleSeparator/index.module.css @@ -0,0 +1,10 @@ +.mixer-module-separator { + display: flex; + color: var(--gray-11); + font-size: var(--font-size-regular); + + svg { + width: 1em; + height: 1em; + } +} diff --git a/packages/website/src/components/MixerModuleSeparator/index.tsx b/packages/website/src/components/MixerModuleSeparator/index.tsx new file mode 100644 index 000000000..859fff64a --- /dev/null +++ b/packages/website/src/components/MixerModuleSeparator/index.tsx @@ -0,0 +1,10 @@ +import { CaretRightIcon } from "@radix-ui/react-icons"; +import styles from "./index.module.css"; + +export function MixerModuleSeparator() { + return ( + + + + ); +} diff --git a/packages/website/src/components/MixerScene/components/MixerFallback.tsx b/packages/website/src/components/MixerScene/components/MixerFallback.tsx deleted file mode 100644 index 707e37c6b..000000000 --- a/packages/website/src/components/MixerScene/components/MixerFallback.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import { Progress } from "@radix-ui/themes"; -import { Html } from "@react-three/drei"; -import { useStableProgress } from "../../../hooks/useStableProgress"; - -export function MixerFallback() { - const progress = useStableProgress(); - - return ( - - - - ); -} diff --git a/packages/website/src/components/MixerScene/components/Selector.tsx b/packages/website/src/components/MixerScene/components/Selector.tsx deleted file mode 100644 index d81bf194b..000000000 --- a/packages/website/src/components/MixerScene/components/Selector.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import { Box, Flex, Text } from "@radix-ui/themes"; -import type { ReactNode } from "react"; - -interface Props { - children: ReactNode; -} - -export function Selector({ children }: Props) { - return ( - - - - {children} - - - ); -} diff --git a/packages/website/src/components/MixerScene/index.tsx b/packages/website/src/components/MixerScene/index.tsx index 54b8c2f65..f16ec0ce2 100644 --- a/packages/website/src/components/MixerScene/index.tsx +++ b/packages/website/src/components/MixerScene/index.tsx @@ -5,9 +5,9 @@ import { forwardRef, Suspense, useEffect, useRef } from "react"; import type { OrbitControls as OrbitControlsClass } from "three-stdlib"; import { controlsEnabledEvent } from "../../core/controlsEnabled"; import { Lighting } from "../Lighting"; +import { MixerFallback } from "../MixerFallback"; +import { MixerModel } from "../MixerModel"; import { SceneProps } from "../SceneProps"; -import { MixerFallback } from "./components/MixerFallback"; -import { Model } from "./components/Model"; export const MixerScene = forwardRef((_, ref) => { const controls = useRef(null!); @@ -29,11 +29,7 @@ export const MixerScene = forwardRef((_, ref) => { ((_, ref) => { }> - + ); diff --git a/packages/website/src/components/ModuleButtons/ConsumableButton.tsx b/packages/website/src/components/ModuleButtons/ConsumableButton.tsx deleted file mode 100644 index 6dbeee65f..000000000 --- a/packages/website/src/components/ModuleButtons/ConsumableButton.tsx +++ /dev/null @@ -1,75 +0,0 @@ -import { alias } from "@blitzkit/core"; -import { ClockIcon, ReloadIcon } from "@radix-ui/react-icons"; -import { Flex, Text } from "@radix-ui/themes"; -import { api } from "../../api/dynamic"; -import { useDelta } from "../../hooks/useDelta"; -import { useLocale } from "../../hooks/useLocale"; -import { GenericTankComponentButton } from "./GenericTankComponentButton"; -import type { TankComponentButtonProps } from "./TankComponentButton"; - -interface ConsumableButtonProps extends TankComponentButtonProps { - consumable: number; - duration?: number; - cooldown?: number; -} - -const consumableDefinitions = await api.consumables(); - -export function ConsumableButton({ - consumable, - cooldown, - duration, - ...props -}: ConsumableButtonProps) { - const cooldownDelta = useDelta(cooldown ?? 0); - const durationDelta = useDelta(duration ?? 0); - const { unwrap } = useLocale(); - - return ( - - {(cooldown || duration) && ( - - {duration && ( - 0 - ? "green" - : durationDelta < 0 - ? "tomato" - : undefined - } - > - - - {Math.round(duration)}s - - - )} - {cooldown && ( - 0 - ? "tomato" - : undefined - } - > - - - {Math.round(cooldown)}s - - - )} - - )} - - ); -} diff --git a/packages/website/src/components/ModuleButtons/EquipmentButton.tsx b/packages/website/src/components/ModuleButtons/EquipmentButton.tsx deleted file mode 100644 index 5ae1e053d..000000000 --- a/packages/website/src/components/ModuleButtons/EquipmentButton.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import { alias } from "@blitzkit/core"; -import { api } from "../../api/dynamic"; -import { useLocale } from "../../hooks/useLocale"; -import { GenericTankComponentButton } from "./GenericTankComponentButton"; -import type { TankComponentButtonProps } from "./TankComponentButton"; - -interface EquipmentButtonProps extends TankComponentButtonProps { - equipment: number; -} - -const equipmentDefinitions = await api.equipment(); - -export function EquipmentButton({ equipment, ...props }: EquipmentButtonProps) { - const { unwrap } = useLocale(); - - return ( - - ); -} diff --git a/packages/website/src/components/ModuleButtons/GenericTankComponentButton.tsx b/packages/website/src/components/ModuleButtons/GenericTankComponentButton.tsx deleted file mode 100644 index 2ca36cd35..000000000 --- a/packages/website/src/components/ModuleButtons/GenericTankComponentButton.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import type { HTMLAttributes } from 'react'; -import { - TankComponentButton, - type TankComponentButtonProps, -} from './TankComponentButton'; - -interface GenericTankComponentButtonProps extends TankComponentButtonProps { - icon: string; - iconStyles?: HTMLAttributes['style']; -} - -export function GenericTankComponentButton({ - icon, - iconStyles, - children, - ...props -}: GenericTankComponentButtonProps) { - return ( - -
- {icon} -
- - {children} -
- ); -} diff --git a/packages/website/src/components/ModuleButtons/ModuleButton.tsx b/packages/website/src/components/ModuleButtons/ModuleButton.tsx deleted file mode 100644 index 007dd1e28..000000000 --- a/packages/website/src/components/ModuleButtons/ModuleButton.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import { alias } from "@blitzkit/core"; -import { GenericTankComponentButton } from "./GenericTankComponentButton"; -import type { TankComponentButtonProps } from "./TankComponentButton"; - -interface ModuleProps extends TankComponentButtonProps { - module: string; -} - -export function ModuleButton({ module, ...props }: ModuleProps) { - return ( - - ); -} diff --git a/packages/website/src/components/ModuleButtons/ProvisionButton.tsx b/packages/website/src/components/ModuleButtons/ProvisionButton.tsx deleted file mode 100644 index c72ae3743..000000000 --- a/packages/website/src/components/ModuleButtons/ProvisionButton.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import { alias } from "@blitzkit/core"; -import { api } from "../../api/dynamic"; -import { useLocale } from "../../hooks/useLocale"; -import { GenericTankComponentButton } from "./GenericTankComponentButton"; -import type { TankComponentButtonProps } from "./TankComponentButton"; - -interface ProvisionButtonProps extends TankComponentButtonProps { - provision: number; -} - -const provisionDefinitions = await api.provisions(); - -export function ProvisionButton({ provision, ...props }: ProvisionButtonProps) { - const { unwrap } = useLocale(); - - return ( - - ); -} diff --git a/packages/website/src/components/ModuleButtons/ShellButton.tsx b/packages/website/src/components/ModuleButtons/ShellButton.tsx deleted file mode 100644 index 3aeb7d9d4..000000000 --- a/packages/website/src/components/ModuleButtons/ShellButton.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { alias } from "@blitzkit/core"; -import { GenericTankComponentButton } from "./GenericTankComponentButton"; -import type { TankComponentButtonProps } from "./TankComponentButton"; - -interface ShellButtonProps extends TankComponentButtonProps { - shell: string; -} - -export function ShellButton({ shell, ...props }: ShellButtonProps) { - return ( - - ); -} diff --git a/packages/website/src/components/ModuleButtons/TankComponentButton.tsx b/packages/website/src/components/ModuleButtons/TankComponentButton.tsx deleted file mode 100644 index 5aed9ccb1..000000000 --- a/packages/website/src/components/ModuleButtons/TankComponentButton.tsx +++ /dev/null @@ -1,78 +0,0 @@ -import { Button, Tooltip } from '@radix-ui/themes'; -import type { ComponentProps, ReactNode } from 'react'; -import { Discriminator } from '../Discriminator'; - -export interface TankComponentButtonProps - extends ComponentProps { - selected?: boolean; - children?: ReactNode; - discriminator?: ReactNode; - secondaryDiscriminator?: ReactNode; - disabled?: boolean; - banner?: string; - special?: boolean; - tooltip?: string; -} - -export function TankComponentButton({ - variant, - selected, - discriminator, - secondaryDiscriminator, - special, - children, - banner, - disabled, - style, - tooltip, - ...props -}: TankComponentButtonProps) { - const button = ( - - ); - - if (tooltip) return {button}; - return button; -} diff --git a/packages/website/src/components/NavbarMobile.astro b/packages/website/src/components/NavbarMobile.astro index f75a8d908..46d1c65c1 100644 --- a/packages/website/src/components/NavbarMobile.astro +++ b/packages/website/src/components/NavbarMobile.astro @@ -20,10 +20,24 @@ const strings = await api.strings(locale); --- - - - - +
+ + + diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/_index.module.css b/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/_index.module.css index 544da6160..bb6e7b49d 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/_index.module.css +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/_index.module.css @@ -1,5 +1,6 @@ .content { position: relative; - height: 100dvh; background-color: black; + + flex: 1; } diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.module.css b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.module.css new file mode 100644 index 000000000..5ff574790 --- /dev/null +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.module.css @@ -0,0 +1,45 @@ +.wrapper { + display: flex; + flex-direction: column; + + flex: 1; +} + +.content { + position: relative; + flex-grow: 1; +} + +.scene { + position: absolute; + top: 0; + left: 0; + + width: 100%; + height: 100%; + + background-color: black; +} + +.controls { + position: absolute; + bottom: var(--space-4); + left: 50%; + transform: translateX(-50%); + + display: flex; + flex-direction: column; + align-items: center; + gap: var(--space-3); +} + +.row { + display: flex; + gap: var(--space-3); +} + +.modules { + display: flex; + align-items: center; + gap: var(--space-1); +} diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx index d1d819d03..ad41dec9b 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx @@ -1,214 +1,33 @@ -import { - alias, - romanize, -} from "@blitzkit/core"; -import { literals } from "@blitzkit/i18n"; -import { - GunDefinition, - TankDefinition, - TurretDefinition, -} from "@blitzkit/protos"; -import { CaretRightIcon, CaretUpIcon, UpdateIcon } from "@radix-ui/react-icons"; -import { - Box, - Button, - Dialog, - Flex, - IconButton, - Popover, - Skeleton, - Text, - type ButtonProps, -} from "@radix-ui/themes"; -import { useRef, useState } from "react"; -import { api } from "../../../../api/dynamic"; +import { UpdateIcon } from "@radix-ui/react-icons"; +import { useRef } from "react"; +import { Button } from "../../../../components/Button"; +import { MixerModuleChooser } from "../../../../components/MixerModuleChooser"; +import { MixerModuleSeparator } from "../../../../components/MixerModuleSeparator"; import { MixerScene } from "../../../../components/MixerScene"; -import { ModuleButton } from "../../../../components/ModuleButtons/ModuleButton"; -import { PageWrapper } from "../../../../components/PageWrapper"; import { ScreenshotButton } from "../../../../components/ScreenshotButton"; -import { TankSearch } from "../../../../components/TankSearch"; import { curateMixer } from "../../../../core/blitzkit/curateMixer"; -import { - LocaleProvider, - useLocale, - type LocaleAcceptorProps, -} from "../../../../hooks/useLocale"; +import { withErrorWrapper } from "../../../../hocs/withErrorWrapper"; +import { withLocale } from "../../../../hocs/withLocale"; +import { useStrings } from "../../../../hooks/useStrings"; import { Mixer } from "../../../../stores/mixer"; import { Tankopedia } from "../../../../stores/tankopedia"; import type { MaybeSkeletonComponentProps } from "../../../../types/maybeSkeletonComponentProps"; +import styles from "./_index.module.css"; -const modelDefinition = await api.models().then(({ models }) => models[1]); -const tankDefinitions = await api.tanks(); +export const Page = withLocale( + withErrorWrapper(({ skeleton }: MaybeSkeletonComponentProps) => { + const initial = useRef(curateMixer()); -export function Page({ - locale, - skeleton, -}: LocaleAcceptorProps & MaybeSkeletonComponentProps) { - const initial = useRef(curateMixer()); + Mixer.useInitialization(initial.current); + Tankopedia.useInitialization(initial.current.hull); - Mixer.useInitialization(initial.current); - Tankopedia.useInitialization(modelDefinition); - - return ( - - + return ( +
- - - ); -} - -type ModuleButtonProps = Omit & - MaybeSkeletonComponentProps & { - tank: number; - onSelect: ( - tank: TankDefinition, - turret?: TurretDefinition, - gun?: GunDefinition, - ) => void; - turret?: number; - gun?: number; - }; - -function ModuleChooser({ - skeleton, - tank, - onSelect, - turret, - gun, - ...props -}: ModuleButtonProps) { - const { strings } = useLocale(); - const [open, setOpen] = useState(false); - const tankDefinition = tankDefinitions.tanks[tank]; - const turretDefinition = tankDefinition.turrets.find((t) => t.id === turret); - const gunDefinition = turretDefinition?.guns.find((g) => g.id === gun); - const subSelector = - turret !== undefined && - (tankDefinition.turrets.length > 1 || - (gun !== undefined && turretDefinition!.guns.length > 1)); - - return ( - - - - - - - - - {strings.website.common.tank_search.select_dialog_title} - - - { - onSelect?.(tank); - setOpen(false); - }} - /> - - - - {subSelector && ( - - - - - - - - - - {tankDefinition.turrets.length > 1 && ( - - {tankDefinition.turrets.map((turret) => ( - { - onSelect?.(tankDefinition, turret); - }} - /> - ))} - - )} - - {turretDefinition && turretDefinition.guns.length > 1 && ( - - {turretDefinition.guns.map((gun) => ( - - {literals(strings.common.units.mm, { - value: gun.shells[0].caliber.toFixed(0), - })} - - } - onClick={() => { - onSelect?.(tankDefinition, turretDefinition, gun); - }} - /> - ))} - - )} - - - - )} - - ); -} - -function ModuleSeparator() { - return ( - - - - ); -} +
+ ); + }) +); function Content({ skeleton }: MaybeSkeletonComponentProps) { const hullTankId = Mixer.use((state) => state.hull); @@ -218,34 +37,25 @@ function Content({ skeleton }: MaybeSkeletonComponentProps) { const gunTurretId = Mixer.use((state) => state.gun.turret.id); const gunGunId = Mixer.use((state) => state.gun.gun.id); const canvas = useRef(null!); - const { strings } = useLocale(); + const strings = useStrings(); return ( - - +
+
{!skeleton && } - +
- - +
+
- {strings.website.tools.mixer.screenshot} + {strings.mixer.screenshot} + - +
- - + { @@ -270,8 +80,8 @@ function Content({ skeleton }: MaybeSkeletonComponentProps) { }); }} /> - - + - - + - - - +
+
+ ); } diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/index.astro similarity index 90% rename from packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.astro rename to packages/website/src/pages/[...chunk_default]/[...locale]/mixer/index.astro index b1ea0989f..29b7af14e 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/index.astro @@ -11,7 +11,7 @@ const { locale } = Astro.props; - +