giers10/webeditor3d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auto-git:

Browse Source 
[add] tests/unit/runtime-interaction-system.test.ts
 [change] src/runtime-three/runtime-host.ts
This commit is contained in:
Victor Giers
2026-04-25 04:21:22 +02:00
parent 0f1d626504
commit 352bfba286
2 changed files with 463 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

284
src/runtime-three/runtime-host.ts
View File

@@ -881,6 +881,7 @@ export class RuntimeHost {
this.thirdPersonController.resetSceneState();
this.interactionSystem.reset();
this.setInteractionPrompt(null);
this.clearRuntimeTargetingState();
this.setRuntimeDialogue(null);
this.manualPauseActive = false;
this.controlPauseActive = false;
@@ -955,6 +956,10 @@ export class RuntimeHost {
setNavigationMode(mode: RuntimeNavigationMode) {
this.desiredNavigationMode = mode;
if (mode === "firstPerson") {
this.clearRuntimeTargetingState();
}
if (this.runtimeScene === null || !this.sceneReady) {
return;
}
@@ -1099,6 +1104,7 @@ export class RuntimeHost {
this.activeController = null;
this.resetPlayerCameraEffects();
this.setInteractionPrompt(null);
this.clearRuntimeTargetingState();
this.resizeObserver?.disconnect();
this.resizeObserver = null;
this.clearLocalLights();
@@ -1144,6 +1150,12 @@ export class RuntimeHost {
this.environmentBlendCache?.dispose();
this.shaderSkyEnvironmentBlendCache?.dispose();
this.shaderSkyEnvironmentCache?.dispose();
this.targetingLuxMesh.geometry.dispose();
this.targetingLuxMesh.material.dispose();
this.targetingActiveRing.geometry.dispose();
this.targetingActiveRing.material.dispose();
this.targetingActiveArrow.geometry.dispose();
this.targetingActiveArrow.material.dispose();
this.worldBackgroundRenderer.dispose();
this.renderer?.forceContextLoss();
this.renderer?.dispose();
@@ -1301,6 +1313,9 @@ export class RuntimeHost {
this.activeController?.deactivate(this.controllerContext);
this.interactionSystem.reset();
this.setInteractionPrompt(null);
if (nextController === this.firstPersonController) {
this.clearRuntimeTargetingState();
}
this.activeController = nextController;
this.activeController.activate(this.controllerContext);
}
@@ -4689,13 +4704,16 @@ export class RuntimeHost {
const dt = Math.min((now - this.previousFrameTime) / 1000, 1 / 20);
this.previousFrameTime = now;
this.updatePauseInputState();
this.updateRuntimeTargetingInputState();
const simulationDt = this.isRuntimePaused() ? 0 : dt;
const cameraDt = dt;
const previousCameraPose = this.captureCurrentCameraPose();
this.updateRuntimeDialogueParticipants(cameraDt);
this.refreshRuntimeTargetingState();
this.activeController?.update(simulationDt);
const activeCameraRig = this.applyActiveCameraRig(cameraDt, previousCameraPose);
this.updateRuntimeTargetingVisuals(cameraDt);
if (!this.isActiveExternalCameraSource() && activeCameraRig === null) {
this.applyPlayerCameraEffects(simulationDt);
@@ -5339,6 +5357,243 @@ export class RuntimeHost {
);
}
private clearRuntimeTargetingState() {
this.runtimeTargetCandidates = [];
this.proposedRuntimeTarget = null;
this.activeRuntimeTargetReference = null;
this.previousTargetCycleInputActive = false;
this.targetingLuxInitialized = false;
this.targetingVisualGroup.visible = false;
this.targetingLuxGroup.visible = false;
this.targetingActiveGroup.visible = false;
}
private resolveActiveRuntimeTarget(): RuntimeResolvedTarget | null {
if (
this.runtimeScene === null ||
this.activeRuntimeTargetReference === null
) {
return null;
}
return resolveRuntimeTargetReference(
this.runtimeScene,
this.activeRuntimeTargetReference
);
}
private refreshRuntimeTargetingState() {
if (
this.runtimeScene === null ||
this.currentPlayerControllerTelemetry === null ||
!this.sceneReady ||
this.activeController !== this.thirdPersonController
) {
if (this.activeController === this.firstPersonController) {
this.clearRuntimeTargetingState();
} else {
this.runtimeTargetCandidates = [];
this.proposedRuntimeTarget = null;
}
return;
}
if (this.currentDialogue !== null) {
this.runtimeTargetCandidates = [];
this.proposedRuntimeTarget = null;
return;
}
this.camera.getWorldDirection(this.cameraForward);
const previousProposedId = this.proposedRuntimeTarget?.entityId ?? null;
this.runtimeTargetCandidates = resolveRuntimeTargetCandidates({
interactionOrigin: this.currentPlayerControllerTelemetry.eyePosition,
cameraPosition: {
x: this.camera.position.x,
y: this.camera.position.y,
z: this.camera.position.z
},
cameraForward: {
x: this.cameraForward.x,
y: this.cameraForward.y,
z: this.cameraForward.z
},
runtimeScene: this.runtimeScene,
previousProposedTargetEntityId: previousProposedId
});
if (
this.activeRuntimeTargetReference !== null &&
this.resolveActiveRuntimeTarget() === null
) {
this.activeRuntimeTargetReference = null;
}
this.proposedRuntimeTarget = resolveStableRuntimeTargetProposal(
this.runtimeTargetCandidates,
previousProposedId
);
}
private activateOrCycleRuntimeTarget() {
if (
this.runtimeScene === null ||
!this.sceneReady ||
this.activeController !== this.thirdPersonController ||
this.currentDialogue !== null
) {
if (this.activeController === this.firstPersonController) {
this.clearRuntimeTargetingState();
}
return;
}
if (this.activeRuntimeTargetReference === null) {
const nextTarget =
this.proposedRuntimeTarget ?? this.runtimeTargetCandidates[0] ?? null;
if (nextTarget !== null) {
this.activeRuntimeTargetReference = {
kind: nextTarget.kind,
entityId: nextTarget.entityId
};
}
return;
}
if (this.runtimeTargetCandidates.length === 0) {
return;
}
const activeEntityId = this.activeRuntimeTargetReference.entityId;
const activeIndex = this.runtimeTargetCandidates.findIndex(
(candidate) => candidate.entityId === activeEntityId
);
const nextIndex =
activeIndex < 0
? 0
: (activeIndex + 1) % this.runtimeTargetCandidates.length;
const nextTarget = this.runtimeTargetCandidates[nextIndex]!;
this.activeRuntimeTargetReference = {
kind: nextTarget.kind,
entityId: nextTarget.entityId
};
this.proposedRuntimeTarget = nextTarget;
}
private clearActiveRuntimeTarget() {
this.activeRuntimeTargetReference = null;
}
private updateRuntimeTargetingInputState() {
if (this.runtimeScene === null || !this.sceneReady) {
this.previousTargetCycleInputActive = false;
return;
}
const targetInputActive = resolveDefaultTargetCycleInput() >= 0.5;
if (targetInputActive && !this.previousTargetCycleInputActive) {
this.activateOrCycleRuntimeTarget();
}
this.previousTargetCycleInputActive = targetInputActive;
}
private resolveThirdPersonTargetAssist() {
if (
this.runtimeScene === null ||
this.activeController !== this.thirdPersonController ||
this.currentDialogue !== null ||
this.resolveActiveRuntimeCameraRig() !== null ||
this.resolveDialogueAttentionNpc() !== null
) {
return null;
}
const activeTarget = this.resolveActiveRuntimeTarget();
if (activeTarget !== null) {
return {
targetPosition: activeTarget.center,
strength: ACTIVE_TARGET_CAMERA_ASSIST_STRENGTH
};
}
if (this.proposedRuntimeTarget !== null) {
return {
targetPosition: this.proposedRuntimeTarget.center,
strength: PROPOSED_TARGET_CAMERA_ASSIST_STRENGTH
};
}
return null;
}
private updateRuntimeTargetingVisuals(dt: number) {
const activeTarget = this.resolveActiveRuntimeTarget();
const visualTarget = activeTarget ?? this.proposedRuntimeTarget;
const shouldShow =
visualTarget !== null &&
this.runtimeScene !== null &&
this.sceneReady &&
this.activeController === this.thirdPersonController &&
this.currentDialogue === null &&
!this.isActiveExternalCameraSource() &&
this.resolveActiveRuntimeCameraRig() === null &&
this.resolveDialogueAttentionNpc() === null;
if (!shouldShow || visualTarget === null) {
this.targetingVisualGroup.visible = false;
this.targetingLuxGroup.visible = false;
this.targetingActiveGroup.visible = false;
this.targetingLuxInitialized = false;
return;
}
const lift = clampScalar(visualTarget.range * 0.18, 0.25, 0.55);
const targetLuxPosition = {
x: visualTarget.center.x,
y: visualTarget.center.y + lift,
z: visualTarget.center.z
};
if (!this.targetingLuxInitialized) {
this.targetingLuxGroup.position.set(
targetLuxPosition.x,
targetLuxPosition.y,
targetLuxPosition.z
);
this.targetingLuxInitialized = true;
} else {
const alpha = 1 - Math.exp(-TARGETING_LUX_FOLLOW_RATE * Math.max(0, dt));
this.targetingLuxGroup.position.lerp(
new Vector3(
targetLuxPosition.x,
targetLuxPosition.y,
targetLuxPosition.z
),
alpha
);
}
this.targetingVisualGroup.visible = true;
this.targetingLuxGroup.visible = true;
this.targetingActiveGroup.visible = activeTarget !== null;
if (activeTarget !== null) {
this.targetingActiveGroup.position.set(
activeTarget.center.x,
activeTarget.center.y,
activeTarget.center.z
);
const markerScale = clampScalar(activeTarget.range * 1.05, 0.85, 2.4);
this.targetingActiveGroup.scale.setScalar(markerScale);
this.targetingActiveGroup.lookAt(this.camera.position);
}
}
private handleRuntimeClick = () => {
if (
!this.sceneReady ||
@@ -5395,11 +5650,7 @@ export class RuntimeHost {
};
private handleRuntimeKeyDown = (event: KeyboardEvent) => {
if (
this.runtimeScene === null ||
!this.sceneReady ||
event.code !== this.runtimeScene.playerInputBindings.keyboard.pauseTime
) {
if (this.runtimeScene === null || !this.sceneReady) {
return;
}
@@ -5416,10 +5667,24 @@ export class RuntimeHost {
return;
}
this.pressedKeys.add(event.code);
event.preventDefault();
this.toggleManualPause();
this.previousPauseInputActive = true;
if (event.code === "Tab") {
event.preventDefault();
this.activateOrCycleRuntimeTarget();
this.previousTargetCycleInputActive = true;
return;
}
if (event.code === "Escape" && this.activeRuntimeTargetReference !== null) {
event.preventDefault();
this.clearActiveRuntimeTarget();
return;
}
if (event.code === this.runtimeScene.playerInputBindings.keyboard.pauseTime) {
event.preventDefault();
this.toggleManualPause();
this.previousPauseInputActive = true;
}
};
private handleRuntimeKeyUp = (event: KeyboardEvent) => {
@@ -5478,6 +5743,7 @@ export class RuntimeHost {
private handleRuntimeBlur = () => {
this.pressedKeys.clear();
this.previousPauseInputActive = false;
this.previousTargetCycleInputActive = false;
this.cameraRigLookDragging = false;
};

188
tests/unit/runtime-interaction-system.test.ts Normal file
View File

@@ -0,0 +1,188 @@
import { describe, expect, it } from "vitest";
import type { InteractionLink } from "../../src/interactions/interaction-links";
import {
resolveRuntimeTargetCandidates,
resolveRuntimeTargetReference,
resolveStableRuntimeTargetProposal,
RuntimeInteractionSystem,
type RuntimeTargetCandidate
} from "../../src/runtime-three/runtime-interaction-system";
import type {
RuntimeInteractable,
RuntimeNpc,
RuntimeSceneDefinition
} from "../../src/runtime-three/runtime-scene-build";
function createClickLink(sourceEntityId: string): InteractionLink {
return {
id: `link-${sourceEntityId}`,
sourceEntityId,
trigger: "click",
action: {
type: "runSequence",
sequenceId: "noop"
}
};
}
function createNpc(overrides: Partial<RuntimeNpc> & { entityId: string }): RuntimeNpc {
return {
entityId: overrides.entityId,
actorId: overrides.actorId ?? "",
name: overrides.name,
visible: overrides.visible ?? true,
position: overrides.position ?? { x: 0, y: 0, z: 0 },
yawDegrees: overrides.yawDegrees ?? 0,
modelAssetId: overrides.modelAssetId ?? null,
dialogues: overrides.dialogues ?? [],
defaultDialogueId: overrides.defaultDialogueId ?? null,
collider:
overrides.collider ?? {
mode: "capsule",
radius: 0.35,
height: 1.8
},
activeRoutineTitle: overrides.activeRoutineTitle ?? null,
animationClipName: overrides.animationClipName ?? null,
animationLoop: overrides.animationLoop,
resolvedPath: overrides.resolvedPath ?? null
};
}
function createInteractable(
overrides: Partial<RuntimeInteractable> & { entityId: string }
): RuntimeInteractable {
return {
entityId: overrides.entityId,
position: overrides.position ?? { x: 0, y: 0, z: 0 },
radius: overrides.radius ?? 4,
prompt: overrides.prompt ?? "Interact",
interactionEnabled: overrides.interactionEnabled ?? true
};
}
function createRuntimeSceneFixture(options: {
npcs?: RuntimeNpc[];
interactables?: RuntimeInteractable[];
links?: InteractionLink[];
}): RuntimeSceneDefinition {
return {
entities: {
npcs: options.npcs ?? [],
interactables: options.interactables ?? [],
playerStarts: [],
sceneEntries: [],
cameraRigs: [],
soundEmitters: [],
triggerVolumes: [],
teleportTargets: []
},
interactionLinks: options.links ?? []
} as unknown as RuntimeSceneDefinition;
}
describe("runtime interaction targeting", () => {
it("orders visible NPC and interactable targets by view and distance score", () => {
const centerNpc = createNpc({
entityId: "npc-center",
name: "Center",
position: { x: 0, y: 0, z: 3 }
});
const sideInteractable = createInteractable({
entityId: "interactable-side",
position: { x: 1.5, y: 1, z: 3 },
radius: 4,
prompt: "Use"
});
const scene = createRuntimeSceneFixture({
npcs: [centerNpc],
interactables: [sideInteractable],
links: [createClickLink(centerNpc.entityId), createClickLink(sideInteractable.entityId)]
});
const candidates = resolveRuntimeTargetCandidates({
interactionOrigin: { x: 0, y: 1, z: 2.5 },
cameraPosition: { x: 0, y: 1.6, z: 0 },
cameraForward: { x: 0, y: 0, z: 1 },
runtimeScene: scene
});
expect(candidates.map((candidate) => candidate.entityId)).toEqual([
"npc-center",
"interactable-side"
]);
});
it("keeps a previous proposed target stable across small score changes", () => {
const candidates: RuntimeTargetCandidate[] = [
{
kind: "npc",
entityId: "new-best",
prompt: "Talk",
position: { x: 0, y: 0, z: 0 },
center: { x: 0, y: 1, z: 0 },
distance: 1,
range: 2,
viewDot: 0.99,
score: 2.05
},
{
kind: "interactable",
entityId: "previous",
prompt: "Use",
position: { x: 0, y: 0, z: 0 },
center: { x: 0, y: 1, z: 0 },
distance: 1,
range: 2,
viewDot: 0.95,
score: 2
}
];
expect(
resolveStableRuntimeTargetProposal(candidates, "previous")?.entityId
).toBe("previous");
});
it("keeps click prompt resolution coherent with the shared target sources", () => {
const npc = createNpc({
entityId: "npc-talk",
name: "Guard",
position: { x: 0, y: 0, z: 3 }
});
const scene = createRuntimeSceneFixture({
npcs: [npc],
links: [createClickLink(npc.entityId)]
});
const system = new RuntimeInteractionSystem();
const prompt = system.resolveClickInteractionPrompt(
{ x: 0, y: 1, z: 2.5 },
{ x: 0, y: 1, z: 0 },
{ x: 0, y: 0, z: 1 },
scene
);
expect(prompt?.sourceEntityId).toBe(npc.entityId);
expect(prompt?.prompt).toBe("Interact with Guard");
});
it("invalidates resolved targets when the runtime target is no longer usable", () => {
const interactable = createInteractable({
entityId: "switch",
interactionEnabled: false
});
const scene = createRuntimeSceneFixture({
interactables: [interactable],
links: [createClickLink(interactable.entityId)]
});
expect(
resolveRuntimeTargetReference(scene, {
kind: "interactable",
entityId: interactable.entityId
})
).toBeNull();
});
});