@colijnit/configurator 261.20.2 → 261.20.3

package/fesm2022/colijnit-configurator.mjs

@@ -5,11 +5,12 @@ import { CommonModule } from '@angular/common';
 import { BehaviorSubject, Subject, ReplaySubject, combineLatest, from } from 'rxjs';
 import { StringUtils } from '@colijnit/ioneconnector/build/utils/string-utils';
 import * as THREE from 'three';
-import { Group, BufferGeometry, Float32BufferAttribute, Line, LineBasicMaterial, Vector3, CylinderGeometry, Mesh, MeshBasicMaterial, Object3D, EquirectangularReflectionMapping, Vector2, Material as Material$1, Texture as Texture$1, Source, LinearSRGBColorSpace, SRGBColorSpace, Color, MaterialLoader, Camera, Box3, Euler, Quaternion, EventDispatcher, PerspectiveCamera, PlaneGeometry, DoubleSide, MeshStandardMaterial, RingGeometry, Matrix4, MathUtils, Raycaster, DataTexture, RGFormat, UnsignedByteType, LinearFilter, Shape, SphereGeometry, PCFSoftShadowMap, Scene, ShadowMaterial, LightProbe, DirectionalLight, MeshPhongMaterial, WebGLRenderer, NoToneMapping, TextureLoader, RGBAFormat, AmbientLight, NearestFilter, MeshPhysicalMaterial, BackSide, FrontSide, ReinhardToneMapping, CineonToneMapping, ACESFilmicToneMapping, CustomToneMapping, NeutralToneMapping, BasicShadowMap, PCFShadowMap, VSMShadowMap, Light, SpotLight, HemisphereLight, PointLight } from 'three';
+import { Box3, Vector3, Vector2, Object3D, Mesh, Euler, Quaternion, Group, BufferGeometry, Float32BufferAttribute, Line, LineBasicMaterial, CylinderGeometry, MeshBasicMaterial, EquirectangularReflectionMapping, Material as Material$1, Texture as Texture$1, Source, LinearSRGBColorSpace, SRGBColorSpace, Color, MaterialLoader, Camera, EventDispatcher, PerspectiveCamera, PlaneGeometry, DoubleSide, MeshStandardMaterial, RingGeometry, Matrix4, MathUtils, Raycaster, DataTexture, RGFormat, UnsignedByteType, LinearFilter, Shape, SphereGeometry, PCFSoftShadowMap, Scene, ShadowMaterial, LightProbe, DirectionalLight, MeshPhongMaterial, WebGLRenderer, NoToneMapping, TextureLoader, RGBAFormat, AmbientLight, NearestFilter, MeshPhysicalMaterial, BackSide, FrontSide, ReinhardToneMapping, CineonToneMapping, ACESFilmicToneMapping, CustomToneMapping, NeutralToneMapping, BasicShadowMap, PCFShadowMap, VSMShadowMap, Light, SpotLight, HemisphereLight, PointLight } from 'three';
+import { Selection } from '@colijnit/configuratorapi/build/model/selection';
+import { HdecoPositioning } from '@colijnit/configuratorapi/build/enum/hdeco-positioning.enum';
 import { Options } from '@colijnit/ioneconnector/build/model/options';
 import { Article } from '@colijnit/configuratorapi/build/model/article';
 import { BusinessObjectFactory } from '@colijnit/ioneconnector/build/service/business-object-factory';
-import { Selection } from '@colijnit/configuratorapi/build/model/selection';
 import { SelectorWithOptions } from '@colijnit/configuratorapi/build/model/selector-with-options';
 import { AnswerPrice } from '@colijnit/configuratorapi/build/model/answer-price';
 import { ImageContent } from '@colijnit/mainapi/build/model/image-content.bo';
@@ -37,7 +38,6 @@ import * as TWEEN from '@tweenjs/tween.js';
 import { WebGLPathTracer } from 'three-gpu-pathtracer';
 import { ParallelMeshBVHWorker } from 'three-mesh-bvh/src/workers/ParallelMeshBVHWorker.js';
 import { computeBoundsTree, disposeBoundsTree, acceleratedRaycast } from 'three-mesh-bvh';
-import { HdecoPositioning } from '@colijnit/configuratorapi/build/enum/hdeco-positioning.enum';
 import { TextGeometry } from 'three/examples/jsm/geometries/TextGeometry.js';
 import { FontLoader } from 'three/examples/jsm/loaders/FontLoader.js';
 import { XRControllerModelFactory } from 'three/examples/jsm/webxr/XRControllerModelFactory.js';
@@ -525,6 +525,216 @@ var ConfigurationTemplate;
     ConfigurationTemplate["showFullConfiguration"] = "showFullConfiguration";
 })(ConfigurationTemplate || (ConfigurationTemplate = {}));
 
+class Scene3DUtil {
+    static updatePivot(obj) {
+        const boundingBox = new Box3().setFromObject(obj);
+        const bbCenterPivot = new Vector3();
+        boundingBox.getCenter(bbCenterPivot);
+        const delta = new Vector3().sub(bbCenterPivot).setY(Math.abs(Math.min(boundingBox.min.y, 0)));
+        obj.children.forEach((child) => {
+            child.position.add(delta);
+        });
+        obj.updateWorldMatrix(false, true);
+    }
+    static TrySelectorConnection(scene, parent, part1, part2, isFirstElement, createAddableFn) {
+        let addable;
+        if (createAddableFn) {
+            addable = part2;
+            part2 = createAddableFn(addable);
+        }
+        if (part1 && part2) {
+            let con1;
+            let con2;
+            // if part2 is an addable and decoConnection is present, then no need to iterate through connectors
+            if (addable && addable instanceof Selection && addable.decoConnection && addable.hdecoPositioning === HdecoPositioning.Variable) {
+                con1 = part1.children.find(c => c.name === addable.decoConnection);
+                if (!con1) {
+                    return false;
+                }
+                for (let ii = 0; ii < part2.children.length; ii++) {
+                    con2 = part2.children[ii];
+                    // if these connectors can connect connect them
+                    if (!con1.userData.connected && !con2.userData.connected && this.CanSelectorConnect(part1.children, con1, con2, isFirstElement)) {
+                        // if (!con1['connected'] && !con2['connected'] && this.CanSelectorConnect(part1.children, con1, con2, isFirstElement)) {
+                        // if addable, continue this loop with a new addable
+                        if (addable) {
+                            const newPart2 = createAddableFn(addable, part2, part1);
+                            // reference of part2 changed, so refresh con2
+                            this.SelectorConnect(scene, parent, con1, newPart2.children[ii]);
+                        }
+                        else {
+                            return this.SelectorConnect(scene, parent, con1, con2);
+                        }
+                    }
+                }
+            }
+            else {
+                for (let i = 0; i < part1.children.length; i++) {
+                    for (let ii = 0; ii < part2.children.length; ii++) {
+                        con1 = part1.children[i];
+                        con2 = part2.children[ii];
+                        let con1Connected = false;
+                        if (con1 && con1.userData) {
+                            con1Connected = con1.userData.connected;
+                        }
+                        let con2Connected = false;
+                        if (con2 && con2.userData) {
+                            con2Connected = con2.userData.connected;
+                        }
+                        // if these connectors can connect connect them
+                        if (!con1Connected && !con2Connected && this.CanSelectorConnect(part1.children, con1, con2, isFirstElement)) {
+                            // if addable, continue this loop with a new addable
+                            if (addable) {
+                                const newPart2 = createAddableFn(addable, part2, part1);
+                                // reference of part2 changed, so refresh con2
+                                this.SelectorConnect(scene, parent, con1, newPart2.children[ii]);
+                            }
+                            else {
+                                return this.SelectorConnect(scene, parent, con1, con2);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+    // public static TrySelectorConnection(scene: Scene, parent: Object3D,
+    //     part1: any, part2: any, createAddableFn?: Function): boolean {
+    //     let addable: any;
+    //     if (createAddableFn) {
+    //         addable = part2;
+    //         part2 = createAddableFn(addable);
+    //     }
+    //     for (let i = 0; i < part1.children.length; i++) {
+    //         for (let ii = 0; ii < part2.children.length; ii++) {
+    //             const con1: Object3D = part1.children[i];
+    //             const con2: Object3D = part2.children[ii];
+    //             // if these connectors can connect connect them
+    //             if (!con1['connected'] && !con2['connected'] && this.CanSelectorConnect(con1, con2)) {
+    //                 // if addable, continue this loop with a new addable
+    //                 if (addable) {
+    //                     const newPart2: Object3D = createAddableFn(addable, part2, part1);
+    //                     // reference of part2 changed, so refresh con2
+    //                     this.SelectorConnect(scene, parent, con1, newPart2.children[ii]);
+    //                 } else {
+    //                     return this.SelectorConnect(scene, parent, con1, con2);
+    //                 }
+    //             }
+    //         }
+    //     }
+    //     return false;
+    // }
+    static Convert3DPointToScreenPoint(point, camera, width, height) {
+        if (!point) {
+            return new Vector2();
+        }
+        const vector = point.clone().project(camera);
+        vector.x = (vector.x + 1) / 2 * width;
+        vector.y = -(vector.y - 1) / 2 * height;
+        return new Vector2(vector.x, vector.y);
+    }
+    static CanSelectorConnect(consPart1, con1, con2, startWithMale) {
+        const con1Name = (con1 instanceof Object3D || con1 instanceof Mesh) ? con1.name : con1.connector;
+        const con2Name = (con2 instanceof Object3D || con2 instanceof Mesh) ? con2.name : con2.connector;
+        const sameParent = (con1 instanceof Object3D || con1 instanceof Mesh) &&
+            (con2 instanceof Object3D || con2 instanceof Mesh) ? con1.parent === con2.parent : false;
+        if (!con1Name || !con2Name) {
+            return false;
+        }
+        const parts1 = con1Name.toUpperCase().split('_'), parts2 = con2Name.toUpperCase().split('_');
+        if (parts1.length >= 3 && parts2.length >= 3 && !sameParent) {
+            const connectable = parts1[0] === 'C' && parts2[0] === 'C' &&
+                parts1[1] === parts2[1] && parts1[2] !== parts2[2];
+            return connectable;
+        }
+        return false;
+    }
+    // public static CanSelectorConnect(con1: Object3D | any, con2: Object3D | any): boolean {
+    //     const con1Name: string = con1 instanceof Object3D ? con1.name : con1.connector;
+    //     const con2Name: string = con2 instanceof Object3D ? con2.name : con2.connector;
+    //     const sameParent: boolean = con1 instanceof Object3D && con2 instanceof Object3D ? con1.parent === con2.parent : false;
+    //     const parts1: string[] = con1Name.toUpperCase().split('_'),
+    //         parts2: string[] = con2Name.toUpperCase().split('_');
+    //     if (parts1.length >= 3 && parts2.length >= 3 && !sameParent) {
+    //         const connectable: boolean = parts1[0] === 'C' && parts2[0] === 'C' &&
+    //             parts1[1] === parts2[1] && parts1[2] !== parts2[2];
+    //         return connectable;
+    //     }
+    //     return false;
+    // }
+    static SelectorConnect(scene, parent, con1, con2) {
+        if (!scene || !parent) {
+            return false;
+        }
+        con1['connectedTo'] = con2 && con2.parent ? con2.parent.name : '';
+        con2['connectedTo'] = con1 && con1.parent ? con1.parent.name : '';
+        con1.userData.connectedTo = con2 && con2.parent ? con2.parent.name : '';
+        con1.userData.connected = false;
+        con2.userData.connectedTo = con1 && con1.parent ? con1.parent.name : '';
+        con2.userData.connected = false;
+        const motherRotation = new Euler(0, 0, 0);
+        const motherPosition = new Vector3(0, 0, 0);
+        parent.updateMatrixWorld();
+        motherRotation.copy(parent.rotation);
+        parent.getWorldPosition(motherPosition);
+        parent.rotation.set(0, 0, 0);
+        parent.position.set(0, 0, 0);
+        scene.updateMatrixWorld(true);
+        const con1Quat = new Quaternion();
+        if (con1) {
+            con1.getWorldQuaternion(con1Quat);
+        }
+        const con2Quat = new Quaternion();
+        if (con2) {
+            con2.getWorldQuaternion(con2Quat);
+        }
+        const con1QuatParent = new Quaternion();
+        if (con1 && con1.parent) {
+            con1.parent.getWorldQuaternion(con1QuatParent);
+        }
+        const con2QuatParent = new Quaternion();
+        if (con2 && con2.parent) {
+            con2.parent.getWorldQuaternion(con2QuatParent);
+        }
+        const rotation = new Quaternion().multiplyQuaternions(con1Quat.invert(), con2Quat).multiply(new Quaternion().multiplyQuaternions(con1QuatParent, con1QuatParent));
+        if (con2 && con2.parent) {
+            con2.parent.quaternion.copy(rotation);
+        }
+        // Update because the matrix has been tempered with
+        scene.updateMatrixWorld(true);
+        // Move the connectors towards eachother
+        const con1Pos = new Vector3();
+        if (con1) {
+            con1.getWorldPosition(con1Pos);
+        }
+        const con2Pos = new Vector3();
+        if (con2) {
+            con2.getWorldPosition(con2Pos);
+        }
+        const move = con1Pos.sub(con2Pos);
+        if (con2 && con2.parent) {
+            con2.parent.position.x += move.x;
+            con2.parent.position.y += move.y;
+            con2.parent.position.z += move.z;
+        }
+        // reset parent's objects rotation and position
+        parent.rotation.copy(motherRotation);
+        parent.position.copy(motherPosition);
+        scene.updateMatrixWorld(true);
+        // Set the connected flag
+        if (con1) {
+            // con1['connected'] = true;
+            con1.userData.connected = true;
+        }
+        if (con2) {
+            // con2['connected'] = true;
+            con2.userData.connected = true;
+        }
+        return true;
+    }
+}
+
 var ResultType;
 (function (ResultType) {
     ResultType["Unknown"] = "Unknown";
@@ -3672,216 +3882,6 @@ class RelativePositionUtils {
     }
 }
 
-class Scene3DUtil {
-    static updatePivot(obj) {
-        const boundingBox = new Box3().setFromObject(obj);
-        const bbCenterPivot = new Vector3();
-        boundingBox.getCenter(bbCenterPivot);
-        const delta = new Vector3().sub(bbCenterPivot).setY(Math.abs(Math.min(boundingBox.min.y, 0)));
-        obj.children.forEach((child) => {
-            child.position.add(delta);
-        });
-        obj.updateWorldMatrix(false, true);
-    }
-    static TrySelectorConnection(scene, parent, part1, part2, isFirstElement, createAddableFn) {
-        let addable;
-        if (createAddableFn) {
-            addable = part2;
-            part2 = createAddableFn(addable);
-        }
-        if (part1 && part2) {
-            let con1;
-            let con2;
-            // if part2 is an addable and decoConnection is present, then no need to iterate through connectors
-            if (addable && addable instanceof Selection && addable.decoConnection && addable.hdecoPositioning === HdecoPositioning.Variable) {
-                con1 = part1.children.find(c => c.name === addable.decoConnection);
-                if (!con1) {
-                    return false;
-                }
-                for (let ii = 0; ii < part2.children.length; ii++) {
-                    con2 = part2.children[ii];
-                    // if these connectors can connect connect them
-                    if (!con1.userData.connected && !con2.userData.connected && this.CanSelectorConnect(part1.children, con1, con2, isFirstElement)) {
-                        // if (!con1['connected'] && !con2['connected'] && this.CanSelectorConnect(part1.children, con1, con2, isFirstElement)) {
-                        // if addable, continue this loop with a new addable
-                        if (addable) {
-                            const newPart2 = createAddableFn(addable, part2, part1);
-                            // reference of part2 changed, so refresh con2
-                            this.SelectorConnect(scene, parent, con1, newPart2.children[ii]);
-                        }
-                        else {
-                            return this.SelectorConnect(scene, parent, con1, con2);
-                        }
-                    }
-                }
-            }
-            else {
-                for (let i = 0; i < part1.children.length; i++) {
-                    for (let ii = 0; ii < part2.children.length; ii++) {
-                        con1 = part1.children[i];
-                        con2 = part2.children[ii];
-                        let con1Connected = false;
-                        if (con1 && con1.userData) {
-                            con1Connected = con1.userData.connected;
-                        }
-                        let con2Connected = false;
-                        if (con2 && con2.userData) {
-                            con2Connected = con2.userData.connected;
-                        }
-                        // if these connectors can connect connect them
-                        if (!con1Connected && !con2Connected && this.CanSelectorConnect(part1.children, con1, con2, isFirstElement)) {
-                            // if addable, continue this loop with a new addable
-                            if (addable) {
-                                const newPart2 = createAddableFn(addable, part2, part1);
-                                // reference of part2 changed, so refresh con2
-                                this.SelectorConnect(scene, parent, con1, newPart2.children[ii]);
-                            }
-                            else {
-                                return this.SelectorConnect(scene, parent, con1, con2);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-    // public static TrySelectorConnection(scene: Scene, parent: Object3D,
-    //     part1: any, part2: any, createAddableFn?: Function): boolean {
-    //     let addable: any;
-    //     if (createAddableFn) {
-    //         addable = part2;
-    //         part2 = createAddableFn(addable);
-    //     }
-    //     for (let i = 0; i < part1.children.length; i++) {
-    //         for (let ii = 0; ii < part2.children.length; ii++) {
-    //             const con1: Object3D = part1.children[i];
-    //             const con2: Object3D = part2.children[ii];
-    //             // if these connectors can connect connect them
-    //             if (!con1['connected'] && !con2['connected'] && this.CanSelectorConnect(con1, con2)) {
-    //                 // if addable, continue this loop with a new addable
-    //                 if (addable) {
-    //                     const newPart2: Object3D = createAddableFn(addable, part2, part1);
-    //                     // reference of part2 changed, so refresh con2
-    //                     this.SelectorConnect(scene, parent, con1, newPart2.children[ii]);
-    //                 } else {
-    //                     return this.SelectorConnect(scene, parent, con1, con2);
-    //                 }
-    //             }
-    //         }
-    //     }
-    //     return false;
-    // }
-    static Convert3DPointToScreenPoint(point, camera, width, height) {
-        if (!point) {
-            return new Vector2();
-        }
-        const vector = point.clone().project(camera);
-        vector.x = (vector.x + 1) / 2 * width;
-        vector.y = -(vector.y - 1) / 2 * height;
-        return new Vector2(vector.x, vector.y);
-    }
-    static CanSelectorConnect(consPart1, con1, con2, startWithMale) {
-        const con1Name = (con1 instanceof Object3D || con1 instanceof Mesh) ? con1.name : con1.connector;
-        const con2Name = (con2 instanceof Object3D || con2 instanceof Mesh) ? con2.name : con2.connector;
-        const sameParent = (con1 instanceof Object3D || con1 instanceof Mesh) &&
-            (con2 instanceof Object3D || con2 instanceof Mesh) ? con1.parent === con2.parent : false;
-        if (!con1Name || !con2Name) {
-            return false;
-        }
-        const parts1 = con1Name.toUpperCase().split('_'), parts2 = con2Name.toUpperCase().split('_');
-        if (parts1.length >= 3 && parts2.length >= 3 && !sameParent) {
-            const connectable = parts1[0] === 'C' && parts2[0] === 'C' &&
-                parts1[1] === parts2[1] && parts1[2] !== parts2[2];
-            return connectable;
-        }
-        return false;
-    }
-    // public static CanSelectorConnect(con1: Object3D | any, con2: Object3D | any): boolean {
-    //     const con1Name: string = con1 instanceof Object3D ? con1.name : con1.connector;
-    //     const con2Name: string = con2 instanceof Object3D ? con2.name : con2.connector;
-    //     const sameParent: boolean = con1 instanceof Object3D && con2 instanceof Object3D ? con1.parent === con2.parent : false;
-    //     const parts1: string[] = con1Name.toUpperCase().split('_'),
-    //         parts2: string[] = con2Name.toUpperCase().split('_');
-    //     if (parts1.length >= 3 && parts2.length >= 3 && !sameParent) {
-    //         const connectable: boolean = parts1[0] === 'C' && parts2[0] === 'C' &&
-    //             parts1[1] === parts2[1] && parts1[2] !== parts2[2];
-    //         return connectable;
-    //     }
-    //     return false;
-    // }
-    static SelectorConnect(scene, parent, con1, con2) {
-        if (!scene || !parent) {
-            return false;
-        }
-        con1['connectedTo'] = con2 && con2.parent ? con2.parent.name : '';
-        con2['connectedTo'] = con1 && con1.parent ? con1.parent.name : '';
-        con1.userData.connectedTo = con2 && con2.parent ? con2.parent.name : '';
-        con1.userData.connected = false;
-        con2.userData.connectedTo = con1 && con1.parent ? con1.parent.name : '';
-        con2.userData.connected = false;
-        const motherRotation = new Euler(0, 0, 0);
-        const motherPosition = new Vector3(0, 0, 0);
-        parent.updateMatrixWorld();
-        motherRotation.copy(parent.rotation);
-        parent.getWorldPosition(motherPosition);
-        parent.rotation.set(0, 0, 0);
-        parent.position.set(0, 0, 0);
-        scene.updateMatrixWorld(true);
-        const con1Quat = new Quaternion();
-        if (con1) {
-            con1.getWorldQuaternion(con1Quat);
-        }
-        const con2Quat = new Quaternion();
-        if (con2) {
-            con2.getWorldQuaternion(con2Quat);
-        }
-        const con1QuatParent = new Quaternion();
-        if (con1 && con1.parent) {
-            con1.parent.getWorldQuaternion(con1QuatParent);
-        }
-        const con2QuatParent = new Quaternion();
-        if (con2 && con2.parent) {
-            con2.parent.getWorldQuaternion(con2QuatParent);
-        }
-        const rotation = new Quaternion().multiplyQuaternions(con1Quat.invert(), con2Quat).multiply(new Quaternion().multiplyQuaternions(con1QuatParent, con1QuatParent));
-        if (con2 && con2.parent) {
-            con2.parent.quaternion.copy(rotation);
-        }
-        // Update because the matrix has been tempered with
-        scene.updateMatrixWorld(true);
-        // Move the connectors towards eachother
-        const con1Pos = new Vector3();
-        if (con1) {
-            con1.getWorldPosition(con1Pos);
-        }
-        const con2Pos = new Vector3();
-        if (con2) {
-            con2.getWorldPosition(con2Pos);
-        }
-        const move = con1Pos.sub(con2Pos);
-        if (con2 && con2.parent) {
-            con2.parent.position.x += move.x;
-            con2.parent.position.y += move.y;
-            con2.parent.position.z += move.z;
-        }
-        // reset parent's objects rotation and position
-        parent.rotation.copy(motherRotation);
-        parent.position.copy(motherPosition);
-        scene.updateMatrixWorld(true);
-        // Set the connected flag
-        if (con1) {
-            // con1['connected'] = true;
-            con1.userData.connected = true;
-        }
-        if (con2) {
-            // con2['connected'] = true;
-            con2.userData.connected = true;
-        }
-        return true;
-    }
-}
-
 /**
  This file is a modified version of THREE.OrbitControls
  Contributors:
@@ -12046,14 +12046,13 @@ class ConfiguringService {
     }
     addBuildToScene(buildResult) {
         if (buildResult && buildResult.object) {
+            Scene3DUtil.updatePivot(buildResult.object);
             this._itemService.addItem(buildResult.object);
         }
     }
     async handleLoadSceneContent() {
         try {
-            // this._loaderProcessUpdate(++this.currentStep);
             await this._lightPresetService.prepareLoadLightPreset(true);
-            // this._loaderProcessUpdate(++this.currentStep);
             this._cameraService.camera.position.set(0, 1, 4);
             this._cameraService.camera.lookAt(new Vector3());
             if (this.settingsService.settings.options.cameraPositionFixed) {
@@ -12064,17 +12063,6 @@ class ConfiguringService {
             }
             this._sceneEventService.rotateNoDrag = true;
             this._sceneService.needsRender = true;
-            // this._loaderProcessUpdate(++this.currentStep);
-            // if (this.settingsService.settings.options.showDownloadButton) {
-            //   this._createDownloadButton();
-            // }
-            // if (this.settingsService.settings.options.showMeasurementsButton) {
-            //   this._createMeasurementsButton();
-            // }
-            // if (this.settingsService.settings.options.development) {
-            //   this._createCameraSettingsButton();
-            // }
-            // this._loaderProcessUpdate(++this.currentStep);
         }
         catch (e) {
             console.error('Error during preparation:', e.message);