@colijnit/homedecorator 261.20.8 → 261.20.9

package/fesm2022/colijnit-homedecorator.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, Pipe, Component, Inject, Input, HostBinding, Optional, ViewChild, EventEmitter, ElementRef, Output, Directive, ChangeDetectionStrategy, ViewEncapsulation, HostListener, SkipSelf, Self, NgModule, NO_ERRORS_SCHEMA, forwardRef } from '@angular/core';
 import * as THREE from 'three';
 import { Vector2, Mesh, Object3D, PointLight, Matrix4, Box3, Vector3, Euler, BoxGeometry, MeshBasicMaterial, Scene, LinearSRGBColorSpace, SRGBColorSpace, AxesHelper, Group, BufferGeometry, Float32BufferAttribute, Line, LineBasicMaterial, CylinderGeometry, EquirectangularReflectionMapping, Material as Material$1, Texture as Texture$1, Source, EventDispatcher, Color, PerspectiveCamera, Quaternion, PlaneGeometry, DoubleSide, MeshStandardMaterial, RingGeometry, MathUtils, Raycaster, DataTexture, UnsignedByteType, LinearFilter, Shape, SphereGeometry, PCFSoftShadowMap, ShadowMaterial, LightProbe, DirectionalLight, MeshPhongMaterial, BackSide, FrontSide, NoToneMapping, ReinhardToneMapping, CineonToneMapping, ACESFilmicToneMapping, CustomToneMapping, NeutralToneMapping, BasicShadowMap, PCFShadowMap, VSMShadowMap, OrthographicCamera, WebGLRenderer, TextureLoader, EllipseCurve, ArcCurve, NearestFilter, MeshPhysicalMaterial, Path, ShapeGeometry, ConeGeometry, ObjectLoader, Light, Camera as Camera$1, RepeatWrapping, SpotLight, AmbientLight, HemisphereLight, AdditiveBlending, LineSegments, EdgesGeometry, CircleGeometry, ExtrudeGeometry, InstancedMesh, Clock, AnimationMixer, AnimationClip, BufferAttribute, NoColorSpace, ArrowHelper as ArrowHelper$1, UVMapping, CubeReflectionMapping, CubeRefractionMapping, EquirectangularRefractionMapping, CubeUVReflectionMapping, NearestMipmapNearestFilter, NearestMipMapNearestFilter, NearestMipmapLinearFilter, NearestMipMapLinearFilter, LinearMipmapNearestFilter, LinearMipMapNearestFilter, LinearMipmapLinearFilter, LinearMipMapLinearFilter, AlphaFormat, RGBAFormat, DepthFormat, DepthStencilFormat, RedFormat, RedIntegerFormat, RGFormat, RGIntegerFormat, RGBAIntegerFormat, ByteType, ShortType, UnsignedShortType, IntType, UnsignedIntType, FloatType, HalfFloatType, UnsignedShort4444Type, UnsignedShort5551Type, UnsignedInt248Type, ClampToEdgeWrapping, MirroredRepeatWrapping, ZeroFactor, OneFactor, SrcColorFactor, OneMinusSrcColorFactor, SrcAlphaFactor, OneMinusSrcAlphaFactor, DstAlphaFactor, OneMinusDstAlphaFactor, DstColorFactor, OneMinusDstColorFactor, AddEquation, SubtractEquation, ReverseSubtractEquation, MinEquation, MaxEquation, NoBlending, NormalBlending, SubtractiveBlending, MultiplyBlending, CustomBlending, TangentSpaceNormalMap, ObjectSpaceNormalMap, ZeroStencilOp, KeepStencilOp, ReplaceStencilOp, IncrementStencilOp, DecrementStencilOp, IncrementWrapStencilOp, DecrementWrapStencilOp, InvertStencilOp, NeverStencilFunc, LessStencilFunc, EqualStencilFunc, LessEqualStencilFunc, GreaterStencilFunc, NotEqualStencilFunc, GreaterEqualStencilFunc, AlwaysStencilFunc, SpotLightHelper, DirectionalLightHelper, HemisphereLightHelper, PointLightHelper, GridHelper, PMREMGenerator, BoxHelper } from 'three';
-import { BehaviorSubject, Subject, Observable, throwError, ReplaySubject, combineLatest, filter as filter$1, from } from 'rxjs';
+import { BehaviorSubject, Subject, Observable, throwError, ReplaySubject, combineLatest, filter as filter$1, take as take$1, from } from 'rxjs';
 import * as TWEEN from '@tweenjs/tween.js';
 import { Selection } from '@colijnit/configuratorapi/build/model/selection';
 import { HdecoPositioning } from '@colijnit/configuratorapi/build/enum/hdeco-positioning.enum';
@@ -44391,10 +44391,15 @@ class ThreedselectorComponent {
         this._loadedFromPreset = false;
         this._loadedFromProject = false;
         this._loadedShouldCopyInstance = false;
+        this._userActionNeeded = false;
         this._presetsService.register(this);
     }
     ngOnInit() {
         this._subs.push(this._appEventService.answerCountReceived.subscribe((answerCount) => this._handleAnswerCountReceived(answerCount)), this._messageBus.subscribe(MessageType.LoadIOneFurnitureIntoSceneBySKU, ({ sku, settings, position }) => this._handleLoadIOneFurnitureIntoSceneBySKU(sku, settings, position)), this._messageBus.subscribe(MessageType.CopyIOneFurnitureIntoSceneBySKU, (original) => this._handleCopyIOneFurnitureIntoSceneBySKU(original)), this._configuratorEventService.buildFinished.subscribe((result) => {
+            if (this._userActionNeeded) {
+                this._resetConfigurator(true);
+                this._userActionNeeded = false;
+            }
             this.handleBuildResult(result);
         }), this._buildFurnitureService.currentActiveService.configureModeChanged.subscribe(configuringModeChange => this._handleConfigureModeChange(configuringModeChange)), this._buildFurnitureService.currentActiveService.toggleSelectedElement.subscribe((element) => this._selectedElementToggle(element)), this._buildFurnitureService.currentActiveService.buildFinished.subscribe((result) => this._handleBuildFinished(result)), this._buildFurnitureService.currentActiveService.answerSelected.subscribe((result) => this._answerSelected(result)), this._sceneService.onAfterRender.subscribe(() => this._handleRender()), 
         // this._appService.skuSet.subscribe(sku => this._handleSkuSet(sku)),
@@ -44596,7 +44601,7 @@ class ThreedselectorComponent {
                 this._sceneService.needsRender = true;
             }
             else if (result.resultType === ResultType.NeedsUserInput) {
-                // this._configuringService.isConfiguring = true;
+                return; // wait for configuration to finish
             }
             else if (result.resultType === ResultType.BuildFromScratch) {
                 // if (this._loadedFromPreset) { // start configuring when loading is done
@@ -44744,6 +44749,48 @@ class ThreedselectorComponent {
             this.loadConfigurator = true;
         }
     }
+    async handleLoadIOneFurnitureIntoSceneByPreset(sku, instanceId, settings) {
+        const toast = new Toast();
+        toast.message = 'MODEL_LOADING';
+        this._toastService.showToast(toast);
+        const article = await this._loadFurnitureService.currentActiveService.loadArticle(sku);
+        let position = this._bluePrintService.getCenter();
+        const draggedData = {
+            name: sku,
+            constructFn: async (pos) => this.configureFurnitureFromPreset(sku, instanceId, settings),
+            type: itemTypeFromPlacement(article.placement),
+            iOne: true
+        };
+        this._messageBus.emit(MessageType.SetDrag, draggedData);
+        this._messageBus.emit(MessageType.StartDrag, position);
+    }
+    async configureFurnitureFromPreset(sku, instanceId, settings) {
+        this._resetConfigurator();
+        this.firstBuild = true;
+        const configuratorSettings = this._settingsService.settings.projectSettings ?
+            this._settingsService.settings.projectSettings : this._settingsService.settings;
+        const configuratorSettingsClone = Object.assign({}, configuratorSettings);
+        const configuratorExternalSourceId = settings && settings.externalSourceId ? settings.externalSourceId : undefined;
+        if (configuratorExternalSourceId) {
+            configuratorSettingsClone.externalSourceId = configuratorExternalSourceId;
+            configuratorSettingsClone.username = settings.username;
+            configuratorSettingsClone.password = settings.password;
+            configuratorSettingsClone.url = settings.url;
+            configuratorSettingsClone.version = settings.version;
+            configuratorSettingsClone.schema = settings.schema;
+            configuratorSettingsClone.mainUrl = settings.url;
+            configuratorSettingsClone.mainSchema = settings.schema;
+            configuratorSettingsClone.mainVersion = settings.version;
+            // Set here to just save it, when it comes back from the configurator, we need to add it to the metadata.
+            this._externalSourceData = settings;
+        }
+        this._configuringService.scene = this._sceneService.scene;
+        this._initConfigurator(configuratorSettingsClone, sku, !!configuratorExternalSourceId, instanceId);
+        this._startPosition = this._bluePrintService.getCenter();
+        this.loadConfigurator = true;
+        this._changeDetector.detectChanges();
+        return this._waitForBuildToFinish();
+    }
     _initConfigurator(settings, sku, external, instanceId) {
         this.configuratorSettings = this._prepareSettings(settings, external);
         this.configuratorSku = sku;
@@ -44759,18 +44806,29 @@ class ThreedselectorComponent {
         }
         return settings;
     }
-    _resetConfigurator() {
-        this.currentMetadata = undefined;
-        this.configuratorSettings = undefined;
-        this.configuratorSku = undefined;
-        this.configuratorInstanceId = undefined;
-        this.loadConfigurator = false;
+    _shouldResetConfigurator(result) {
+        return result && result.resultType !== ResultType.NeedsUserInput;
+    }
+    _resetConfigurator(reset = true) {
+        if (reset) {
+            this.currentMetadata = undefined;
+            this.configuratorSettings = undefined;
+            this.configuratorSku = undefined;
+            this.configuratorInstanceId = undefined;
+            this.loadConfigurator = false;
+        }
         this.firstBuild = false;
     }
     _waitForBuildToFinish() {
         return new Promise((resolve, reject) => {
-            this._configuratorEventService.buildFinished.pipe(filter$1(value => value !== undefined && value !== null), take(1)).subscribe((result) => {
-                this._resetConfigurator();
+            this._configuratorEventService.buildFinished.pipe(filter$1(value => value !== undefined && value !== null), take$1(1)).subscribe((result) => {
+                if (this._shouldResetConfigurator(result)) {
+                    this._resetConfigurator(true);
+                }
+                else {
+                    this._resetConfigurator(false);
+                    this._userActionNeeded = true;
+                }
                 resolve(this.handleBuildResult(result));
             });
         });
@@ -45465,6 +45523,7 @@ class ThreedselectorComponent {
         const type = itemTypeFromPlacement(result.placement);
         result.position = isFloorType(type) ? this._bluePrintService.getRoomCenter() : new Vector3();
         result.originalMetadata = {
+            itemIdentifier: data.itemIdentifier,
             itemName: data.object.name,
             itemType: type,
             configurable: false,
@@ -45473,16 +45532,16 @@ class ThreedselectorComponent {
             // scale?: Vector3;
             // centerPivot?: boolean;
             thirdPartyModel: true,
-            // canElevate?: boolean;
+            canElevate: data.stackable,
             // modelUrl?: string;
-            // scalable?: boolean;
+            scalable: data.scalable,
+            canScaleX: data.scalable,
+            canScaleY: data.scalable,
+            canScaleZ: data.scalable,
             // elevation?: number;
             // elevationFixed?: boolean;
-            // elevationAdjustable?: boolean;
-            canScaleX: true,
-            canScaleY: true,
-            canScaleZ: true,
-            colorable: true
+            elevationAdjustable: data.heightAdjustable,
+            colorable: data.colorable
         };
         this.handleBuildResult(result);
     }
@@ -48594,7 +48653,6 @@ class HomedecoratorComponent {
                 [purchaseFilterOrders]="purchaseFilterOrders"
                 [logisticsFilterOrders]="logisticsFilterOrders"
               ></rp-product-catalog>
-              <co-lite-selector></co-lite-selector>
               <rp-help></rp-help>
             </rp-loading-overlay>
           </div>
@@ -48613,7 +48671,7 @@ class HomedecoratorComponent {
           </div>
         }
       }
-      `, isInline: true, dependencies: [{ kind: "component", type: ProgressBarComponent, selector: "progress-bar" }, { kind: "component", type: LoadingOverlayComponent, selector: "rp-loading-overlay" }, { kind: "component", type: HdLoaderComponent, selector: "rp-loader", inputs: ["show"] }, { kind: "component", type: Core3dComponent, selector: "rp-core3d" }, { kind: "component", type: RoomPlannerComponent, selector: "rp-room-planner", inputs: ["isLoading"], outputs: ["done", "showPlugin", "focusControls"] }, { kind: "component", type: FurnitureManagerComponent, selector: "rp-furniture-manager" }, { kind: "component", type: PresetsComponent, selector: "rp-presets", inputs: ["openNewRoomDialog"] }, { kind: "component", type: ThreedselectorComponent, selector: "rp-threedselector", inputs: ["selections"], outputs: ["customizeButtonClicked"] }, { kind: "component", type: ToolbarComponent, selector: "rp-toolbar", inputs: ["shareButton"], outputs: ["externalSave", "externalOpen"] }, { kind: "component", type: ProductCatalogComponent, selector: "rp-product-catalog", inputs: ["generalFilterOrders", "purchaseFilterOrders", "logisticsFilterOrders"] }, { kind: "component", type: HelpComponent, selector: "rp-help" }, { kind: "component", type: i27.LiteSelectorComponent, selector: "co-lite-selector", inputs: ["show", "showLabel", "canClose", "animateSlideout", "customDimensions"], outputs: ["showChange", "answerChosen"] }], encapsulation: i0.ViewEncapsulation.None }); }
+      `, isInline: true, dependencies: [{ kind: "component", type: ProgressBarComponent, selector: "progress-bar" }, { kind: "component", type: LoadingOverlayComponent, selector: "rp-loading-overlay" }, { kind: "component", type: HdLoaderComponent, selector: "rp-loader", inputs: ["show"] }, { kind: "component", type: Core3dComponent, selector: "rp-core3d" }, { kind: "component", type: RoomPlannerComponent, selector: "rp-room-planner", inputs: ["isLoading"], outputs: ["done", "showPlugin", "focusControls"] }, { kind: "component", type: FurnitureManagerComponent, selector: "rp-furniture-manager" }, { kind: "component", type: PresetsComponent, selector: "rp-presets", inputs: ["openNewRoomDialog"] }, { kind: "component", type: ThreedselectorComponent, selector: "rp-threedselector", inputs: ["selections"], outputs: ["customizeButtonClicked"] }, { kind: "component", type: ToolbarComponent, selector: "rp-toolbar", inputs: ["shareButton"], outputs: ["externalSave", "externalOpen"] }, { kind: "component", type: ProductCatalogComponent, selector: "rp-product-catalog", inputs: ["generalFilterOrders", "purchaseFilterOrders", "logisticsFilterOrders"] }, { kind: "component", type: HelpComponent, selector: "rp-help" }], encapsulation: i0.ViewEncapsulation.None }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: HomedecoratorComponent, decorators: [{
             type: Component,
@@ -48640,7 +48698,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 [purchaseFilterOrders]="purchaseFilterOrders"
                 [logisticsFilterOrders]="logisticsFilterOrders"
               ></rp-product-catalog>
-              <co-lite-selector></co-lite-selector>
               <rp-help></rp-help>
             </rp-loading-overlay>
           </div>