@colijnit/homedecorator 258.1.1 → 258.1.2

package/app/plugins/product-configurator/product-configurator.component.scss

@@ -0,0 +1,35 @@
+:host.floating ::ng-deep .product-configurator-container {
+    position: absolute;
+    right: 0;
+    max-height: calc(100vh - 120px);
+}
+
+:host:not(.custom-dimensions).floating ::ng-deep .product-configurator-container {
+    top: 64px;
+    height: calc(100vh - 184px);
+    padding: 5px 10px 10px 10px;
+    border-radius: 10px;
+    right: 10px;
+    width: 505px;
+    background: #fff;
+}
+
+.product-configurator-header {
+    display: flex;
+    justify-content: space-between;
+    box-sizing: border-box;
+    padding-bottom: 10px;
+    .product-configurator-close {
+        cursor: pointer;
+    }
+}
+
+.product-configurator-details {
+    max-height: calc(100vh - 360px);
+    overflow-y: scroll;
+}
+
+.product-configurator-summary {
+    box-sizing: border-box;
+    padding: 10px 0;
+}

package/app/plugins/product-configurator/product-configurator.module.d.ts

@@ -0,0 +1,18 @@
+import * as i0 from "@angular/core";
+import * as i1 from "./product-configurator.component";
+import * as i2 from "./product-configurator-selector.component";
+import * as i3 from "./product-configurator-selector-option-button.component";
+import * as i4 from "./product-configurator-selector-option-list-of-values.component";
+import * as i5 from "./product-configurator-selector-option-tile.compontent";
+import * as i6 from "./product-configurator-selector-option-dropdown.component";
+import * as i7 from "../../core/core.module";
+import * as i8 from "@angular/common";
+import * as i9 from "@angular/material/icon";
+import * as i10 from "@angular/material/button";
+import * as i11 from "@colijnit/corecomponents";
+import * as i12 from "@angular/forms";
+export declare class ProductConfiguratorModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<ProductConfiguratorModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<ProductConfiguratorModule, [typeof i1.ProductConfiguratorComponent, typeof i2.ProductConfiguratorSelectorComponent, typeof i3.ProductConfiguratorSelectorOptionButtonComponent, typeof i4.ProductConfiguratorOptionListOfValuesComponent, typeof i5.ProductConfiguratorSelectorOptionTileComponent, typeof i6.ProductConfiguratorSelectorOptionDropDownComponent], [typeof i7.CoreModule, typeof i8.CommonModule, typeof i9.MatIconModule, typeof i10.MatButtonModule, typeof i11.CardModule, typeof i11.SlideoutModule, typeof i11.SummaryLineModule, typeof i11.PriceDisplayPipeModule, typeof i11.ButtonModule, typeof i11.HtmlHeaderModule, typeof i11.InputTextModule, typeof i11.InputTextChipsModule, typeof i11.IconModule, typeof i12.FormsModule], [typeof i1.ProductConfiguratorComponent, typeof i2.ProductConfiguratorSelectorComponent, typeof i3.ProductConfiguratorSelectorOptionButtonComponent, typeof i4.ProductConfiguratorOptionListOfValuesComponent, typeof i5.ProductConfiguratorSelectorOptionTileComponent, typeof i6.ProductConfiguratorSelectorOptionDropDownComponent]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<ProductConfiguratorModule>;
+}

package/app/plugins/product-configurator/template_variables.scss

@@ -0,0 +1,13 @@
+// Tiles
+$border-color: #eee;
+$default-border-radius: 3px;
+$background-color: #eee;
+$default-padding: 5px;
+$font-size: 14px;
+$font-size-small: 12px;
+
+// checkmarks and icons
+$checked-icon-color: #da9803;
+$small-icon-height: 20px;
+$small-icon-width: 20px;
+

package/app/plugins/render/model/blender-render-settings.d.ts

@@ -0,0 +1,10 @@
+import { BlenderSceneSetting } from './blender-scene-settings';
+export declare class BlenderRenderSettings {
+    height: number;
+    width: number;
+    sceneAsset: BlenderSceneSetting;
+    hdriIntensity: number;
+    hdriRotation: number;
+    lightingExposure: number;
+    allowCulling: boolean;
+}

package/app/plugins/render/model/blender-scene-settings.d.ts

@@ -0,0 +1,18 @@
+export declare class BlenderSceneSettings {
+    scenes: BlenderSceneSetting[];
+}
+export declare class BlenderSceneSetting {
+    name: string;
+    multiSceneRender: boolean;
+    primarySceneName: string;
+    secondarySceneName?: string;
+    defaultSceneName?: string;
+    hdriIntensity: number;
+    hdriRotation: number;
+    lightingExposure: number;
+    sceneType: BlenderSceneType;
+}
+export declare enum BlenderSceneType {
+    Product = "product",
+    Room = "room"
+}

package/app/plugins/render/render-controls/render-controls.component.d.ts

@@ -1,4 +1,4 @@
-import { ElementRef } from '@angular/core';
+import { ElementRef, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { ViewMode } from '../../../core/enum/view-mode.enum';
 import { RenderStatus } from '../enum/render-status';
@@ -14,8 +14,11 @@ import { NewRenderService } from '../service/new-render.service';
 import { UtilsService } from '../../../core/service/utils.service';
 import { IconEnum } from '../../../core/enum/icon.enum';
 import { HomedecoratorIconCacheService } from '../../../core/service/homedecorator-icon-cache.service';
+import { RoomService } from '../../room-planner/components/floorplanner/service/room.service';
+import { WallMeasurementsService } from '../../core3d/service/wall-measurements.service';
+import { BlenderSceneSetting } from '../model/blender-scene-settings';
 import * as i0 from "@angular/core";
-export declare class RenderControlsComponent {
+export declare class RenderControlsComponent implements OnInit {
     renderService: RenderService;
     messageService: MessageBusService;
     viewModeService: ViewModeService;
@@ -28,22 +31,28 @@ export declare class RenderControlsComponent {
     private _settingsService;
     private _newRenderService;
     private _utilsService;
+    private _roomService;
+    private _wallMeasurementsService;
     readonly icons: typeof IconEnum;
     blenderPreviewRender: string;
     hdriIntensity: number;
     hdriRotation: number;
     lightingExposure: number;
     showRenderSettings: boolean;
+    selectedRenderScene: BlenderSceneSetting;
+    sceneList: BlenderSceneSetting[];
+    hasError: boolean;
+    errorText: string;
+    imageRenderSource: any;
+    inPictureMode: boolean;
+    showCullingErrorDialog: boolean;
     private _subs;
-    constructor(renderService: RenderService, messageService: MessageBusService, viewModeService: ViewModeService, settingsService: HomedecoratorSettingsService, iconService: HomedecoratorIconCacheService, _dialog: MatDialog, _sceneService: SceneService, _cameraService: CameraService, _configurationService: ConfigurationService, _settingsService: HomedecoratorSettingsService, _newRenderService: NewRenderService, _utilsService: UtilsService);
+    constructor(renderService: RenderService, messageService: MessageBusService, viewModeService: ViewModeService, settingsService: HomedecoratorSettingsService, iconService: HomedecoratorIconCacheService, _dialog: MatDialog, _sceneService: SceneService, _cameraService: CameraService, _configurationService: ConfigurationService, _settingsService: HomedecoratorSettingsService, _newRenderService: NewRenderService, _utilsService: UtilsService, _roomService: RoomService, _wallMeasurementsService: WallMeasurementsService);
+    ngOnInit(): void;
     get disablePictureButton(): boolean;
     readonly viewModes: typeof ViewMode;
     readonly renderStatus: typeof RenderStatus;
     renderButton: ElementRef;
-    hasError: boolean;
-    errorText: string;
-    imageRenderSource: any;
-    inPictureMode: boolean;
     readonly renderModes: typeof RenderModes;
     showRenderForm(event: MouseEvent): void;
     startRenderingRoom(): Promise<void>;
@@ -53,8 +62,11 @@ export declare class RenderControlsComponent {
     getPreviewRender(): void;
     showPreview(image: string): void;
     toggleRenderSettings(): void;
+    updateBlenderSceneSettings(event: any): void;
     validateRenderPosition(): void;
+    getRenderScenesFromSettings(): void;
     private _getObjectsByName;
+    private _allowCulling;
     static ɵfac: i0.ɵɵFactoryDeclaration<RenderControlsComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<RenderControlsComponent, "rp-render-controls", never, {}, {}, never, never>;
 }

package/app/plugins/render/service/new-render.service.d.ts

@@ -1,4 +1,4 @@
-import { OnDestroy } from '@angular/core';
+import { EventEmitter, OnDestroy } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { RenderQueueItem } from '../model/render-queue-item';
 import { HomedecoratorSettingsService } from '../../../core/service/homedecorator-settings.service';
@@ -15,6 +15,9 @@ import { RoomService } from '../../room-planner/components/floorplanner/service/
 import { FloorService } from '../../core3d/service/floor.service';
 import { LoadFurnitureService } from '../../threedselector/threedselector/service/load-furniture.service';
 import { UtilsService } from '../../../core/service/utils.service';
+import { ApiServiceModule } from '../../../core/service/3dm-api';
+import { PresetsService } from '../../../core/service/presets.service';
+import { HomedecoratorAppEventService } from '../../../core/service/homedecorator-app-event.service';
 import * as i0 from "@angular/core";
 export declare class NewRenderService implements OnDestroy {
     messageService: MessageBusService;
@@ -32,7 +35,11 @@ export declare class NewRenderService implements OnDestroy {
     private _floorService;
     private _loadFurnitureService;
     private _utilsService;
+    private _presetService;
+    private _apiServiceModule;
+    private _appEventService;
     renderImageChanged: BehaviorSubject<string>;
+    blenderRenderStarted: EventEmitter<string>;
     renderUpdateImageChanged: BehaviorSubject<{
         image: string;
         progress: number;
@@ -40,18 +47,25 @@ export declare class NewRenderService implements OnDestroy {
     }>;
     renderRoomImageChanged: BehaviorSubject<string>;
     standAloneCameraMatrix: number[];
+    standAloneCameraFixedMatrix: number[];
     currentQueueRenderItem: RenderQueueItem;
     renderedRoomImages: string[];
+    clientWidth: number;
+    clientHeight: number;
     private _subs;
-    constructor(messageService: MessageBusService, _settingsService: HomedecoratorSettingsService, _buildFurnitureService: BuildFurnitureService, _cameraService: CameraService, _sceneService: SceneService, _ione: HomedecoratorConnectorService, _ioneConnectorAdapter: HomedecoratorConnectorAdapterService, _threedSelectorService: ThreedselectorService, _toastService: ToastService, _messageBusService: MessageBusService, _googleTagManager: GoogleTagManagerService, _roomService: RoomService, _floorService: FloorService, _loadFurnitureService: LoadFurnitureService, _utilsService: UtilsService);
+    constructor(messageService: MessageBusService, _settingsService: HomedecoratorSettingsService, _buildFurnitureService: BuildFurnitureService, _cameraService: CameraService, _sceneService: SceneService, _ione: HomedecoratorConnectorService, _ioneConnectorAdapter: HomedecoratorConnectorAdapterService, _threedSelectorService: ThreedselectorService, _toastService: ToastService, _messageBusService: MessageBusService, _googleTagManager: GoogleTagManagerService, _roomService: RoomService, _floorService: FloorService, _loadFurnitureService: LoadFurnitureService, _utilsService: UtilsService, _presetService: PresetsService, _apiServiceModule: ApiServiceModule, _appEventService: HomedecoratorAppEventService);
     ngOnDestroy(): void;
     procesRenderFile(file: any): void;
-    forceRenderImage(): void;
-    renderImage(): void;
+    forceRenderImage(optionalRenderParameters?: any): void;
+    renderImage(optionalRenderParameters?: any): void;
     renderRoom(size: any): Promise<void>;
+    getNewGlbFromServer(): void;
     private _exportToGlb;
     private _getNewRenderImage;
+    private _createRenderFromJson;
+    private _getDataForJsonRender;
     private _handleAjaxRender;
+    private _handleAjaxGlb;
     private _handleWebSocketRender;
     private _handleWebSocketRoomRender;
     private _showPreviewImage;
@@ -59,6 +73,9 @@ export declare class NewRenderService implements OnDestroy {
     private _getSceneRenderSettings;
     private _getDataForRoomRender;
     private _arrayBufferToBase64;
+    private _getRenderWidth;
+    private _getRenderHeight;
+    private _useTransparency;
     static ɵfac: i0.ɵɵFactoryDeclaration<NewRenderService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<NewRenderService>;
 }

package/app/plugins/room-planner/components/floor-catalog/floor-catalog.component.scss

@@ -178,7 +178,7 @@ $input-border-color: #9FA9B4;
 
 .floor-detail-download {
   display: flex;
-  justify-content: end;
+  justify-content: flex-end;
   button {
     max-width: 150px;
   }

package/app/plugins/threedselector/threedselector/service/build-furniture.service.d.ts

@@ -37,6 +37,7 @@ import { FloorPatternService } from '../../../core3d/service/floor-pattern.servi
 import { FloorTileIntersectionService } from '../../../core3d/service/floor-tile-intersection.service';
 import { HomedecoratorConnectorAdapterService } from '../../../../core/service/homedecorator-connector-adapter.service';
 import { OutlineService } from '../../../core3d/service/outline.service';
+import { SelectorStructure } from '@colijnit/configuratorapi/build/model/selector-structure.bo';
 import * as i0 from "@angular/core";
 export interface ConfiguringModeChangeInterface {
     metadata: Metadata;
@@ -105,6 +106,7 @@ export declare class BuildFurnitureService implements OnDestroy {
     private _genericSelection;
     private _subs;
     private _answerSelected;
+    private _selectionsSelected;
     private _furnitureConfigurations;
     constructor(_dialog: MatDialog, _iOne: HomedecoratorConnectorService, _threedSelectorService: ThreedselectorService, _collisionManager: CollisionManagerService, _messageBus: MessageBusService, _dictionaryService: HomedecoratorDictionaryService, _hudService: HudService, _sceneService: SceneService, _cameraService: CameraService, _sceneEventService: SceneEventService, _appEventService: HomedecoratorAppEventService, _presetService: PresetsService, _itemService: ItemService, _elementService: ElementService, _permanentStoreService: PermanentStoreService, _googleTagManager: GoogleTagManagerService, _settingsService: HomedecoratorSettingsService, _utilsService: UtilsService, _variationService: VariationService, _appStateService: AppStateService, _errorService: ErrorService, _itemGroupService: ItemGroupService, _variationCacheService: VariationCacheService, _resizeService: ResizeService, _viewModeService: ViewModeService, _floorService: FloorService, _floorPatternService: FloorPatternService, _floorTileIntersectionService: FloorTileIntersectionService, _connectorAdapterService: HomedecoratorConnectorAdapterService, _outlineService: OutlineService);
     ngOnDestroy(): void;
@@ -144,11 +146,13 @@ export declare class BuildFurnitureService implements OnDestroy {
     private _handleSelectionsReceived;
     private _handleConnectionReset;
     private _handleAnswerSelected;
+    private _handleSelectionSelected;
     cancelAnswer(metadata: Metadata, rebuild?: boolean, getAnswers?: boolean): Promise<void>;
     selectSelection(selection: Selection, metadata: Metadata, forceBackToNode?: boolean, after?: boolean, connector?: string): Promise<void>;
     deleteSelection(selection: Selection, metadata: Metadata): Promise<void>;
     replaceSelection(selection: Selection, metadata: Metadata): Promise<void>;
     selectAnswer(answer: Answer, input: string, metadata: Metadata): Promise<void>;
+    selectSelectionAsAnswer(chosenOption: SelectorStructure, metadata: Metadata): Promise<void>;
     private _getActiveFurniture;
     private _linkSelectionsAndDecos;
     private _createConfigurableItem;
@@ -195,6 +199,7 @@ export declare class BuildFurnitureService implements OnDestroy {
     private _showWarning;
     private _prepareStandAlone;
     private _preloadMaterial;
+    private _preloadMaterialBySelection;
     static ɵfac: i0.ɵɵFactoryDeclaration<BuildFurnitureService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<BuildFurnitureService>;
 }

package/app/plugins/threedselector/threedselector/threedselector.component.d.ts

@@ -99,6 +99,7 @@ export declare class ThreedselectorComponent implements OnInit, OnDestroy {
     editAddButtons: CustomButton[];
     editCustomizeButton: CustomButton[];
     resizeButtons: CustomButton[];
+    animateEditAddButtons: boolean;
     selectedElementPosition: Vector2;
     showElementToolbar: boolean;
     showLiteSelector: boolean;
@@ -117,6 +118,7 @@ export declare class ThreedselectorComponent implements OnInit, OnDestroy {
     showLoader: boolean;
     showProgressBar: boolean;
     showProgressText: boolean;
+    showFullConfiguration: boolean;
     private _selectedElementObject;
     private _skuAlreadySet;
     private _itemsFromScratch;
@@ -158,6 +160,7 @@ export declare class ThreedselectorComponent implements OnInit, OnDestroy {
     private _resetSelectedElement;
     private _handleRender;
     private _selectedElementToggle;
+    private _showPlusButtonsBriefly;
     private _handleBuildFinished;
     private _resetElementPosition;
     private _removeAllButtons;
@@ -193,6 +196,7 @@ export declare class ThreedselectorComponent implements OnInit, OnDestroy {
     private _addModelDialogToolbar;
     private _showWarning;
     private _addToSceneGTM;
+    private _setTemplateType;
     static ɵfac: i0.ɵɵFactoryDeclaration<ThreedselectorComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<ThreedselectorComponent, "rp-threedselector", never, { "selections": "selections"; }, { "customizeButtonClicked": "customizeButtonClicked"; }, never, never>;
 }

package/app/plugins/threedselector/threedselector/threedselector.component.scss

@@ -9,6 +9,17 @@
   height: 100%;
   overflow: hidden;
   /*font-family: Arial, Helvetica, sans-serif;*/
+
+  .rp-element-buttons {
+    &.animate {
+      ::ng-deep .element-add-button {
+        animation-name: pulse-add-buttons;
+        animation-duration: 400ms;
+        animation-iteration-count: 6;
+        animation-direction: alternate;
+      }
+    }
+  }
 }
 
 :host > * {
@@ -137,3 +148,9 @@
   background: #da9803;
   transition: width 0.3s;
 }
+
+@keyframes pulse-add-buttons {
+  50% {
+    box-shadow: 0 0 20px hsl(12, 100%, 60%);
+  }
+}

package/app/plugins/threedselector/threedselector.module.d.ts

@@ -24,8 +24,9 @@ import * as i22 from "../../shared/error-dialog/error-dialog.module";
 import * as i23 from "../../shared/model-dialog/model-dialog.module";
 import * as i24 from "../../shared/export-dialog/export-dialog.module";
 import * as i25 from "../../shared/camera-settings-dialog/camera-settings-dialog.module";
+import * as i26 from "../product-configurator/product-configurator.module";
 export declare class ThreedselectorModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<ThreedselectorModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<ThreedselectorModule, [typeof i1.ThreedselectorComponent, typeof i2.ElementToolbarComponent, typeof i3.ElementButtonsComponent, typeof i4.ElementSliderComponent], [typeof i5.CommonModule, typeof i6.FormsModule, typeof i7.MatButtonModule, typeof i8.MatButtonToggleModule, typeof i9.MatSidenavModule, typeof i10.MatCardModule, typeof i11.MatSliderModule, typeof i12.MatSlideToggleModule, typeof i13.MatGridListModule, typeof i14.MatIconModule, typeof i15.MatTabsModule, typeof i16.Core3dModule, typeof i17.CoreModule, typeof i18.SlideoutModule, typeof i18.SummaryLineModule, typeof i18.CardModule, typeof i19.LiteSelectorModule, typeof i18.IconModule, typeof i20.ToolbarIconModule, typeof i21.InfoDialogModule, typeof i22.ErrorDialogModule, typeof i23.ModelDialogModule, typeof i24.ExportDialogModule, typeof i25.CameraSettingsDialogModule], [typeof i3.ElementButtonsComponent, typeof i1.ThreedselectorComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<ThreedselectorModule, [typeof i1.ThreedselectorComponent, typeof i2.ElementToolbarComponent, typeof i3.ElementButtonsComponent, typeof i4.ElementSliderComponent], [typeof i5.CommonModule, typeof i6.FormsModule, typeof i7.MatButtonModule, typeof i8.MatButtonToggleModule, typeof i9.MatSidenavModule, typeof i10.MatCardModule, typeof i11.MatSliderModule, typeof i12.MatSlideToggleModule, typeof i13.MatGridListModule, typeof i14.MatIconModule, typeof i15.MatTabsModule, typeof i16.Core3dModule, typeof i17.CoreModule, typeof i18.SlideoutModule, typeof i18.SummaryLineModule, typeof i18.CardModule, typeof i19.LiteSelectorModule, typeof i18.IconModule, typeof i20.ToolbarIconModule, typeof i21.InfoDialogModule, typeof i22.ErrorDialogModule, typeof i23.ModelDialogModule, typeof i24.ExportDialogModule, typeof i25.CameraSettingsDialogModule, typeof i26.ProductConfiguratorModule], [typeof i3.ElementButtonsComponent, typeof i1.ThreedselectorComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<ThreedselectorModule>;
 }

package/app/plugins/toolbar/draw-dialog/draw-dialog.component.scss

@@ -47,7 +47,7 @@ button {
 .modal-footer {
   display: flex;
   justify-content: space-between;
-  align-items: end;
+  align-items: flex-end;
   margin-top: 30px;
 }