@shapediver/viewer.rendering-engine.intersection-engine 3.3.3 → 3.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapediver/viewer.rendering-engine.intersection-engine",
-  "version": "3.3.3",
+  "version": "3.3.6",
   "description": "",
   "keywords": [],
   "author": "Michael Oppitz <michael@shapediver.com>",
@@ -10,11 +10,10 @@
     "test": "__tests__"
   },
   "files": [
-    "dist",
-    "src",
     "package.json",
+    "dist/",
     "README.md",
-    "tsconfig.json"
+    "LICENSE"
   ],
   "publishConfig": {
     "access": "public"
@@ -39,15 +38,15 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@shapediver/viewer.rendering-engine.rendering-engine": "3.3.3",
-    "@shapediver/viewer.shared.math": "3.3.3",
-    "@shapediver/viewer.shared.node-tree": "3.3.3",
-    "@shapediver/viewer.shared.services": "3.3.3",
-    "@shapediver/viewer.shared.types": "3.3.3",
+    "@shapediver/viewer.rendering-engine.rendering-engine": "3.3.6",
+    "@shapediver/viewer.shared.math": "3.3.6",
+    "@shapediver/viewer.shared.node-tree": "3.3.6",
+    "@shapediver/viewer.shared.services": "3.3.6",
+    "@shapediver/viewer.shared.types": "3.3.6",
     "@types/three": "0.162.0",
     "detect-it": "4.0.1",
     "gl-matrix": "3.3.0",
     "three": "0.162.0"
   },
-  "gitHead": "6218af442a50a13c09c5f61f556792e0b0171437"
+  "gitHead": "13aea937b128a001e6e93be300674c4a04624c29"
 }

package/src/implementation/IntersectionEngine.ts

@@ -1,170 +0,0 @@
-import * as THREE from 'three';
-import { EventEngine, EVENTTYPE } from '@shapediver/viewer.shared.services';
-import { GeometryData } from '@shapediver/viewer.shared.types';
-import { IIntersection } from '../interfaces/IIntersection';
-import { IIntersectionEngine } from '../interfaces/IIntersectionEngine';
-import { IIntersectionFilter } from '../interfaces/IIntersectionFilter';
-import { IRay } from '../interfaces/IRay';
-import { ITree, ITreeNode, Tree } from '@shapediver/viewer.shared.node-tree';
-
-export class IntersectionEngine implements IIntersectionEngine {
-    // #region Properties (5)
-
-    private readonly _eventEngine: EventEngine = EventEngine.instance;
-    private readonly _raycaster: THREE.Raycaster = new THREE.Raycaster();
-    private readonly _tree: ITree = Tree.instance;
-
-    private static _instance: IntersectionEngine;
-
-    private _intersectNodes: {
-        node: ITreeNode,
-        geometryData: { [key: string]: GeometryData },
-        visible: boolean,
-        excludeViewports: string[],
-        restrictViewports: string[],
-    }[] = [];
-
-    // #endregion Properties (5)
-
-    // #region Constructors (1)
-
-    private constructor() {
-        this.gatherNodes();
-        this._eventEngine.addListener(EVENTTYPE.VIEWPORT.VIEWPORT_UPDATED, () => {
-            this.gatherNodes();
-        });
-    }
-
-    // #endregion Constructors (1)
-
-    // #region Public Static Getters And Setters (1)
-
-    public static get instance() {
-        return this._instance || (this._instance = new this());
-    }
-
-    // #endregion Public Static Getters And Setters (1)
-
-    // #region Public Methods (2)
-
-    public intersect(
-        ray: IRay,
-        viewportId: string,
-        filterCriteria?: IIntersectionFilter[],
-        rayCasterParams?: THREE.RaycasterParameters
-    ): IIntersection[] {
-        let intersections: IIntersection[] = [];
-        this._intersectNodes.forEach(i => {
-            const currentIntersections = this.intersectNode(ray, i.node, i.geometryData, viewportId, filterCriteria, rayCasterParams);
-            if (currentIntersections)
-                intersections = intersections.concat(currentIntersections);
-        });
-        intersections.sort((a, b) => a.distance - b.distance);
-        return intersections;
-    }
-
-    public intersectNode(
-        ray: IRay,
-        node: ITreeNode,
-        geometryData: { [key: string]: GeometryData },
-        viewportId: string,
-        filterCriteria?: IIntersectionFilter[],
-        rayCasterParams?: THREE.RaycasterParameters
-    ): IIntersection[] | undefined {
-        if (node.visible === false) return;
-
-        if (viewportId !== undefined) {
-            if (node.excludeViewports.includes(viewportId)) return;
-            if (node.restrictViewports.length > 0 && !node.restrictViewports.includes(viewportId)) return;
-        }
-
-        if (filterCriteria) {
-            for (let i = 0; i < filterCriteria.length; i++) {
-                if (filterCriteria[i](node))
-                    return this.intersectionTest(ray, node, geometryData, viewportId, rayCasterParams);
-            }
-        } else {
-            return this.intersectionTest(ray, node, geometryData, viewportId, rayCasterParams);
-        }
-    }
-
-    // #endregion Public Methods (2)
-
-    // #region Private Methods (2)
-
-    /**
-     * Gather all nodes that contain geometry data.
-     */
-    private gatherNodes() {
-        this._intersectNodes = [];
-        this._tree.root.traverse(node => {
-            if (node.visible === false) return;
-
-            for (let i = 0; i < node.data.length; i++) {
-                if (node.data[i] instanceof GeometryData) {
-                    const geometryData: GeometryData = node.data[i] as GeometryData;
-                    let tempNode = node;
-                    let visible = true, restrictViewports: string[] = [], excludeViewports: string[] = [];
-                    while (tempNode.parent) {
-                        visible = tempNode.visible && visible;
-                        restrictViewports = restrictViewports.concat(tempNode.restrictViewports);
-                        excludeViewports = excludeViewports.concat(tempNode.excludeViewports);
-                        tempNode = tempNode.parent;
-                    }
-
-                    this._intersectNodes.push({
-                        node,
-                        geometryData: { [`${geometryData.id}_${geometryData.version}`]: geometryData },
-                        visible,
-                        restrictViewports: [...new Set(restrictViewports)],
-                        excludeViewports: [...new Set(excludeViewports)]
-                    });
-                }
-            }
-        });
-    }
-
-    /**
-     * Do the intersection test with the ray and the node.
-     * 
-     * @param ray the ray to test
-     * @param node the node to test
-     * @param geometryData the geometry data of the node
-     * @param viewportId the viewport id
-     * @returns 
-     */
-    private intersectionTest(
-        ray: IRay,
-        node: ITreeNode,
-        geometryData: { [key: string]: GeometryData },
-        viewportId: string,
-        rayCasterParams?: THREE.RaycasterParameters
-    ): IIntersection[] | undefined {
-        if (rayCasterParams) this._raycaster.params = rayCasterParams;
-
-        this._raycaster.ray.direction.set(ray.direction[0], ray.direction[1], ray.direction[2]);
-        this._raycaster.ray.origin.set(ray.origin[0], ray.origin[1], ray.origin[2]);
-
-        let intersections: IIntersection[] = [];
-
-        const threeJsObject = node.convertedObject[viewportId!] as THREE.Object3D;
-        if (threeJsObject) {
-            const intersectionThree = this._raycaster.intersectObject(threeJsObject);
-            const intersection = intersectionThree.map(i => {
-                const intersection: IIntersection = {
-                    distance: i.distance,
-                    point: [i.point.x, i.point.y, i.point.z],
-                    node: node,
-                    geometryData: geometryData[`${(i.object.parent as any).SDid}_${(i.object.parent as any).SDversion}`]
-                };
-                return intersection;
-            });
-            intersections = intersections.concat(intersection);
-        }
-
-        intersections.sort((a, b) => a.distance - b.distance);
-        return intersections;
-    }
-
-    // #endregion Private Methods (2)
-}

package/src/index.ts

@@ -1,14 +0,0 @@
-import { IIntersection } from './interfaces/IIntersection';
-import { IIntersectionEngine } from './interfaces/IIntersectionEngine';
-import { IIntersectionFilter } from './interfaces/IIntersectionFilter';
-import { IntersectionEngine } from './implementation/IntersectionEngine';
-import { IRay } from './interfaces/IRay';
-import { RaycasterParameters } from 'three';
-
-export {
-  IRay, IIntersection, IIntersectionFilter, IIntersectionEngine, RaycasterParameters
-};
-
-export {
-  IntersectionEngine
-};

package/src/interfaces/IIntersection.ts

@@ -1,14 +0,0 @@
-import { vec3 } from "gl-matrix";
-import { ITreeNode } from "@shapediver/viewer.shared.node-tree";
-import { IGeometryData } from "@shapediver/viewer.shared.types";
-
-export interface IIntersection {
-    /** The distance to the intersection. */
-    distance: number,
-    /** The point of intersection. */
-    point: vec3,
-    /** The intersected node. */
-    node: ITreeNode
-    /** The intersected geometry data */
-    geometryData?: IGeometryData
-}

package/src/interfaces/IIntersectionEngine.ts

@@ -1,12 +0,0 @@
-import * as THREE from 'three';
-import { IIntersection } from './IIntersection';
-import { IIntersectionFilter } from './IIntersectionFilter';
-import { IRay } from './IRay';
-
-export interface IIntersectionEngine {
-    // #region Public Methods (1)
-
-    intersect(ray: IRay, viewportId: string, filterCriteria?: IIntersectionFilter[], rayCasterParams?: THREE.RaycasterParameters): IIntersection[];
-
-    // #endregion Public Methods (1)
-}

package/src/interfaces/IIntersectionFilter.ts

@@ -1,5 +0,0 @@
-import { ITreeNode } from "@shapediver/viewer.shared.node-tree";
-
-export interface IIntersectionFilter {
-    (node: ITreeNode): boolean;
-}

package/src/interfaces/IRay.ts

@@ -1,6 +0,0 @@
-import { vec3 } from "gl-matrix";
-
-export interface IRay {
-    origin: vec3,
-    direction: vec3
-}

package/tsconfig.json

@@ -1,17 +0,0 @@
-{
-    "extends": "../../tsconfig.json",
-    "include": [
-        "./**/*.ts"
-    ],
-    "compilerOptions": {
-        "rootDir": "src",
-        "outDir": "dist"
-    },
-    "exclude": [
-        "__tests__",
-        "node_modules",
-        "dist",
-        "dist-dev",
-        "dist-prod"
-    ]
-}