@terraware/web-components 5.0.1 → 5.0.3

package/components/VirtualWalkthrough/SplatModel.js

@@ -76,7 +76,8 @@ const SplatModel = ({
       aabbMax: cropAabbMax,
       edgeScaleFactor: cropEdgeScaleFactor
     })), /*#__PURE__*/jsx(SplatRevealRain, {
-      enabled: revealRain
+      enabled: revealRain,
+      scaleFactor: scaleFactor
     })]
   });
 };

package/components/VirtualWalkthrough/SplatRevealRain.d.ts

@@ -1,5 +1,7 @@
 interface SplatRevealRainProps {
     enabled?: boolean;
+    restartOnVr?: boolean;
+    scaleFactor?: number;
     center?: [number, number, number];
     distance?: number;
     speed?: number;
@@ -13,6 +15,6 @@ interface SplatRevealRainProps {
     hitDuration?: number;
     endRadius?: number;
 }
-declare const SplatRevealRain: ({ enabled, center, distance, speed, acceleration, flightTime, rainSize, rotation, fallTint, fallTintIntensity, hitTint, hitDuration, endRadius, }: SplatRevealRainProps) => import("react/jsx-runtime").JSX.Element;
+declare const SplatRevealRain: ({ enabled, restartOnVr, scaleFactor, center, distance, speed, acceleration, flightTime, rainSize, rotation, fallTint, fallTintIntensity, hitTint, hitDuration, endRadius, }: SplatRevealRainProps) => import("react/jsx-runtime").JSX.Element;
 export default SplatRevealRain;
 //# sourceMappingURL=SplatRevealRain.d.ts.map

package/components/VirtualWalkthrough/SplatRevealRain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SplatRevealRain.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/SplatRevealRain.tsx"],"names":[],"mappings":"AAMA,UAAU,oBAAoB;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,QAAA,MAAM,eAAe,GAAI,mJActB,oBAAoB,4CAmBtB,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"SplatRevealRain.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/SplatRevealRain.tsx"],"names":[],"mappings":"AAQA,UAAU,oBAAoB;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,QAAA,MAAM,eAAe,GAAI,6KAgBtB,oBAAoB,4CAyBtB,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/components/VirtualWalkthrough/SplatRevealRain.js

@@ -1,14 +1,17 @@
-import 'react';
+import { useRef } from 'react';
 import { Script } from '@playcanvas/react/components';
 import { Color, Vec3 } from 'playcanvas';
 import { GSplatRevealRain } from 'playcanvas/scripts/esm/gsplat/reveal-rain.mjs';
+import useRestartOnVr from './useRestartOnVr.js';
 import { jsx } from 'react/jsx-runtime';
 
 const SplatRevealRain = ({
   enabled = true,
+  restartOnVr = true,
+  scaleFactor = 1,
   center = [0, 0, 0],
   distance = 3,
-  speed = 10,
+  speed = 1,
   acceleration = 5,
   flightTime = 0.25,
   rainSize = 0.0,
@@ -19,21 +22,25 @@ const SplatRevealRain = ({
   hitDuration = 0,
   endRadius = 5
 }) => {
+  const scale = value => value * scaleFactor;
+  const scriptRef = useRef(null);
+  useRestartOnVr(scriptRef, enabled && restartOnVr);
   return /*#__PURE__*/jsx(Script, {
+    ref: scriptRef,
     script: GSplatRevealRain,
     enabled: enabled,
-    center: new Vec3(...center),
-    distance: distance,
-    speed: speed,
-    acceleration: acceleration,
+    center: new Vec3(...center).mulScalar(scaleFactor),
+    distance: scale(distance),
+    speed: scale(speed),
+    acceleration: scale(acceleration),
     flightTime: flightTime,
-    rainSize: rainSize,
+    rainSize: scale(rainSize),
     rotation: rotation,
     fallTint: new Color(...fallTint),
     fallTintIntensity: fallTintIntensity,
     hitTint: new Color(...hitTint),
     hitDuration: hitDuration,
-    endRadius: endRadius
+    endRadius: scale(endRadius)
   });
 };
 

package/components/VirtualWalkthrough/VirtualWalkthroughViewer.d.ts

@@ -37,6 +37,17 @@ export interface VirtualWalkthroughViewerProps {
      * `rotation`, `scaleFactor` and `revealRain` — take precedence over anything set here.
      */
     splatModelProps?: Partial<SplatModelProps>;
+    /**
+     * Requests a VR session when this goes from false to true, and when the viewer mounts with it
+     * already true. Never re-requests on its own, so exiting VR leaves the user out. Browsers only
+     * grant an immersive session inside a user gesture, so the caller must raise this from a click.
+     */
+    autoStartVr?: boolean;
+    /**
+     * Called whenever the viewer ends up out of XR: when a session ends, and when one was requested
+     * but couldn't be started, in which case the error says why.
+     */
+    onXrExit?: (error?: Error) => void;
     annotations: AnnotationProps[];
     onSaveAnnotations: (annotations: AnnotationProps[]) => void | Promise<void>;
     editable?: boolean;
@@ -45,6 +56,6 @@ export interface VirtualWalkthroughViewerProps {
     onToggleFullScreen?: () => void;
     maxImagesPerAnnotation?: number;
 }
-declare const VirtualWalkthroughViewer: ({ splatSrc, splatFormat, origin, cameraPosition, sceneBounds, groundPlane: groundPlaneProp, skyColor, groundColor, averageCameraHeight, scaleFactor, splatModelProps, annotations, onSaveAnnotations, editable, showFreeFly, isFullScreen, onToggleFullScreen, maxImagesPerAnnotation, }: VirtualWalkthroughViewerProps) => import("react/jsx-runtime").JSX.Element;
+declare const VirtualWalkthroughViewer: ({ splatSrc, splatFormat, origin, cameraPosition, sceneBounds, groundPlane: groundPlaneProp, skyColor, groundColor, averageCameraHeight, scaleFactor, splatModelProps, autoStartVr, onXrExit, annotations, onSaveAnnotations, editable, showFreeFly, isFullScreen, onToggleFullScreen, maxImagesPerAnnotation, }: VirtualWalkthroughViewerProps) => import("react/jsx-runtime").JSX.Element;
 export default VirtualWalkthroughViewer;
 //# sourceMappingURL=VirtualWalkthroughViewer.d.ts.map

package/components/VirtualWalkthrough/VirtualWalkthroughViewer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VirtualWalkthroughViewer.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/VirtualWalkthroughViewer.tsx"],"names":[],"mappings":"AAYA,OAAmB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAO3D,OAAmB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAS3D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAmB5C;;;;GAIG;AACH,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,6CAA6C;IAC7C,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,8CAA8C;IAC9C,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,2FAA2F;IAC3F,WAAW,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7D,uEAAuE;IACvE,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6CAA6C;IAC7C,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAC3C,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,iBAAiB,EAAE,CAAC,WAAW,EAAE,eAAe,EAAE,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,QAAA,MAAM,wBAAwB,GAAI,0RAmB/B,6BAA6B,4CAgY/B,CAAC;AAEF,eAAe,wBAAwB,CAAC"}
+{"version":3,"file":"VirtualWalkthroughViewer.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/VirtualWalkthroughViewer.tsx"],"names":[],"mappings":"AAYA,OAAmB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAO3D,OAAmB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAS3D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAmB5C;;;;GAIG;AACH,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,6CAA6C;IAC7C,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,8CAA8C;IAC9C,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,2FAA2F;IAC3F,WAAW,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7D,uEAAuE;IACvE,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6CAA6C;IAC7C,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAC3C;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IACnC,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,iBAAiB,EAAE,CAAC,WAAW,EAAE,eAAe,EAAE,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,QAAA,MAAM,wBAAwB,GAAI,iTAqB/B,6BAA6B,4CAqa/B,CAAC;AAEF,eAAe,wBAAwB,CAAC"}

package/components/VirtualWalkthrough/VirtualWalkthroughViewer.js

@@ -1,4 +1,4 @@
-import { useState, useMemo, useEffect, useCallback } from 'react';
+import { useState, useCallback, useRef, useEffect, useMemo } from 'react';
 import { useTheme } from '@mui/material';
 import { Entity } from '@playcanvas/react';
 import { Camera, Script } from '@playcanvas/react/components';
@@ -61,6 +61,8 @@ const VirtualWalkthroughViewer = ({
   averageCameraHeight = 0,
   scaleFactor = 1,
   splatModelProps,
+  autoStartVr = false,
+  onXrExit,
   annotations,
   onSaveAnnotations,
   editable = false,
@@ -87,12 +89,46 @@ const VirtualWalkthroughViewer = ({
   const [viewingAnnotation, setViewingAnnotation] = useState(null);
   const [viewingAnnotationIndex, setViewingAnnotationIndex] = useState(-1);
   const [viewedScreenPos, setViewedScreenPos] = useState(null);
+  const reportXrError = useCallback(error => {
+    console.warn(error.message, error);
+    onXrExit?.(error);
+  }, [onXrExit]);
   const {
     isCurrentlyInXr,
     isCurrentlyInVr,
-    isCurrentlyInAr
-  } = useXr();
+    isCurrentlyInAr,
+    isXrAvailable,
+    startXr
+  } = useXr({
+    onError: reportXrError
+  });
   useXrRenderTuning();
+  const autoStartRequested = useRef(false);
+
+  // Edge-triggered so that ending a session doesn't pull the user straight back into one. The ref
+  // is written before the early returns, so lowering the prop re-arms the next rising edge.
+  useEffect(() => {
+    const isRisingEdge = autoStartVr && !autoStartRequested.current;
+    autoStartRequested.current = autoStartVr;
+    if (!isRisingEdge || isCurrentlyInXr) {
+      return;
+    }
+    if (!isXrAvailable('VR')) {
+      reportXrError(new Error('A VR session was requested, but this device reports no immersive VR support'));
+      return;
+    }
+    startXr('VR');
+  }, [autoStartVr, isCurrentlyInXr, isXrAvailable, startXr, reportXrError]);
+  const wasInXr = useRef(false);
+
+  // Edge-detected rather than reported whenever the viewer is out of XR, which would fire on mount
+  // and tell a caller a session had ended before one ever began.
+  useEffect(() => {
+    if (wasInXr.current && !isCurrentlyInXr) {
+      onXrExit?.();
+    }
+    wasInXr.current = isCurrentlyInXr;
+  }, [isCurrentlyInXr, onXrExit]);
   const sceneBoundsRadius = useMemo(() => {
     if (sceneBounds?.m !== undefined) {
       return sceneBounds.m;
@@ -287,7 +323,7 @@ const VirtualWalkthroughViewer = ({
       }), /*#__PURE__*/jsx(XrPointerRay, {}), isCurrentlyInVr && viewingAnnotation && /*#__PURE__*/jsx(VrAnnotationPanel, {
         annotation: viewingAnnotation,
         annotationIndex: viewingAnnotationIndex
-      }, viewingAnnotationIndex), isCurrentlyInXr && /*#__PURE__*/jsx(XrGazeDwell, {
+      }, viewingAnnotationIndex), /*#__PURE__*/jsx(XrGazeDwell, {
         activeIndex: viewingAnnotationIndex
       }), /*#__PURE__*/jsx(Script, {
         script: XrStartPose,
@@ -370,7 +406,8 @@ const VirtualWalkthroughViewer = ({
       onToggleFullScreen: onToggleFullScreen,
       isFreeFly: isFreeFly,
       onToggleFreeFly: handleToggleFreeFly,
-      showFreeFly: showFreeFly
+      showFreeFly: showFreeFly,
+      onError: reportXrError
     }), /*#__PURE__*/jsx(AnnotationPanel, {
       annotation: viewingAnnotation,
       hotspotPosition: viewedScreenPos,

package/components/VirtualWalkthrough/useRestartOnVr.d.ts

@@ -0,0 +1,16 @@
+import { RefObject } from 'react';
+import { Script } from 'playcanvas';
+/**
+ * Replays a one-shot script effect at the start of every VR session.
+ *
+ * `GSplatShaderEffect` zeroes its timeline on the script's `enable` event and switches itself off
+ * once the animation has played out, so re-enabling a finished effect runs it again. The `enabled`
+ * setter only fires the event on a change of state, which is why an effect still mid-play is taken
+ * back through disabled first.
+ *
+ * @param scriptRef - The script instance to replay, as handed back by `Script`'s ref.
+ * @param enabled - Whether the effect is in use at all. No session is watched while false.
+ */
+export declare const useRestartOnVr: (scriptRef: RefObject<Script | null>, enabled: boolean) => void;
+export default useRestartOnVr;
+//# sourceMappingURL=useRestartOnVr.d.ts.map

package/components/VirtualWalkthrough/useRestartOnVr.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRestartOnVr.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/useRestartOnVr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAa,MAAM,OAAO,CAAC;AAG7C,OAAO,EAAE,MAAM,EAAa,MAAM,YAAY,CAAC;AAE/C;;;;;;;;;;GAUG;AACH,eAAO,MAAM,cAAc,GAAI,WAAW,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,SAAS,OAAO,SAwBnF,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/components/VirtualWalkthrough/useRestartOnVr.js

@@ -0,0 +1,38 @@
+import { useEffect } from 'react';
+import { useApp } from '@playcanvas/react/hooks';
+import { XRTYPE_VR } from 'playcanvas';
+
+/**
+ * Replays a one-shot script effect at the start of every VR session.
+ *
+ * `GSplatShaderEffect` zeroes its timeline on the script's `enable` event and switches itself off
+ * once the animation has played out, so re-enabling a finished effect runs it again. The `enabled`
+ * setter only fires the event on a change of state, which is why an effect still mid-play is taken
+ * back through disabled first.
+ *
+ * @param scriptRef - The script instance to replay, as handed back by `Script`'s ref.
+ * @param enabled - Whether the effect is in use at all. No session is watched while false.
+ */
+const useRestartOnVr = (scriptRef, enabled) => {
+  const app = useApp();
+  useEffect(() => {
+    const xr = app?.xr;
+    if (!xr || !enabled) {
+      return;
+    }
+    const restart = () => {
+      const script = scriptRef.current;
+      if (!script || xr.type !== XRTYPE_VR) {
+        return;
+      }
+      script.enabled = false;
+      script.enabled = true;
+    };
+    xr.on('start', restart);
+    return () => {
+      xr.off('start', restart);
+    };
+  }, [app, enabled, scriptRef]);
+};
+
+export { useRestartOnVr as default, useRestartOnVr };

package/components/VirtualWalkthrough/xr-annotation-candidate-buffer.d.ts

@@ -0,0 +1,32 @@
+import { Vec3 } from 'playcanvas';
+/** Local half-extent of the unit-plane hotspot quad. */
+export declare const HOTSPOT_HALF_EXTENT = 0.5;
+export interface AnnotationCandidate {
+    entity: any;
+    script: any;
+    position: Vec3;
+    radius: number;
+}
+/** Pulls the stock annotation script off a hotspot entity, or undefined if it carries none. */
+export type AnnotationScriptLookup = (entity: any) => any;
+/**
+ * Collects world-space hit candidates for the openable annotation hotspots into a buffer it owns and
+ * reuses, so a caller running every frame allocates nothing. The returned array and the candidate
+ * objects inside it are overwritten by the next `collect`, which is why each caller holds its own
+ * buffer rather than sharing one.
+ *
+ * Positions and radii are re-read on every call, so hotspots that move or resize stay targetable.
+ * That read is cheap; it is the allocation around it that a per-frame caller cannot afford.
+ */
+export declare class AnnotationCandidateBuffer {
+    private readonly _getScript;
+    private readonly _candidates;
+    private _root;
+    constructor(_getScript: AnnotationScriptLookup);
+    /**
+     * Hit candidates for every openable hotspot except `excludeName`, with hit spheres derived from
+     * each hotspot's rendered world size and padded by `radiusPad` for easier aiming.
+     */
+    collect(app: any, radiusPad: number, excludeName?: string): AnnotationCandidate[];
+}
+//# sourceMappingURL=xr-annotation-candidate-buffer.d.ts.map

package/components/VirtualWalkthrough/xr-annotation-candidate-buffer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"xr-annotation-candidate-buffer.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/xr-annotation-candidate-buffer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,wDAAwD;AACxD,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAEvC,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,+FAA+F;AAC/F,MAAM,MAAM,sBAAsB,GAAG,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;AAmB1D;;;;;;;;GAQG;AACH,qBAAa,yBAAyB;IAIxB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAHvC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IACzD,OAAO,CAAC,KAAK,CAAa;gBAEG,UAAU,EAAE,sBAAsB;IAE/D;;;OAGG;IACH,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,mBAAmB,EAAE;CA6ClF"}

package/components/VirtualWalkthrough/xr-annotation-candidate-buffer.js

@@ -0,0 +1,88 @@
+import { Vec3 } from 'playcanvas';
+
+/** Local half-extent of the unit-plane hotspot quad. */
+const HOTSPOT_HALF_EXTENT = 0.5;
+
+/** Pulls the stock annotation script off a hotspot entity, or undefined if it carries none. */
+
+const scratchScale = new Vec3();
+
+/**
+ * Whether `node` still hangs beneath `sceneRoot`. An entity that has been removed from the scene
+ * keeps its own `children` array - a destroyed one keeps it as an empty array - so only a walk back
+ * up the parent chain tells a live root apart from a detached one.
+ */
+const isInScene = (node, sceneRoot) => {
+  for (let current = node; current; current = current.parent) {
+    if (current === sceneRoot) {
+      return true;
+    }
+  }
+  return false;
+};
+
+/**
+ * Collects world-space hit candidates for the openable annotation hotspots into a buffer it owns and
+ * reuses, so a caller running every frame allocates nothing. The returned array and the candidate
+ * objects inside it are overwritten by the next `collect`, which is why each caller holds its own
+ * buffer rather than sharing one.
+ *
+ * Positions and radii are re-read on every call, so hotspots that move or resize stay targetable.
+ * That read is cheap; it is the allocation around it that a per-frame caller cannot afford.
+ */
+class AnnotationCandidateBuffer {
+  _candidates = [];
+  _root = null;
+  constructor(_getScript) {
+    this._getScript = _getScript;
+  }
+
+  /**
+   * Hit candidates for every openable hotspot except `excludeName`, with hit spheres derived from
+   * each hotspot's rendered world size and padded by `radiusPad` for easier aiming.
+   */
+  collect(app, radiusPad, excludeName) {
+    // The root is looked up by a walk of the whole scene graph, so it is held onto between frames.
+    // It is re-resolved whenever it leaves the scene: annotations mount after the scene does, and
+    // the root is torn down and built afresh every time the annotation list empties and refills.
+    if (!isInScene(this._root, app.root)) {
+      this._root = app.root.findByName('annotations-root');
+    }
+    const children = this._root?.children;
+    if (!children) {
+      this._candidates.length = 0;
+      return this._candidates;
+    }
+    let count = 0;
+    for (const entity of children) {
+      if (excludeName !== undefined && entity.name === excludeName) {
+        continue;
+      }
+      const script = this._getScript(entity);
+      if (!script || script.enabled === false || typeof script.onVrOpenCallback !== 'function') {
+        continue;
+      }
+      entity.getWorldTransform().getScale(scratchScale);
+      const radius = HOTSPOT_HALF_EXTENT * scratchScale.x * radiusPad;
+      const existing = this._candidates[count];
+      if (existing) {
+        existing.entity = entity;
+        existing.script = script;
+        existing.position = entity.getPosition();
+        existing.radius = radius;
+      } else {
+        this._candidates.push({
+          entity,
+          script,
+          position: entity.getPosition(),
+          radius
+        });
+      }
+      count++;
+    }
+    this._candidates.length = count;
+    return this._candidates;
+  }
+}
+
+export { AnnotationCandidateBuffer, HOTSPOT_HALF_EXTENT };

package/components/VirtualWalkthrough/xr-annotation-candidates.d.ts

@@ -1,18 +1,14 @@
-import { Vec3 } from 'playcanvas';
-/** Local half-extent of the unit-plane hotspot quad. */
-export declare const HOTSPOT_HALF_EXTENT = 0.5;
+import { AnnotationCandidate, AnnotationCandidateBuffer, HOTSPOT_HALF_EXTENT } from './xr-annotation-candidate-buffer';
+export { HOTSPOT_HALF_EXTENT };
+export type { AnnotationCandidate };
 /** Multiplier on the hotspot's world radius to make controller targeting forgiving. */
 export declare const HIT_RADIUS_PAD = 2.5;
-export interface AnnotationCandidate {
-    entity: any;
-    script: any;
-    position: Vec3;
-    radius: number;
-}
+/** A buffer wired to the stock annotation script. Callers that collect every frame hold one of
+ * these; its results are overwritten on the next collect, so one buffer cannot be shared. */
+export declare const createAnnotationCandidateBuffer: () => AnnotationCandidateBuffer;
 /**
- * World-space hit candidates for every openable annotation hotspot: its entity, its stock
- * annotation script (which carries `onVrOpenCallback`), its world position, and a hit-sphere
- * radius derived from the hotspot's rendered world size, padded by `radiusPad` for easier aiming.
+ * One-shot collection for callers that run on an input event rather than every frame, and so have no
+ * reason to hold a buffer of their own.
  */
 export declare const collectAnnotationHitCandidates: (app: any, radiusPad: number) => AnnotationCandidate[];
 //# sourceMappingURL=xr-annotation-candidates.d.ts.map

package/components/VirtualWalkthrough/xr-annotation-candidates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xr-annotation-candidates.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/xr-annotation-candidates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGlC,wDAAwD;AACxD,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAEvC,uFAAuF;AACvF,eAAO,MAAM,cAAc,MAAM,CAAC;AAElC,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAID;;;;GAIG;AACH,eAAO,MAAM,8BAA8B,GAAI,KAAK,GAAG,EAAE,WAAW,MAAM,KAAG,mBAAmB,EAmB/F,CAAC"}
+{"version":3,"file":"xr-annotation-candidates.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/xr-annotation-candidates.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvH,OAAO,EAAE,mBAAmB,EAAE,CAAC;AAC/B,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC,uFAAuF;AACvF,eAAO,MAAM,cAAc,MAAM,CAAC;AAIlC;6FAC6F;AAC7F,eAAO,MAAM,+BAA+B,QAAO,yBACA,CAAC;AAEpD;;;GAGG;AACH,eAAO,MAAM,8BAA8B,GAAI,KAAK,GAAG,EAAE,WAAW,MAAM,KAAG,mBAAmB,EACrC,CAAC"}

package/components/VirtualWalkthrough/xr-annotation-candidates.js

@@ -1,40 +1,19 @@
-import { Vec3 } from 'playcanvas';
 import { Annotation } from 'playcanvas/scripts/esm/annotations.mjs';
-
-/** Local half-extent of the unit-plane hotspot quad. */
-const HOTSPOT_HALF_EXTENT = 0.5;
+import { AnnotationCandidateBuffer } from './xr-annotation-candidate-buffer.js';
+export { HOTSPOT_HALF_EXTENT } from './xr-annotation-candidate-buffer.js';
 
 /** Multiplier on the hotspot's world radius to make controller targeting forgiving. */
 const HIT_RADIUS_PAD = 2.5;
-const scratchScale = new Vec3();
+const annotationScriptOf = entity => entity.script?.get(Annotation.scriptName);
+
+/** A buffer wired to the stock annotation script. Callers that collect every frame hold one of
+ * these; its results are overwritten on the next collect, so one buffer cannot be shared. */
+const createAnnotationCandidateBuffer = () => new AnnotationCandidateBuffer(annotationScriptOf);
 
 /**
- * World-space hit candidates for every openable annotation hotspot: its entity, its stock
- * annotation script (which carries `onVrOpenCallback`), its world position, and a hit-sphere
- * radius derived from the hotspot's rendered world size, padded by `radiusPad` for easier aiming.
+ * One-shot collection for callers that run on an input event rather than every frame, and so have no
+ * reason to hold a buffer of their own.
  */
-const collectAnnotationHitCandidates = (app, radiusPad) => {
-  const root = app.root.findByName('annotations-root');
-  if (!root) {
-    return [];
-  }
-  return root.children.map(entity => ({
-    entity,
-    script: entity.script?.get(Annotation.scriptName)
-  })).filter(({
-    script
-  }) => script && script.enabled !== false && typeof script.onVrOpenCallback === 'function').map(({
-    entity,
-    script
-  }) => {
-    entity.getWorldTransform().getScale(scratchScale);
-    return {
-      entity,
-      script,
-      position: entity.getPosition(),
-      radius: HOTSPOT_HALF_EXTENT * scratchScale.x * radiusPad
-    };
-  });
-};
+const collectAnnotationHitCandidates = (app, radiusPad) => createAnnotationCandidateBuffer().collect(app, radiusPad);
 
-export { HIT_RADIUS_PAD, HOTSPOT_HALF_EXTENT, collectAnnotationHitCandidates };
+export { HIT_RADIUS_PAD, collectAnnotationHitCandidates, createAnnotationCandidateBuffer };

package/components/VirtualWalkthrough/xr-annotation-targeting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xr-annotation-targeting.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/xr-annotation-targeting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAsBD;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,IAAI,EACZ,WAAW,IAAI,EACf,YAAY,sBAAsB,EAAE,KACnC,MAAM,GAAG,IAcX,CAAC"}
+{"version":3,"file":"xr-annotation-targeting.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/xr-annotation-targeting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AA0BD;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,IAAI,EACZ,WAAW,IAAI,EACf,YAAY,sBAAsB,EAAE,KACnC,MAAM,GAAG,IAeX,CAAC"}

package/components/VirtualWalkthrough/xr-annotation-targeting.js

@@ -1,11 +1,15 @@
 import { Vec3 } from 'playcanvas';
 
+// Reused across calls: this runs per candidate per frame, where fresh vectors would be steady GC churn.
+const scratchDir = new Vec3();
+const scratchToCenter = new Vec3();
+
 /**
  * Distance along a (normalized) ray to where it first enters the sphere, or null if it never does.
  * A ray starting inside the sphere returns 0.
  */
 const raySphereEntryDistance = (origin, dir, center, radius) => {
-  const m = new Vec3().sub2(origin, center);
+  const m = scratchToCenter.sub2(origin, center);
   const b = m.dot(dir);
   const c = m.dot(m) - radius * radius;
   if (c > 0 && b > 0) {
@@ -23,16 +27,17 @@ const raySphereEntryDistance = (origin, dir, center, radius) => {
  * Index of the closest candidate sphere the ray enters, or null if it hits none.
  */
 const nearestAnnotationHit = (origin, direction, candidates) => {
-  const dir = direction.clone().normalize();
+  const dir = scratchDir.copy(direction).normalize();
   let bestIndex = null;
   let bestDistance = Infinity;
-  candidates.forEach((candidate, index) => {
+  for (let index = 0; index < candidates.length; index++) {
+    const candidate = candidates[index];
     const distance = raySphereEntryDistance(origin, dir, candidate.position, candidate.radius);
     if (distance !== null && distance < bestDistance) {
       bestDistance = distance;
       bestIndex = index;
     }
-  });
+  }
   return bestIndex;
 };
 

package/components/VirtualWalkthrough/xr-exit-button-mask.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Bakes the exit button's static artwork into a two-channel mask: red covers the backing disc, green
+ * the X glyph. The shader composites the progress sweep between the two, which is what keeps the
+ * glyph legible over the fill.
+ *
+ * The channels have to stay independent, so the glyph is drawn additively rather than over the disc,
+ * and an opaque base goes down first. Uniform full alpha means the mask survives the texture upload
+ * whether or not alpha ends up premultiplied, and antialiased edges keep their coverage.
+ */
+export declare const drawExitButtonMask: (ctx: CanvasRenderingContext2D, size: number) => void;
+//# sourceMappingURL=xr-exit-button-mask.d.ts.map

package/components/VirtualWalkthrough/xr-exit-button-mask.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"xr-exit-button-mask.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/xr-exit-button-mask.ts"],"names":[],"mappings":"AAOA;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,GAAI,KAAK,wBAAwB,EAAE,MAAM,MAAM,SA4B7E,CAAC"}

package/components/VirtualWalkthrough/xr-exit-button-mask.js

@@ -0,0 +1,41 @@
+/** Backing disc radius as a fraction of the button's half-size. Matches the shader's pie radius. */
+const DISC_RADIUS = 0.92;
+
+/** Glyph arm reach and stroke width, as fractions of the drawn size. */
+const GLYPH_ARM = 0.24;
+const GLYPH_WIDTH = 0.09;
+
+/**
+ * Bakes the exit button's static artwork into a two-channel mask: red covers the backing disc, green
+ * the X glyph. The shader composites the progress sweep between the two, which is what keeps the
+ * glyph legible over the fill.
+ *
+ * The channels have to stay independent, so the glyph is drawn additively rather than over the disc,
+ * and an opaque base goes down first. Uniform full alpha means the mask survives the texture upload
+ * whether or not alpha ends up premultiplied, and antialiased edges keep their coverage.
+ */
+const drawExitButtonMask = (ctx, size) => {
+  const c = size / 2;
+  ctx.save();
+  ctx.globalCompositeOperation = 'source-over';
+  ctx.fillStyle = '#000000';
+  ctx.fillRect(0, 0, size, size);
+  ctx.globalCompositeOperation = 'lighter';
+  ctx.fillStyle = '#ff0000';
+  ctx.beginPath();
+  ctx.arc(c, c, c * DISC_RADIUS, 0, Math.PI * 2);
+  ctx.fill();
+  const arm = size * GLYPH_ARM;
+  ctx.strokeStyle = '#00ff00';
+  ctx.lineWidth = size * GLYPH_WIDTH;
+  ctx.lineCap = 'round';
+  ctx.beginPath();
+  ctx.moveTo(c - arm, c - arm);
+  ctx.lineTo(c + arm, c + arm);
+  ctx.moveTo(c + arm, c - arm);
+  ctx.lineTo(c - arm, c + arm);
+  ctx.stroke();
+  ctx.restore();
+};
+
+export { drawExitButtonMask };

package/components/VirtualWalkthrough/xr-exit-button.d.ts

@@ -20,9 +20,6 @@ export declare class XrExitButton extends Script {
     private _headRotation;
     private _worldOffset;
     private _faceButtons;
-    private _canvas?;
-    private _context?;
-    private _drawnProgress;
     private _hold;
     private _arming;
     private _isVrActive;
@@ -31,20 +28,10 @@ export declare class XrExitButton extends Script {
     private _onSelect;
     /** True when the ray points at the button's hit sphere. False while the button entity is disabled. */
     rayHitsButton(origin: Vec3, direction: Vec3): boolean;
-    private _createCanvas;
-    private _createTexture;
-    /**
-     * Repaints the button: dark disc, then the hold progress wedge, then the X arms on top so the
-     * glyph stays legible over the fill. The pie is skipped entirely at zero progress so the idle
-     * button doesn't wear the pie's faint track. Returns whether it painted, so callers can tell a
-     * missing context from a successful repaint.
-     */
-    private _drawButton;
-    /** Repaints only when the drawn wedge would visibly move. Only records the paint on success, so a
-     * missing context doesn't fool the dedupe cache into thinking a repaint already happened. */
-    private _setProgress;
+    /** The button's static artwork, painted once. Only the sweep changes per frame, and that lives in
+     * the shader. */
+    private _createMaskTexture;
     private _resetProgress;
-    private _createMesh;
     initialize(): void;
     update(dt: number): void;
     /**

package/components/VirtualWalkthrough/xr-exit-button.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xr-exit-button.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/xr-exit-button.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,MAAM,EAGN,IAAI,EAGL,MAAM,YAAY,CAAC;AAOpB;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,QAAQ,IAAI,EAAE,WAAW,IAAI,EAAE,QAAQ,IAAI,EAAE,QAAQ,MAAM,KAAG,OAUhG,CAAC;AAOF,qBAAa,YAAa,SAAQ,MAAM;IACtC,MAAM,CAAC,UAAU,SAAkB;IAEnC,yGAAyG;IACzG,MAAM,OAA8B;IAEpC,oFAAoF;IACpF,QAAQ,SAAQ;IAEhB,sGAAsG;IACtG,SAAS,SAAQ;IAEjB,OAAO,CAAC,SAAS,CAAC,CAAmB;IACrC,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,KAAK,CAAC,CAAO;IACrB,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,YAAY,CAAgC;IAEpD,OAAO,CAAC,OAAO,CAAC,CAAoB;IACpC,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,cAAc,CAAM;IAC5B,OAAO,CAAC,KAAK,CAAiC;IAC9C,OAAO,CAAC,OAAO,CAA2B;IAE1C,OAAO,CAAC,WAAW,CAAyE;IAE5F,OAAO,CAAC,UAAU,CAGhB;IAEF,OAAO,CAAC,QAAQ,CASd;IAEF,OAAO,CAAC,SAAS,CAOf;IAEF,sGAAsG;IACtG,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,GAAG,OAAO;IAQrD,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,cAAc;IAgBtB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAiCnB;iGAC6F;IAC7F,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,WAAW;IAYnB,UAAU;IAgCV,MAAM,CAAC,EAAE,EAAE,MAAM;IAoDjB;;;;;OAKG;IACH,OAAO,CAAC,UAAU;IAuBlB,OAAO;CAgBR"}
+{"version":3,"file":"xr-exit-button.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/xr-exit-button.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,MAAM,EAGN,IAAI,EAGL,MAAM,YAAY,CAAC;AASpB;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,QAAQ,IAAI,EAAE,WAAW,IAAI,EAAE,QAAQ,IAAI,EAAE,QAAQ,MAAM,KAAG,OAUhG,CAAC;AAUF,qBAAa,YAAa,SAAQ,MAAM;IACtC,MAAM,CAAC,UAAU,SAAkB;IAEnC,yGAAyG;IACzG,MAAM,OAA8B;IAEpC,oFAAoF;IACpF,QAAQ,SAAQ;IAEhB,sGAAsG;IACtG,SAAS,SAAQ;IAEjB,OAAO,CAAC,SAAS,CAAC,CAAiB;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,KAAK,CAAC,CAAO;IACrB,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,YAAY,CAAgC;IAEpD,OAAO,CAAC,KAAK,CAAiC;IAC9C,OAAO,CAAC,OAAO,CAA2B;IAE1C,OAAO,CAAC,WAAW,CAAyE;IAE5F,OAAO,CAAC,UAAU,CAGhB;IAEF,OAAO,CAAC,QAAQ,CAMd;IAEF,OAAO,CAAC,SAAS,CAOf;IAEF,sGAAsG;IACtG,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,GAAG,OAAO;IAQrD;qBACiB;IACjB,OAAO,CAAC,kBAAkB;IAyB1B,OAAO,CAAC,cAAc;IAKtB,UAAU;IAwBV,MAAM,CAAC,EAAE,EAAE,MAAM;IAiDjB;;;;;OAKG;IACH,OAAO,CAAC,UAAU;IAuBlB,OAAO;CAcR"}