diff --git a/src/lib/3d/Keyboard.svelte b/src/lib/3d/Keyboard.svelte index c54e832d..5eeedeed 100644 --- a/src/lib/3d/Keyboard.svelte +++ b/src/lib/3d/Keyboard.svelte @@ -4,7 +4,7 @@ import KeyboardMaterial from './KeyboardMaterial.svelte' import KeyboardPartGeo from './KeyboardPartGeo.svelte' import KeyboardKeycapGeo from './KeyboardKeycapGeo.svelte' - import type { CuttleKey, Geometry } from '$lib/worker/config' + import type { CuttleKey, Geometry, KeyboardSide } from '$lib/worker/config' import * as flags from '$lib/flags' import { keyBrightness, type KeyStatus } from './keyboardKey' import { hasKeyGeometry, keyUrl } from '$lib/loaders/keycaps' @@ -23,7 +23,7 @@ import { T } from '@threlte/core' import { variantURL, PART_INFO } from '$lib/geometry/socketsParts' import { DefaultMap } from '$lib/worker/util' - import { MeshStandardMaterial, Quaternion, Vector3, type Vector3Tuple, type Vector4Tuple } from 'three' + import { Quaternion, Vector3, type Vector3Tuple, type Vector4Tuple } from 'three' export let geometry: Geometry | null export let transparency: number = 100 @@ -31,7 +31,7 @@ export let translation: number = 0 export let flip = true export let reachability: boolean[] | undefined = undefined - export let side: 'left' | 'right' | 'unibody' + export let side: KeyboardSide export let keyColor: [any, number] | undefined = undefined export let trackballColor: any | undefined = undefined export let switchColor: [any, number] | undefined = undefined diff --git a/src/lib/3d/KeyboardKey.svelte b/src/lib/3d/KeyboardKey.svelte index 625a32bf..79367c92 100644 --- a/src/lib/3d/KeyboardKey.svelte +++ b/src/lib/3d/KeyboardKey.svelte @@ -5,7 +5,7 @@ import type { interactivity } from '@threlte/extras' export let index: number | null - export let side: 'left' | 'right' | 'unibody' = 'right' + export let side: 'left' | 'right' | 'unibody' | 'center' = 'right' type InteractivityContext = ReturnType const context: InteractivityContext = getContext('interactivity') diff --git a/src/lib/3d/KeyboardModel.svelte b/src/lib/3d/KeyboardModel.svelte index fdb2ce98..9744ad83 100644 --- a/src/lib/3d/KeyboardModel.svelte +++ b/src/lib/3d/KeyboardModel.svelte @@ -1,6 +1,6 @@ @@ -270,7 +282,7 @@

Case/Shell

-
+
{#each configKeys as kbd}

Plate

{#if Object.values(config).some((c) => c.shell.type == 'tilt' || c.shell.type == 'stilts')} -
+
{#each configKeys as kbd}
-
+
{#each configKeys as kbd} c.microcontroller)}

Microcontroller Holder

-
+
{#each configKeys as kbd}