feat: lecture du coffret sur les traits rouges et poignée animée
- Combinaison lue sur la ligne des traits rouges ; flèches retirées, traits ajoutés entre les molettes - Poignée : à-coup + son « locked » si code faux, quart de tour si code bon - Nouvelle règle de prop `jiggle` (à-coup aller-retour sur changement de variable) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LgK8Fx9JJPFu8KBuKs51QB
This commit is contained in:
parent
9e08b72759
commit
e9e2e3f378
|
|
@ -95,6 +95,12 @@ export function playSound(name: SoundName): void {
|
||||||
case 'reveal':
|
case 'reveal':
|
||||||
[392, 523, 659].forEach((f, i) => tone(f, 0.6, 'sine', 0.07, i * 0.12));
|
[392, 523, 659].forEach((f, i) => tone(f, 0.6, 'sine', 0.07, i * 0.12));
|
||||||
break;
|
break;
|
||||||
|
case 'locked':
|
||||||
|
// Poignée qui bute : deux chocs métalliques sourds.
|
||||||
|
noise(0.05, 0.3, 0, 650);
|
||||||
|
tone(110, 0.09, 'square', 0.07, 0, 80);
|
||||||
|
noise(0.04, 0.2, 0.11, 500);
|
||||||
|
break;
|
||||||
case 'unlock':
|
case 'unlock':
|
||||||
noise(0.06, 0.2, 0, 2500);
|
noise(0.06, 0.2, 0, 2500);
|
||||||
noise(0.08, 0.25, 0.18, 1800);
|
noise(0.08, 0.25, 0.18, 1800);
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,8 @@ interface Tween {
|
||||||
fromQuat: THREE.Quaternion;
|
fromQuat: THREE.Quaternion;
|
||||||
toQuat: THREE.Quaternion;
|
toQuat: THREE.Quaternion;
|
||||||
t: number;
|
t: number;
|
||||||
|
/** Aller-retour : l'objet revient à son point de départ (à-coup). */
|
||||||
|
bounce?: boolean;
|
||||||
dur: number;
|
dur: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -65,6 +67,8 @@ export class ThreeRenderer extends BaseRenderer {
|
||||||
private camAnim: { from: CamPose; to: CamPose; t: number; dur: number } | null = null;
|
private camAnim: { from: CamPose; to: CamPose; t: number; dur: number } | null = null;
|
||||||
private props = new Map<string, PropEntry>();
|
private props = new Map<string, PropEntry>();
|
||||||
private tweens: Tween[] = [];
|
private tweens: Tween[] = [];
|
||||||
|
/** Dernière valeur vue des variables d'à-coup (`jiggle`), par objet. */
|
||||||
|
private jiggleSeen = new Map<string, number>();
|
||||||
private clock = new THREE.Clock();
|
private clock = new THREE.Clock();
|
||||||
private raf = 0;
|
private raf = 0;
|
||||||
private resizeObs: ResizeObserver;
|
private resizeObs: ResizeObserver;
|
||||||
|
|
@ -349,6 +353,7 @@ export class ThreeRenderer extends BaseRenderer {
|
||||||
let visible = p.baseVisible;
|
let visible = p.baseVisible;
|
||||||
let emissive: string | null = null;
|
let emissive: string | null = null;
|
||||||
let revealed = false;
|
let revealed = false;
|
||||||
|
let jiggle: THREE.Quaternion | null = null;
|
||||||
for (const rule of this.engine.scenario.props ?? []) {
|
for (const rule of this.engine.scenario.props ?? []) {
|
||||||
if (rule.object !== name || !checkAll(state, rule.when)) continue;
|
if (rule.object !== name || !checkAll(state, rule.when)) continue;
|
||||||
if (rule.visible !== undefined) visible = rule.visible;
|
if (rule.visible !== undefined) visible = rule.visible;
|
||||||
|
|
@ -360,6 +365,15 @@ export class ThreeRenderer extends BaseRenderer {
|
||||||
const angle = (state.vars[rule.spin.var] ?? 0) * rule.spin.step;
|
const angle = (state.vars[rule.spin.var] ?? 0) * rule.spin.step;
|
||||||
quat.multiply(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(...rule.spin.axis).normalize(), angle));
|
quat.multiply(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(...rule.spin.axis).normalize(), angle));
|
||||||
}
|
}
|
||||||
|
if (rule.jiggle) {
|
||||||
|
const key = `${name}:${rule.jiggle.var}`;
|
||||||
|
const value = state.vars[rule.jiggle.var] ?? 0;
|
||||||
|
const seen = this.jiggleSeen.get(key);
|
||||||
|
this.jiggleSeen.set(key, value);
|
||||||
|
if (seen !== undefined && seen !== value && !instant && !this.testMode) {
|
||||||
|
jiggle = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(...rule.jiggle.axis).normalize(), rule.jiggle.angle);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (p.light) {
|
if (p.light) {
|
||||||
p.light.obj.visible = true;
|
p.light.obj.visible = true;
|
||||||
|
|
@ -377,6 +391,10 @@ export class ThreeRenderer extends BaseRenderer {
|
||||||
m.mat.emissiveIntensity = m.intensity;
|
m.mat.emissiveIntensity = m.intensity;
|
||||||
}
|
}
|
||||||
const moved = !p.obj.position.equals(pos) || p.obj.quaternion.angleTo(quat) > 1e-4;
|
const moved = !p.obj.position.equals(pos) || p.obj.quaternion.angleTo(quat) > 1e-4;
|
||||||
|
if (!moved && jiggle) {
|
||||||
|
this.tweens = this.tweens.filter((t) => t.obj !== p.obj);
|
||||||
|
this.tweens.push({ obj: p.obj, fromPos: pos.clone(), toPos: pos.clone(), fromQuat: quat.clone(), toQuat: quat.clone().multiply(jiggle), t: 0, dur: 0.22, bounce: true });
|
||||||
|
}
|
||||||
if (!moved) continue;
|
if (!moved) continue;
|
||||||
this.tweens = this.tweens.filter((t) => t.obj !== p.obj);
|
this.tweens = this.tweens.filter((t) => t.obj !== p.obj);
|
||||||
if (instant || this.testMode) {
|
if (instant || this.testMode) {
|
||||||
|
|
@ -566,7 +584,7 @@ export class ThreeRenderer extends BaseRenderer {
|
||||||
|
|
||||||
for (const tw of this.tweens) {
|
for (const tw of this.tweens) {
|
||||||
tw.t = Math.min(1, tw.t + dt / tw.dur);
|
tw.t = Math.min(1, tw.t + dt / tw.dur);
|
||||||
const k = ease(tw.t);
|
const k = tw.bounce ? Math.sin(Math.PI * tw.t) : ease(tw.t);
|
||||||
tw.obj.position.lerpVectors(tw.fromPos, tw.toPos, k);
|
tw.obj.position.lerpVectors(tw.fromPos, tw.toPos, k);
|
||||||
tw.obj.quaternion.slerpQuaternions(tw.fromQuat, tw.toQuat, k);
|
tw.obj.quaternion.slerpQuaternions(tw.fromQuat, tw.toQuat, k);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ export type Action =
|
||||||
/** Propose de noter un indice dans le carnet (bouton dans le message affiché). */
|
/** Propose de noter un indice dans le carnet (bouton dans le message affiché). */
|
||||||
| { clue: string };
|
| { clue: string };
|
||||||
|
|
||||||
export type SoundName = 'click' | 'step' | 'success' | 'error' | 'unlock' | 'drawer' | 'pickup' | 'beep' | 'dial' | 'switch' | 'power' | 'reveal';
|
export type SoundName = 'click' | 'step' | 'success' | 'error' | 'unlock' | 'drawer' | 'pickup' | 'beep' | 'dial' | 'switch' | 'power' | 'reveal' | 'locked';
|
||||||
|
|
||||||
export type CursorKind = 'look' | 'zoom' | 'take' | 'use' | 'left' | 'right' | 'back';
|
export type CursorKind = 'look' | 'zoom' | 'take' | 'use' | 'left' | 'right' | 'back';
|
||||||
|
|
||||||
|
|
@ -92,6 +92,11 @@ export interface PropRule {
|
||||||
* autour de `axis`, ajoutée à la rotation initiale. Ex. une molette de cadenas.
|
* autour de `axis`, ajoutée à la rotation initiale. Ex. une molette de cadenas.
|
||||||
*/
|
*/
|
||||||
spin?: { var: string; axis: Vec3; step: number };
|
spin?: { var: string; axis: Vec3; step: number };
|
||||||
|
/**
|
||||||
|
* À-coup aller-retour de `angle` radians autour de `axis` chaque fois que la
|
||||||
|
* variable change (ex. une poignée qui bute sur un pêne verrouillé).
|
||||||
|
*/
|
||||||
|
jiggle?: { var: string; axis: Vec3; angle: number };
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Déclencheur global : s'exécute une seule fois, dès que ses conditions sont vraies. */
|
/** Déclencheur global : s'exécute une seule fois, dès que ses conditions sont vraies. */
|
||||||
|
|
|
||||||
|
|
@ -240,6 +240,29 @@
|
||||||
"step": 0.6283
|
"step": 0.6283
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"object": "safeHandle",
|
||||||
|
"jiggle": {
|
||||||
|
"var": "handleTries",
|
||||||
|
"axis": [
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
1
|
||||||
|
],
|
||||||
|
"angle": -0.2
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"object": "safeHandle",
|
||||||
|
"when": [
|
||||||
|
"flag:safe_open"
|
||||||
|
],
|
||||||
|
"rotation": [
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
-1.5708
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"object": "safeDoor",
|
"object": "safeDoor",
|
||||||
"when": [
|
"when": [
|
||||||
|
|
@ -1505,7 +1528,10 @@
|
||||||
{
|
{
|
||||||
"do": [
|
"do": [
|
||||||
{
|
{
|
||||||
"sound": "error"
|
"add": "handleTries"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"sound": "locked"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"message": "La poignée résiste : la combinaison n’est pas la bonne."
|
"message": "La poignée résiste : la combinaison n’est pas la bonne."
|
||||||
|
|
|
||||||
|
|
@ -668,13 +668,10 @@ function strongbox(): THREE.Group {
|
||||||
door.add(dial);
|
door.add(dial);
|
||||||
});
|
});
|
||||||
door.add(box(0.28, 0.08, 0.012, M.dark, w / 2, -0.01, 0.026)); // fente des molettes
|
door.add(box(0.28, 0.08, 0.012, M.dark, w / 2, -0.01, 0.026)); // fente des molettes
|
||||||
// Repères de lecture : deux flèches rouges de part et d'autre de la ligne de code.
|
// Repères de lecture : traits rouges alignés sur la ligne de code, de part et d'autre et entre les molettes.
|
||||||
const markMat = new THREE.MeshStandardMaterial({ color: '#c0281c', emissive: '#c0281c', emissiveIntensity: 0.35, roughness: 0.4 });
|
const markMat = new THREE.MeshStandardMaterial({ color: '#c0281c', emissive: '#c0281c', emissiveIntensity: 0.35, roughness: 0.4 });
|
||||||
[-1, 1].forEach((side) => {
|
[-0.143, -0.07, 0, 0.07, 0.143].forEach((dx) => {
|
||||||
const arrow = new THREE.Mesh(new THREE.ConeGeometry(0.012, 0.022, 3), markMat);
|
door.add(box(Math.abs(dx) > 0.1 ? 0.012 : 0.014, 0.003, 0.004, markMat, w / 2 + dx, -0.01, 0.07));
|
||||||
arrow.rotation.z = (side * Math.PI) / 2; // pointe vers les molettes
|
|
||||||
arrow.position.set(w / 2 + side * 0.155, -0.01, 0.04);
|
|
||||||
door.add(arrow, box(0.012, 0.003, 0.004, markMat, w / 2 + side * 0.143, -0.01, 0.07));
|
|
||||||
});
|
});
|
||||||
// Poignée : c'est elle qui tente d'ouvrir le coffret.
|
// Poignée : c'est elle qui tente d'ouvrir le coffret.
|
||||||
const handle = new THREE.Mesh(new THREE.CylinderGeometry(0.01, 0.01, 0.1, 12), M.brass);
|
const handle = new THREE.Mesh(new THREE.CylinderGeometry(0.01, 0.01, 0.1, 12), M.brass);
|
||||||
|
|
|
||||||
|
|
@ -456,8 +456,8 @@ export function dialDigits(): THREE.CanvasTexture {
|
||||||
g.save();
|
g.save();
|
||||||
g.translate((k * w) / 10, h / 2);
|
g.translate((k * w) / 10, h / 2);
|
||||||
g.rotate(Math.PI / 2);
|
g.rotate(Math.PI / 2);
|
||||||
// Décalage d'une case : la case 1 de la bande est face à l'avant au repos.
|
// Calé pour que la valeur de la molette se lise sur la ligne des traits rouges.
|
||||||
g.fillText(String((k + 9) % 10), 0, 4);
|
g.fillText(String(k % 10), 0, 4);
|
||||||
g.restore();
|
g.restore();
|
||||||
g.fillStyle = 'rgba(0,0,0,.25)';
|
g.fillStyle = 'rgba(0,0,0,.25)';
|
||||||
g.fillRect(((k + 0.5) * w) / 10 - 2, 0, 4, h);
|
g.fillRect(((k + 0.5) * w) / 10 - 2, 0, 4, h);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue