@shopware-ag/dive 1.19.1-beta.0 → 1.19.1-beta.2

package/src/ar/webxr/crosshair/WebXRCrosshair.ts

@@ -1,35 +0,0 @@
-import { Mesh, MeshBasicMaterial, Object3D, RingGeometry } from 'three';
-
-export class DIVEWebXRCrosshair extends Object3D {
-    public set mesh(mesh: Mesh | undefined) {
-        this.clear();
-
-        if (mesh) {
-            this.add(mesh);
-        }
-    }
-
-    constructor(mesh?: Mesh) {
-        super();
-
-        if (mesh) {
-            this.mesh = mesh;
-        } else {
-            this.UseDefaultMesh();
-        }
-
-        this.matrixAutoUpdate = false;
-
-        return this;
-    }
-
-    public UseDefaultMesh(): void {
-        const geometry = new RingGeometry(0.08, 0.1, 32).rotateX(-Math.PI / 2);
-        const material = new MeshBasicMaterial();
-        this.mesh = new Mesh(geometry, material);
-    }
-
-    public UpdateFromPose(pose: XRPose): void {
-        this.matrix.fromArray(pose.transform.matrix);
-    }
-}

package/src/ar/webxr/origin/WebXROrigin.ts

@@ -1,192 +0,0 @@
-import { Matrix4, Quaternion, Vector3 } from 'three';
-import { DIVERenderer } from '../../../renderer/Renderer';
-
-export class DIVEWebXROrigin {
-    private _renderer: DIVERenderer;
-    private _session: XRSession;
-
-    private _requesting: boolean;
-    private _initialized: boolean;
-
-    private _referenceSpaceBuffer: XRReferenceSpace | null;
-    private _hitTestSource: XRHitTestSource | null;
-
-    private _entityTypes: XRHitTestTrackableType[];
-
-    private _hitTestResultBuffer: XRHitTestResult[];
-    private _raycastHitCounter: number = 0;
-
-    private _originSet: Promise<void>;
-    private _originSetResolve: (value: void) => void = () => {};
-    public get originSet(): Promise<void> {
-        return this._originSet;
-    }
-
-    private _matrix: Matrix4;
-    public get matrix(): Matrix4 {
-        return this._matrix;
-    }
-    private set matrix(value: Matrix4) {
-        this._matrix = value;
-        this._matrix.decompose(this._position, this._quaternion, this._scale);
-    }
-
-    private _position: Vector3;
-    public get position(): Vector3 {
-        return this._position;
-    }
-
-    private _quaternion: Quaternion;
-    public get quaternion(): Quaternion {
-        return this._quaternion;
-    }
-
-    private _scale: Vector3;
-    public get scale(): Vector3 {
-        return this._scale;
-    }
-
-    constructor(
-        session: XRSession,
-        renderer: DIVERenderer,
-        entityTypes?: XRHitTestTrackableType[],
-    ) {
-        this._renderer = renderer;
-        this._session = session;
-
-        this._originSet = new Promise<void>((resolve) => {
-            this._originSetResolve = resolve;
-        });
-
-        this._requesting = false;
-        this._initialized = false;
-
-        this._referenceSpaceBuffer = null;
-        this._hitTestSource = null;
-
-        this._entityTypes = entityTypes || ['plane'];
-
-        this._hitTestResultBuffer = [];
-
-        // set up promises and executors
-        this._matrix = new Matrix4();
-        this._position = new Vector3();
-        this._quaternion = new Quaternion();
-        this._scale = new Vector3();
-
-        // when origin is set, decompose matrix into position, quaternion and scale
-        this._originSet.then(() => {
-            // decompose matrix into position, quaternion and scale
-            this._matrix.decompose(
-                this._position,
-                this._quaternion,
-                this._scale,
-            );
-        });
-    }
-
-    public async Init(): Promise<this> {
-        if (this._initialized) {
-            return Promise.resolve(this);
-        }
-
-        if (!this._session) {
-            console.error(
-                'DIVEWebXROrigin: No session set in Init()! Aborting initialization...',
-            );
-            return Promise.reject();
-        }
-
-        if (this._requesting) {
-            console.error(
-                'DIVEWebXROrigin: Currently initializing! Aborting initialization...',
-            );
-            return Promise.reject();
-        }
-
-        this._requesting = true;
-        const referenceSpace =
-            await this._session.requestReferenceSpace('viewer');
-        this._hitTestSource =
-            (await this._session.requestHitTestSource!({
-                space: referenceSpace,
-                entityTypes: this._entityTypes,
-            })) || null;
-        this._requesting = false;
-
-        if (!this._hitTestSource) {
-            return Promise.reject();
-        }
-
-        this._initialized = true;
-
-        return Promise.resolve(this);
-    }
-
-    public Dispose(): void {
-        this._initialized = false;
-        this._requesting = false;
-
-        this._hitTestSource?.cancel();
-
-        this._hitTestSource = null;
-        this._hitTestResultBuffer = [];
-
-        this._matrix = new Matrix4();
-        this._position = new Vector3();
-        this._quaternion = new Quaternion();
-        this._scale = new Vector3();
-    }
-
-    public Update(frame: XRFrame): void {
-        if (!this._initialized) return;
-
-        if (!this._hitTestSource) {
-            throw new Error(
-                'DIVEWebXRRaycaster: Critical Error: HitTestSource not available but WebXROrigin is initialized!',
-            );
-        }
-
-        // get hit test results
-        this._hitTestResultBuffer = frame.getHitTestResults(
-            this._hitTestSource,
-        );
-        if (this._hitTestResultBuffer.length > 0) {
-            // hit found
-            this._referenceSpaceBuffer = this._renderer.xr.getReferenceSpace();
-
-            // if there is no reference space, hit will be counted as lost for this frame
-            if (!this._referenceSpaceBuffer) {
-                this.onHitLost();
-                return;
-            }
-
-            const pose = this._hitTestResultBuffer[0].getPose(
-                this._referenceSpaceBuffer,
-            );
-            if (!pose) {
-                this.onHitLost();
-                return;
-            }
-
-            this.onHitFound(pose);
-        } else {
-            this.onHitLost();
-        }
-    }
-
-    private onHitFound(pose: XRPose): void {
-        this._raycastHitCounter++;
-
-        this.matrix.fromArray(pose.transform.matrix);
-
-        // we have to wait for a certain amount of frames to make sure the origin is set
-        if (this._raycastHitCounter > 50) {
-            this._originSetResolve();
-        }
-    }
-
-    private onHitLost(): void {
-        this._raycastHitCounter = 0;
-    }
-}

package/src/ar/webxr/overlay/Overlay.ts

@@ -1,50 +0,0 @@
-export class Overlay {
-    private _element: HTMLDivElement;
-    public get Element(): HTMLDivElement {
-        return this._element;
-    }
-
-    private _closeButton: SVGSVGElement;
-    public get CloseButton(): SVGSVGElement {
-        return this._closeButton;
-    }
-
-    constructor() {
-        // create div
-        this._element = document.createElement('div');
-
-        // create and append close button to overlay
-        this._closeButton = this.createCloseButton();
-        this._element.appendChild(this._closeButton);
-
-        // append overlay to body
-        document.body.appendChild(this._element);
-    }
-
-    private createCloseButton(): SVGSVGElement {
-        // create svg path
-        const path = document.createElementNS(
-            'http://www.w3.org/2000/svg',
-            'path',
-        );
-        path.setAttribute('d', 'M 12,12 L 28,28 M 28,12 12,28');
-        path.setAttribute('stroke', '#fff');
-        path.setAttribute('stroke-width', '2');
-
-        // create svg
-        const svg = document.createElementNS(
-            'http://www.w3.org/2000/svg',
-            'svg',
-        );
-        svg.setAttribute('width', '38');
-        svg.setAttribute('height', '38');
-        svg.style.position = 'absolute';
-        svg.style.right = '20px';
-        svg.style.top = '20px';
-
-        // append path to svg
-        svg.appendChild(path);
-
-        return svg;
-    }
-}

package/src/ar/webxr/raycaster/WebXRRaycaster.ts

@@ -1,131 +0,0 @@
-import { Matrix4, Mesh, Vector3 } from 'three';
-import { DIVERenderer } from '../../../renderer/Renderer';
-import { DIVEWebXRRaycasterAR } from './ar/WebXRRaycasterAR';
-import { DIVEWebXRRaycasterTHREE } from './three/WebXRRaycasterTHREE';
-import { DIVEScene } from '../../../scene/Scene';
-import { DIVEEventExecutor } from '../../../events/EventExecutor';
-
-/**
- * object is undefined when AR world is hit.
- */
-export type DIVEHitResult = {
-    point: Vector3;
-    matrix: Matrix4;
-    object?: Mesh;
-};
-
-export type DIVEWebXRRaycasterEvents = {
-    AR_HIT_FOUND: {
-        hit: DIVEHitResult;
-    };
-    AR_HIT_LOST: undefined;
-    SCENE_HIT_FOUND: {
-        hit: DIVEHitResult;
-    };
-    SCENE_HIT_LOST: undefined;
-};
-
-export class DIVEWebXRRaycaster extends DIVEEventExecutor<DIVEWebXRRaycasterEvents> {
-    private _session: XRSession;
-
-    private _initialized: boolean = false;
-
-    private _threeRaycaster: DIVEWebXRRaycasterTHREE;
-    private _arRaycaster: DIVEWebXRRaycasterAR;
-
-    private _arHitResultBuffer: DIVEHitResult[] = [];
-    private _sceneHitResultBuffer: DIVEHitResult[] = [];
-
-    // buffers
-    private _hasHit: boolean = false;
-
-    constructor(session: XRSession, renderer: DIVERenderer, scene: DIVEScene) {
-        super();
-
-        this._session = session;
-
-        this._threeRaycaster = new DIVEWebXRRaycasterTHREE(renderer, scene);
-        this._arRaycaster = new DIVEWebXRRaycasterAR(session, renderer);
-    }
-
-    public Dispose(): void {
-        // dispose code here
-        this._initialized = false;
-    }
-
-    public async Init(): Promise<this> {
-        if (!this._session) {
-            console.error(
-                'DIVEWebXRRaycaster: No session set in Init()! Aborting initialization...',
-            );
-            return Promise.reject();
-        }
-
-        if (this._initialized) {
-            console.error(
-                'DIVEWebXRRaycaster: Already initialized! Aborting initialization...',
-            );
-            return Promise.reject();
-        }
-
-        await this._threeRaycaster.Init();
-        await this._arRaycaster.Init();
-
-        console.log('DIVEWebXRRaycaster: Initialized');
-
-        this._initialized = true;
-
-        return Promise.resolve(this);
-    }
-
-    public GetARIntersections(frame: XRFrame): DIVEHitResult[] {
-        // check for ar hits
-        this._arHitResultBuffer = this._arRaycaster.GetIntersections(frame);
-        if (this._arHitResultBuffer.length > 0) {
-            // hit found
-            this.onARHitFound(this._arHitResultBuffer[0]);
-        } else {
-            // hit nothing
-            this.onARHitLost();
-        }
-        return this._arHitResultBuffer;
-    }
-
-    public GetSceneIntersections(): DIVEHitResult[] {
-        // check for scene hits
-        this._sceneHitResultBuffer = this._threeRaycaster.GetIntersections();
-        if (this._sceneHitResultBuffer.length > 0) {
-            // scene hit found
-            this.onSceneHitFound(this._sceneHitResultBuffer[0]);
-            // early return to prevent ar raycaster from overriding scene hit
-        } else {
-            // scene hit nothing
-            this.onSceneHitLost();
-        }
-        return this._sceneHitResultBuffer;
-    }
-
-    private onARHitFound(hit: DIVEHitResult): void {
-        this._hasHit = true;
-        this.dispatch('AR_HIT_FOUND', { hit });
-    }
-
-    private onARHitLost(): void {
-        if (!this._hasHit) return;
-
-        this._hasHit = false;
-        this.dispatch('AR_HIT_LOST');
-    }
-
-    private onSceneHitFound(hit: DIVEHitResult): void {
-        this._hasHit = true;
-        this.dispatch('SCENE_HIT_FOUND', { hit });
-    }
-
-    private onSceneHitLost(): void {
-        if (!this._hasHit) return;
-
-        this._hasHit = false;
-        this.dispatch('SCENE_HIT_LOST');
-    }
-}

package/src/ar/webxr/raycaster/ar/WebXRRaycasterAR.ts

@@ -1,102 +0,0 @@
-import { Matrix4, Vector3 } from 'three';
-import { type DIVERenderer } from '../../../../renderer/Renderer';
-import { type DIVEHitResult } from '../WebXRRaycaster';
-
-export class DIVEWebXRRaycasterAR {
-    private _session: XRSession;
-    private _renderer: DIVERenderer;
-
-    private _transientHitTestSource: XRTransientInputHitTestSource | undefined;
-    private _referenceSpaceBuffer: XRReferenceSpace | null = null;
-
-    private _requesting: boolean = false;
-    private _initialized: boolean = false;
-
-    private _hitMatrixBuffer: Matrix4;
-
-    constructor(session: XRSession, renderer: DIVERenderer) {
-        this._session = session;
-        this._renderer = renderer;
-
-        this._hitMatrixBuffer = new Matrix4();
-    }
-
-    public Dispose(): void {
-        this._transientHitTestSource?.cancel();
-        this._transientHitTestSource = undefined;
-
-        this._initialized = false;
-    }
-
-    public async Init(): Promise<this> {
-        if (!this._session) {
-            console.error(
-                'DIVEWebXRRaycaster: No session set in Init()! Aborting initialization...',
-            );
-            return Promise.reject();
-        }
-
-        if (this._requesting) {
-            console.error(
-                'DIVEWebXRRaycaster: Currently initializing! Aborting initialization...',
-            );
-            return Promise.reject();
-        }
-
-        if (this._initialized) {
-            console.error(
-                'DIVEWebXRRaycaster: Already initialized! Aborting initialization...',
-            );
-            return Promise.reject();
-        }
-
-        this._requesting = true;
-        this._transientHitTestSource = await this._session
-            .requestHitTestSourceForTransientInput!({
-            profile: 'generic-touchscreen',
-        });
-        this._referenceSpaceBuffer = this._renderer.xr.getReferenceSpace();
-        this._requesting = false;
-
-        if (!this._transientHitTestSource) {
-            return Promise.reject();
-        }
-
-        this._initialized = true;
-
-        console.log('DIVEWebXRRaycasterAR: Initialized');
-
-        return Promise.resolve(this);
-    }
-
-    public GetIntersections(frame: XRFrame): DIVEHitResult[] {
-        if (!this._transientHitTestSource) return [];
-
-        const touches = frame.getHitTestResultsForTransientInput(
-            this._transientHitTestSource,
-        );
-        if (touches.length === 0) return [];
-
-        const hits = touches.map((touch: XRTransientInputHitTestResult) => {
-            if (!this._referenceSpaceBuffer) return undefined;
-            if (!touch.results[0]) return undefined;
-            if (!touch.results[0].getPose) return undefined;
-
-            const pose = touch.results[0].getPose(this._referenceSpaceBuffer);
-            if (!pose) return undefined;
-
-            this._hitMatrixBuffer.fromArray(pose.transform.matrix);
-            const position = new Vector3().setFromMatrixPosition(
-                this._hitMatrixBuffer,
-            );
-
-            return {
-                point: position,
-                matrix: this._hitMatrixBuffer,
-                object: undefined,
-            };
-        });
-
-        return hits.filter((hit) => hit !== undefined) as DIVEHitResult[];
-    }
-}

package/src/ar/webxr/raycaster/three/WebXRRaycasterTHREE.ts

@@ -1,49 +0,0 @@
-import {
-    type Intersection,
-    type Mesh,
-    Raycaster,
-    type XRTargetRaySpace,
-} from 'three';
-import { type DIVERenderer } from '../../../../renderer/Renderer';
-import { type DIVEScene } from '../../../../scene/Scene';
-import { type DIVEHitResult } from '../WebXRRaycaster';
-
-export class DIVEWebXRRaycasterTHREE {
-    private _renderer: DIVERenderer;
-    private _scene: DIVEScene;
-
-    private _controller: XRTargetRaySpace;
-
-    // internal raycaster
-    private _raycaster: Raycaster = new Raycaster();
-
-    constructor(renderer: DIVERenderer, scene: DIVEScene) {
-        this._renderer = renderer;
-        this._scene = scene;
-
-        this._controller = this._renderer.xr.getController(0);
-    }
-
-    public async Init(): Promise<this> {
-        console.log('DIVEWebXRRaycasterTHREE: Initialized');
-        return Promise.resolve(this);
-    }
-
-    public GetIntersections(): DIVEHitResult[] {
-        this._controller.updateMatrixWorld();
-        this._raycaster.setFromXRController(this._controller);
-        const intersections = this._raycaster.intersectObjects(
-            this._scene.XRRoot.XRModelRoot.children,
-        );
-
-        if (intersections.length === 0) return [];
-
-        return intersections.map((intersection: Intersection) => {
-            return {
-                point: intersection.point,
-                matrix: intersection.object.matrixWorld,
-                object: intersection.object as Mesh,
-            };
-        });
-    }
-}