feat: add main feature module selection

This commit is contained in:
Tom Boullay
2026-04-29 23:30:31 +02:00
parent 8b3f24b90b
commit 2783b13488
11 changed files with 515 additions and 3 deletions
+105
View File
@@ -0,0 +1,105 @@
import type { ReactNode } from "react";
import { Component, useEffect, useMemo } from "react";
import { useFrame } from "@react-three/fiber";
import { useGLTF } from "@react-three/drei";
import { ExplodedModel } from "@/utils/ExplodedModel";
import type { Vector3Tuple } from "@/types/three";
interface ModelErrorBoundaryProps {
children: ReactNode;
fallback?: ReactNode;
}
interface ModelErrorBoundaryState {
hasError: boolean;
}
class ModelErrorBoundary extends Component<
ModelErrorBoundaryProps,
ModelErrorBoundaryState
> {
constructor(props: ModelErrorBoundaryProps) {
super(props);
this.state = { hasError: false };
}
static getDerivedStateFromError(): ModelErrorBoundaryState {
return { hasError: true };
}
componentDidCatch(error: Error): void {
console.warn("Failed to load explodable model", error);
}
render(): ReactNode {
if (this.state.hasError) return this.props.fallback ?? null;
return this.props.children;
}
}
interface ExplodableModelInnerProps {
modelPath: string;
split: boolean;
position?: Vector3Tuple;
rotation?: Vector3Tuple;
scale?: number | Vector3Tuple;
splitDistance?: number;
}
export function ExplodableModel(
props: ExplodableModelInnerProps,
): React.JSX.Element {
return (
<ModelErrorBoundary
key={props.modelPath}
fallback={<MissingModelFallback position={props.position} />}
>
<ExplodableModelInner {...props} />
</ModelErrorBoundary>
);
}
function ExplodableModelInner({
modelPath,
split,
position = [0, 0, 0],
rotation = [0, 0, 0],
scale = 1,
splitDistance = 1.2,
}: ExplodableModelInnerProps): React.JSX.Element {
const { scene } = useGLTF(modelPath);
const model = useMemo(() => scene.clone(true), [scene]);
const explodedModel = useMemo(
() => new ExplodedModel(model, { distance: splitDistance }),
[model, splitDistance],
);
const parsedScale =
typeof scale === "number" ? ([scale, scale, scale] as Vector3Tuple) : scale;
useEffect(() => {
explodedModel.setSplit(split);
}, [explodedModel, split]);
useFrame((_, delta) => {
explodedModel.update(delta);
});
return (
<group position={position} rotation={rotation} scale={parsedScale}>
<primitive object={model} />
</group>
);
}
function MissingModelFallback({
position = [0, 0, 0],
}: {
position?: Vector3Tuple;
}): React.JSX.Element {
return (
<mesh position={position}>
<boxGeometry args={[0.7, 0.7, 0.7]} />
<meshStandardMaterial color="#7f1d1d" wireframe />
</mesh>
);
}
+75
View File
@@ -0,0 +1,75 @@
import { useState } from "react";
import { Text } from "@react-three/drei";
import { TriggerObject } from "@/components/three/TriggerObject";
import { ModelSelectorPlaceholder } from "@/components/three/ModelSelectorPlaceholder";
import { RepairCaseModel } from "@/components/three/RepairCaseModel";
const ZONE_ORIGIN = [10, 0.4, -8] as const;
const CASE_MODEL_PATH = "/models/packderelance/model.gltf";
const ZONE_RADIUS = 4.2;
export function MainFeatureZone(): React.JSX.Element {
const [caseOpen, setCaseOpen] = useState(false);
return (
<group>
<mesh
position={[ZONE_ORIGIN[0], 0.025, ZONE_ORIGIN[2]]}
rotation={[-Math.PI / 2, 0, 0]}
>
<ringGeometry args={[ZONE_RADIUS - 0.08, ZONE_RADIUS, 96]} />
<meshBasicMaterial color="#38bdf8" transparent opacity={0.72} />
</mesh>
<mesh
position={[ZONE_ORIGIN[0], 0.02, ZONE_ORIGIN[2]]}
rotation={[-Math.PI / 2, 0, 0]}
>
<circleGeometry args={[ZONE_RADIUS, 96]} />
<meshBasicMaterial color="#0ea5e9" transparent opacity={0.12} />
</mesh>
<Text
position={[ZONE_ORIGIN[0], 3.1, ZONE_ORIGIN[2] - 1.8]}
rotation={[0, 0, 0]}
fontSize={0.55}
maxWidth={5.5}
textAlign="center"
anchorX="center"
anchorY="middle"
color="#f8fafc"
outlineWidth={0.025}
outlineColor="#0f172a"
>
Pack de Relance Feature
</Text>
<TriggerObject
position={[ZONE_ORIGIN[0], ZONE_ORIGIN[1], ZONE_ORIGIN[2]]}
colliders="cuboid"
label={caseOpen ? "Fermer la mallette" : "Ouvrir la mallette"}
onTrigger={() => setCaseOpen((value) => !value)}
>
<RepairCaseModel
modelPath={CASE_MODEL_PATH}
open={caseOpen}
position={[0, -0.45, 0]}
scale={0.35}
/>
</TriggerObject>
<ModelSelectorPlaceholder
label="Module A"
position={[ZONE_ORIGIN[0] - 2.2, ZONE_ORIGIN[1], ZONE_ORIGIN[2] + 2.2]}
/>
<ModelSelectorPlaceholder
label="Module B"
position={[ZONE_ORIGIN[0], ZONE_ORIGIN[1], ZONE_ORIGIN[2] + 2.6]}
/>
<ModelSelectorPlaceholder
label="Module C"
position={[ZONE_ORIGIN[0] + 2.2, ZONE_ORIGIN[1], ZONE_ORIGIN[2] + 2.2]}
/>
</group>
);
}
@@ -0,0 +1,93 @@
import { Html } from "@react-three/drei";
import { useCallback, useState } from "react";
import { TriggerObject } from "@/components/three/TriggerObject";
import { ExplodableModel } from "@/components/three/ExplodableModel";
import { MAIN_FEATURE_MODEL_CATALOG } from "@/data/mainFeature/modelCatalog";
import type { ModelCatalogItem } from "@/data/mainFeature/modelCatalog";
import { useModelSelection } from "@/hooks/useModelSelection";
import type { Vector3Tuple } from "@/types/three";
interface ModelSelectorPlaceholderProps {
position: Vector3Tuple;
label: string;
}
export function ModelSelectorPlaceholder({
position,
label,
}: ModelSelectorPlaceholderProps): React.JSX.Element {
const [selectedModel, setSelectedModel] = useState<ModelCatalogItem | null>(
null,
);
const [split, setSplit] = useState(false);
const handleSelect = useCallback((model: ModelCatalogItem) => {
setSelectedModel(model);
setSplit(false);
}, []);
const selection = useModelSelection(MAIN_FEATURE_MODEL_CATALOG, handleSelect);
const triggerLabel = selectedModel
? split
? `Réassembler ${label}`
: `Démonter ${label}`
: `Choisir ${label}`;
return (
<group>
<TriggerObject
position={position}
colliders="cuboid"
label={triggerLabel}
onTrigger={() => {
if (selectedModel) {
setSplit((value) => !value);
return;
}
selection.open();
}}
>
{selectedModel ? (
<ExplodableModel
modelPath={selectedModel.path}
split={split}
position={[0, -0.35, 0]}
scale={0.45}
/>
) : (
<mesh castShadow receiveShadow>
<boxGeometry args={[1, 0.18, 1]} />
<meshStandardMaterial
color="#38bdf8"
emissive="#082f49"
roughness={0.55}
/>
</mesh>
)}
</TriggerObject>
{selection.isOpen ? (
<Html position={[position[0], position[1] + 1.2, position[2]]} center>
<div className="model-selector-panel">
<strong>{label}</strong>
<span>Fleches: choisir</span>
<span>E/Enter: valider</span>
<ul>
{MAIN_FEATURE_MODEL_CATALOG.map((model, index) => (
<li
key={model.path}
className={
index === selection.selectedIndex
? "is-selected"
: undefined
}
>
{model.name}
</li>
))}
</ul>
</div>
</Html>
) : null}
</group>
);
}
+1 -1
View File
@@ -1,5 +1,5 @@
import { useGLTF } from "@react-three/drei"; import { useGLTF } from "@react-three/drei";
import type { Vector3Tuple } from "@/types/3d"; import type { Vector3Tuple } from "@/types/three";
export interface SimpleModelConfig { export interface SimpleModelConfig {
modelPath: string; modelPath: string;
+4
View File
@@ -25,6 +25,7 @@ interface TriggerObjectProps {
soundVolume?: number; soundVolume?: number;
spawnModel?: string; spawnModel?: string;
spawnOffset?: Vector3Tuple; spawnOffset?: Vector3Tuple;
onTrigger?: () => void;
} }
let _spawnCounter = 0; let _spawnCounter = 0;
@@ -49,6 +50,7 @@ export function TriggerObject({
soundVolume = TRIGGER_DEFAULT_SOUND_VOLUME, soundVolume = TRIGGER_DEFAULT_SOUND_VOLUME,
spawnModel, spawnModel,
spawnOffset = TRIGGER_DEFAULT_SPAWN_OFFSET, spawnOffset = TRIGGER_DEFAULT_SPAWN_OFFSET,
onTrigger,
}: TriggerObjectProps): React.JSX.Element { }: TriggerObjectProps): React.JSX.Element {
const [spawned, setSpawned] = useState<SpawnedModel[]>([]); const [spawned, setSpawned] = useState<SpawnedModel[]>([]);
@@ -64,6 +66,8 @@ export function TriggerObject({
AudioManager.getInstance().playSound(soundPath, soundVolume); AudioManager.getInstance().playSound(soundPath, soundVolume);
} }
onTrigger?.();
if (spawnModel) { if (spawnModel) {
const spawnPos: Vector3Tuple = [ const spawnPos: Vector3Tuple = [
position[0] + spawnOffset[0], position[0] + spawnOffset[0],
+5
View File
@@ -4,5 +4,10 @@ export type { AnimatedModelConfig } from "./AnimatedModel";
export { SimpleModel } from "./SimpleModel"; export { SimpleModel } from "./SimpleModel";
export type { SimpleModelConfig } from "./SimpleModel"; export type { SimpleModelConfig } from "./SimpleModel";
export { ExplodableModel } from "./ExplodableModel";
export { MainFeatureZone } from "./MainFeatureZone";
export { ModelSelectorPlaceholder } from "./ModelSelectorPlaceholder";
export { RepairCaseModel } from "./RepairCaseModel";
export { useCharacterAnimation } from "@/hooks/useCharacterAnimation"; export { useCharacterAnimation } from "@/hooks/useCharacterAnimation";
export type { CharacterAnimationConfig } from "@/hooks/useCharacterAnimation"; export type { CharacterAnimationConfig } from "@/hooks/useCharacterAnimation";
+13
View File
@@ -0,0 +1,13 @@
export interface ModelCatalogItem {
name: string;
path: string;
}
export const MAIN_FEATURE_MODEL_CATALOG: ModelCatalogItem[] = [
{ name: "Kit de relance", path: "/models/packderelance/model.gltf" },
{ name: "Talkie", path: "/models/talkie/model.gltf" },
{ name: "Refroidisseur", path: "/models/refroidisseur/model.gltf" },
{ name: "Sapin", path: "/models/sapin/model.gltf" },
{ name: "Gant", path: "/models/gant/model.gltf" },
{ name: "Galet", path: "/models/galet/model.gltf" },
];
+72
View File
@@ -0,0 +1,72 @@
import { useCallback, useEffect, useState } from "react";
import type { ModelCatalogItem } from "@/data/mainFeature/modelCatalog";
interface UseModelSelectionResult {
isOpen: boolean;
selectedIndex: number;
selectedModel: ModelCatalogItem;
open: () => void;
close: () => void;
}
export function useModelSelection(
models: ModelCatalogItem[],
onSelect: (model: ModelCatalogItem) => void,
): UseModelSelectionResult {
const [isOpen, setIsOpen] = useState(false);
const [selectedIndex, setSelectedIndex] = useState(0);
const close = useCallback(() => setIsOpen(false), []);
const open = useCallback(() => setIsOpen(true), []);
useEffect(() => {
if (!isOpen) return;
const handleKeyDown = (event: KeyboardEvent): void => {
const key = event.key.toLowerCase();
if (["arrowup", "arrowleft"].includes(key)) {
setSelectedIndex((index) =>
index === 0 ? models.length - 1 : index - 1,
);
event.preventDefault();
event.stopPropagation();
return;
}
if (["arrowdown", "arrowright"].includes(key)) {
setSelectedIndex((index) => (index + 1) % models.length);
event.preventDefault();
event.stopPropagation();
return;
}
if (key === "e" || key === "enter") {
onSelect(models[selectedIndex]);
close();
event.preventDefault();
event.stopPropagation();
return;
}
if (key === "escape") {
close();
event.preventDefault();
event.stopPropagation();
}
};
window.addEventListener("keydown", handleKeyDown, { capture: true });
return () => {
window.removeEventListener("keydown", handleKeyDown, { capture: true });
};
}, [close, isOpen, models, onSelect, selectedIndex]);
return {
isOpen,
selectedIndex,
selectedModel: models[selectedIndex],
open,
close,
};
}
+39
View File
@@ -428,6 +428,45 @@ canvas {
filter: drop-shadow(0 0 8px rgba(56, 189, 248, 0.55)); filter: drop-shadow(0 0 8px rgba(56, 189, 248, 0.55));
} }
.model-selector-panel {
display: flex;
flex-direction: column;
gap: 6px;
min-width: 190px;
padding: 12px;
color: rgba(255, 255, 255, 0.92);
background: rgba(4, 7, 13, 0.88);
border: 1px solid rgba(56, 189, 248, 0.5);
border-radius: 8px;
font-size: 12px;
pointer-events: none;
user-select: none;
}
.model-selector-panel strong {
color: white;
font-size: 13px;
}
.model-selector-panel ul {
display: flex;
flex-direction: column;
gap: 3px;
margin: 4px 0 0;
padding: 0;
list-style: none;
}
.model-selector-panel li {
padding: 3px 6px;
border-radius: 4px;
}
.model-selector-panel li.is-selected {
color: #020617;
background: #38bdf8;
}
/* Editor page */ /* Editor page */
.editor-container { .editor-container {
position: fixed; position: fixed;
+103
View File
@@ -0,0 +1,103 @@
import * as THREE from "three";
interface ExplodedPart {
object: THREE.Object3D;
originalPosition: THREE.Vector3;
targetPosition: THREE.Vector3;
}
interface ExplodedModelOptions {
distance?: number;
speed?: number;
}
const _center = new THREE.Vector3();
const _direction = new THREE.Vector3();
export class ExplodedModel {
private readonly parts: ExplodedPart[] = [];
private readonly distance: number;
private readonly speed: number;
private progress = 0;
private targetProgress = 0;
constructor(model: THREE.Object3D, options: ExplodedModelOptions = {}) {
this.distance = options.distance ?? 1.2;
this.speed = options.speed ?? 6;
this.parts = this.createParts(model);
}
setSplit(split: boolean): void {
this.targetProgress = split ? 1 : 0;
}
update(delta: number): void {
const diff = this.targetProgress - this.progress;
if (Math.abs(diff) < 0.001) {
this.progress = this.targetProgress;
} else {
this.progress += diff * Math.min(delta * this.speed, 1);
}
this.parts.forEach((part) => {
part.object.position.lerpVectors(
part.originalPosition,
part.targetPosition,
this.progress,
);
});
}
private createParts(model: THREE.Object3D): ExplodedPart[] {
const root = model.children.length === 1 ? model.children[0] : model;
const directChildren = root.children.filter((child) => hasMesh(child));
const sourceObjects =
directChildren.length > 1 ? directChildren : getMeshes(root);
if (sourceObjects.length === 0) return [];
_center.set(0, 0, 0);
sourceObjects.forEach((object) => _center.add(object.position));
_center.divideScalar(sourceObjects.length);
return sourceObjects.map((object, index) => {
const originalPosition = object.position.clone();
_direction.subVectors(originalPosition, _center);
if (_direction.lengthSq() < 0.0001) {
const angle = (index / sourceObjects.length) * Math.PI * 2;
_direction.set(Math.cos(angle), 0.25, Math.sin(angle));
}
_direction.normalize();
return {
object,
originalPosition,
targetPosition: originalPosition
.clone()
.addScaledVector(_direction, this.distance),
};
});
}
}
function hasMesh(object: THREE.Object3D): boolean {
let found = false;
object.traverse((child) => {
if (child instanceof THREE.Mesh) {
found = true;
}
});
return found;
}
function getMeshes(object: THREE.Object3D): THREE.Object3D[] {
const meshes: THREE.Object3D[] = [];
object.traverse((child) => {
if (child instanceof THREE.Mesh) {
meshes.push(child);
}
});
return meshes;
}
+5 -2
View File
@@ -2,8 +2,8 @@ import { useRef } from "react";
import * as THREE from "three"; import * as THREE from "three";
import { Physics, RigidBody, CuboidCollider } from "@react-three/rapier"; import { Physics, RigidBody, CuboidCollider } from "@react-three/rapier";
import { GrabbableObject } from "@/components/three/GrabbableObject"; import { GrabbableObject } from "@/components/three/GrabbableObject";
import { MainFeatureZone } from "@/components/three/MainFeatureZone";
import { TriggerObject } from "@/components/three/TriggerObject"; import { TriggerObject } from "@/components/three/TriggerObject";
import { AnimatedModel } from "@/components/three/AnimatedModel";
import { import {
TEST_SCENE_FLOOR_COLLIDER_HALF_EXTENTS, TEST_SCENE_FLOOR_COLLIDER_HALF_EXTENTS,
TEST_SCENE_FLOOR_POSITION, TEST_SCENE_FLOOR_POSITION,
@@ -86,14 +86,17 @@ export function TestScene({
/> />
</mesh> </mesh>
</TriggerObject> </TriggerObject>
<MainFeatureZone />
</Physics> </Physics>
{/* Temporary: re-enable when Git LFS downloads are available again.
<AnimatedModel <AnimatedModel
modelPath="/models/elec/model.gltf" modelPath="/models/elec/model.gltf"
defaultAnimation="Idle" defaultAnimation="Idle"
position={[0, 0, -5]} position={[0, 0, -5]}
scale={1} scale={1}
/> /> */}
</> </>
); );
} }