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

Enhance target assist by tracking look input direction and refining target state logic

Browse Source
This commit is contained in:
Victor Giers
2026-04-25 15:52:16 +02:00
parent 9471475e58
commit d7822b9741
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,8 +329,7 @@ const DIALOGUE_PARTICIPANT_RESTORE_EPSILON_DEGREES = 0.5;
const TARGETING_LUX_FOLLOW_RATE = 8; const TARGETING_LUX_FOLLOW_RATE = 8;
const TARGETING_LUX_BOB_RATE = 4.2; const TARGETING_LUX_BOB_RATE = 4.2;
const TARGETING_LUX_PULSE_RATE = 6.5; const TARGETING_LUX_PULSE_RATE = 6.5;
const TARGETING_SIDE_SWITCH_YAW_THRESHOLD_RADIANS = (12 * Math.PI) / 180; const TARGETING_SIDE_SWITCH_EPSILON_RADIANS = Math.PI / 180;
const TARGETING_CANCEL_YAW_THRESHOLD_RADIANS = (60 * Math.PI) / 180;
const TARGETING_MAX_ACTIVE_TARGET_DISTANCE = 15; const TARGETING_MAX_ACTIVE_TARGET_DISTANCE = 15;
// Proposed-target camera nudging is intentionally disabled for now. Lux alone // Proposed-target camera nudging is intentionally disabled for now. Lux alone
// should communicate proposal without moving the gameplay camera. // should communicate proposal without moving the gameplay camera.
@@ -657,6 +656,7 @@ export class RuntimeHost {
private runtimeTargetCandidates: RuntimeTargetCandidate[] = []; private runtimeTargetCandidates: RuntimeTargetCandidate[] = [];
private proposedRuntimeTarget: RuntimeTargetCandidate | null = null; private proposedRuntimeTarget: RuntimeTargetCandidate | null = null;
private activeRuntimeTargetReference: RuntimeTargetReference | null = null; private activeRuntimeTargetReference: RuntimeTargetReference | null = null;
private runtimeTargetLookInputHeldDirection: -1 | 1 | null = null;
private previousTargetCycleInputActive = false; private previousTargetCycleInputActive = false;
private activeCameraRigOverrideEntityId: string | null = null; private activeCameraRigOverrideEntityId: string | null = null;
private activeCameraSourceKey: RuntimeCameraSourceKey | null = null; private activeCameraSourceKey: RuntimeCameraSourceKey | null = null;
@@ -807,6 +807,8 @@ export class RuntimeHost {
) ?? { ...desiredCameraPosition }, ) ?? { ...desiredCameraPosition },
resolveThirdPersonTargetAssist: () => resolveThirdPersonTargetAssist: () =>
this.resolveThirdPersonTargetAssist(), this.resolveThirdPersonTargetAssist(),
handleRuntimeTargetLookInput: (horizontalIntent) =>
this.handleRuntimeTargetLookInput(horizontalIntent),
isCameraDrivenExternally: () => isCameraDrivenExternally: () =>
this.resolveActiveRuntimeCameraRig() !== null || this.resolveActiveRuntimeCameraRig() !== null ||
this.resolveDialogueAttentionNpc() !== null, this.resolveDialogueAttentionNpc() !== null,
@@ -5429,6 +5431,7 @@ export class RuntimeHost {
this.runtimeTargetCandidates = []; this.runtimeTargetCandidates = [];
this.proposedRuntimeTarget = null; this.proposedRuntimeTarget = null;
this.activeRuntimeTargetReference = null; this.activeRuntimeTargetReference = null;
this.runtimeTargetLookInputHeldDirection = null;
this.previousTargetCycleInputActive = false; this.previousTargetCycleInputActive = false;
this.targetingLuxInitialized = false; this.targetingLuxInitialized = false;
this.targetingVisualTime = 0; this.targetingVisualTime = 0;
@@ -5453,6 +5456,7 @@ export class RuntimeHost {
private setActiveRuntimeTargetReference(reference: RuntimeTargetReference | null) { private setActiveRuntimeTargetReference(reference: RuntimeTargetReference | null) {
this.activeRuntimeTargetReference = reference; this.activeRuntimeTargetReference = reference;
this.runtimeTargetLookInputHeldDirection = null;
} }
private refreshRuntimeTargetingState() { private refreshRuntimeTargetingState() {
@@ -5522,6 +5526,11 @@ export class RuntimeHost {
return; return;
} }
if (this.activeRuntimeTargetReference !== null) {
this.clearActiveRuntimeTarget();
return;
}
if (this.activeRuntimeTargetReference === null) { if (this.activeRuntimeTargetReference === null) {
const nextTarget = const nextTarget =
this.proposedRuntimeTarget ?? this.runtimeTargetCandidates[0] ?? null; this.proposedRuntimeTarget ?? this.runtimeTargetCandidates[0] ?? null;