@colijnit/homedecorator 255.1.18 → 255.1.20

package/app/core/enum/message-type.enum.d.ts

@@ -69,5 +69,6 @@ export declare enum MessageType {
     ChangeTexture = "ChangeTexture",
     RenderError = "RenderError",
     ShowFloorArticleCatalog = "ShowFloorArticleCatalog",
-    BlenderRenderPreviewReady = "BlenderRenderPreviewReady"
+    BlenderRenderPreviewReady = "BlenderRenderPreviewReady",
+    FloorPlaneAvailable = "FloorPlaneAvailable"
 }

package/app/core/interface/message-without-payload.interface.d.ts

@@ -32,4 +32,5 @@ export interface MessagesWithoutPayload {
     [MessageType.StartGroupObject]: any;
     [MessageType.CancelGroupObject]: any;
     [MessageType.StartWithDiagram]: any;
+    [MessageType.FloorPlaneAvailable]: any;
 }

package/app/core/model/homedecorator-settings-options.d.ts

@@ -5,6 +5,7 @@ export declare class HomedecoratorSettingsOptions {
     showTagFilter: boolean;
     showAsConfigured: boolean;
     development: boolean;
+    allowLocalSave: boolean;
     inlineAnswers: boolean;
     showArButton: boolean;
     showCaptionAddButton: boolean;

package/app/core/service/utils.service.d.ts

@@ -60,11 +60,11 @@ export declare class UtilsService implements OnDestroy {
     forceChangeDetection(cd: ChangeDetectorRef, component: any, propName: string): void;
     getKTX2Loader(): KTX2Loader;
     downloadUSDZforARIOS(object: Object3D): Promise<void>;
+    cleanedUpObjects(object: Object3D, cleanUp?: boolean): Object3D;
     private _download3DModelAsGLB;
     private _download3DModelAsUSDZ;
     private _downloadFile;
     private _loadGroup;
-    private _cleanedUpObjects;
     private _addGroupChildrenToObject;
     private _iterateChildren;
     private _includeBaseUrl;

package/app/homedecorator.component.d.ts

@@ -8,6 +8,7 @@ import { ScreenSizeAnalysisService } from './shared/screen-size-analysis/screen-
 import { MessageBusService } from './core/service/message-bus.service';
 import { HomedecoratorService } from './core/service/homedecorator.service';
 import { HomedecoratorAppEventService } from './core/service/homedecorator-app-event.service';
+import { FilterOrder } from '@colijnit/catalog/lib/interface/filter-order.interface';
 import * as i0 from "@angular/core";
 export declare class HomedecoratorComponent implements OnInit, OnDestroy {
     controllerService: HomedecoratorConnectorService;
@@ -22,6 +23,9 @@ export declare class HomedecoratorComponent implements OnInit, OnDestroy {
     private _eventService;
     set settings(value: any);
     get settings(): any;
+    generalFilterOrders: FilterOrder[];
+    purchaseFilterOrders: FilterOrder[];
+    logisticsFilterOrders: FilterOrder[];
     showClass: boolean;
     loaded: boolean;
     title: string;
@@ -40,5 +44,5 @@ export declare class HomedecoratorComponent implements OnInit, OnDestroy {
     private _startWithEmptyRoom;
     private _startWithPreset;
     static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<HomedecoratorComponent, "co-homedecorator", never, { "settings": "settings"; }, {}, never, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<HomedecoratorComponent, "co-homedecorator", never, { "settings": "settings"; "generalFilterOrders": "generalFilterOrders"; "purchaseFilterOrders": "purchaseFilterOrders"; "logisticsFilterOrders": "logisticsFilterOrders"; }, {}, never, never>;
 }

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

@@ -49,6 +49,7 @@ export declare class Core3dComponent implements OnInit, OnDestroy, PluginInterfa
     showLightplan: boolean;
     showCameraControlButtons: boolean;
     show3DWaterMark: boolean;
+    threedOptionsAvailable: boolean;
     private _subs;
     constructor(viewModeService: ViewModeService, settingsService: HomedecoratorSettingsService, xrService: XrService, _vrService: VrService, _presetService: PresetsService, _messageService: MessageBusService, _configurationService: ConfigurationService, _cameraService: CameraService, _floorplanService: FloorplanService, _itemService: ItemService, _dialog: MatDialog, iconService: HomedecoratorIconCacheService, _screenSizeService: ScreenSizeAnalysisService, _wallMeasurementsService: WallMeasurementsService);
     ngOnInit(): void;
@@ -71,6 +72,7 @@ export declare class Core3dComponent implements OnInit, OnDestroy, PluginInterfa
     };
     copySceneInstance(saveAs: boolean): Promise<void>;
     loadObjects(data: any): Promise<any>;
+    private _viewModeChanged;
     static ɵfac: i0.ɵɵFactoryDeclaration<Core3dComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<Core3dComponent, "rp-core3d", never, {}, {}, never, never>;
 }

package/app/plugins/core3d/items/base-item.d.ts

@@ -37,6 +37,7 @@ export declare abstract class BaseItem extends Object3D {
     default180: boolean;
     configurable: boolean;
     tempObject: boolean;
+    onWall: boolean;
     set metadata(value: Metadata);
     get metadata(): Metadata;
     protected positionSet: boolean;

package/app/plugins/core3d/items/custom-objects.d.ts

@@ -30,6 +30,7 @@ export declare class CustomMesh extends Mesh {
     dispose(): void;
     private _getRootMeshPosition;
     private _initializeDimensions;
+    private _inFiniteBoundingBox;
     private _boundingBoxToCorners;
     private _getBoundingBox;
     private _cleanupBoundingBox;

package/app/plugins/product-catalog/own-collection-catalog/product-own-collection.component.d.ts

@@ -1,11 +1,13 @@
-import { EventEmitter, OnInit } from '@angular/core';
+import { EventEmitter } from '@angular/core';
 import { HomedecoratorExternalSettingsInterface } from '../../../core/interface/homedecorator-external-settings.interface';
 import { ArticleListObjectExtended } from '@colijnit/articleapi/build/model/article-list-object-extended.bo';
-import { CatalogScreenConfigurationService } from '../service/catalog-screen-configuration.service';
+import { FilterOrder } from '@colijnit/catalog/lib/interface/filter-order.interface';
 import * as i0 from "@angular/core";
-export declare class ProductOwnCollectionComponent implements OnInit {
-    private _screenConfigService;
+export declare class ProductOwnCollectionComponent {
     settings: any;
+    generalFilterOrders: FilterOrder[];
+    purchaseFilterOrders: FilterOrder[];
+    logisticsFilterOrders: FilterOrder[];
     articleClick: EventEmitter<{
         article: ArticleListObjectExtended;
         settings?: HomedecoratorExternalSettingsInterface;
@@ -14,10 +16,8 @@ export declare class ProductOwnCollectionComponent implements OnInit {
         article: ArticleListObjectExtended;
         settings?: HomedecoratorExternalSettingsInterface;
     }>;
-    constructor(_screenConfigService: CatalogScreenConfigurationService);
-    ngOnInit(): Promise<void>;
     handleArticleClick(article: ArticleListObjectExtended): void;
     handleArButtonClick(article: ArticleListObjectExtended): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ProductOwnCollectionComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<ProductOwnCollectionComponent, "rp-product-own-collection", never, { "settings": "settings"; }, { "articleClick": "articleClick"; "arButtonClick": "arButtonClick"; }, never, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ProductOwnCollectionComponent, "rp-product-own-collection", never, { "settings": "settings"; "generalFilterOrders": "generalFilterOrders"; "purchaseFilterOrders": "purchaseFilterOrders"; "logisticsFilterOrders": "logisticsFilterOrders"; }, { "articleClick": "articleClick"; "arButtonClick": "arButtonClick"; }, never, never>;
 }

package/app/plugins/product-catalog/product-catalog/product-catalog.component.d.ts

@@ -18,7 +18,7 @@ import { HomedecoratorExternalSettingsInterface } from '../../../core/interface/
 import { ThirdPartyModelService } from '../../threedselector/threedselector/service/third-party-model.service';
 import { ExternalSourceArticleClickInterface } from '@colijnit/articleapi/build/interface/external-source-article-click.interface';
 import { ArticleListObjectExtended } from '@colijnit/articleapi/build/model/article-list-object-extended.bo';
-import { CatalogScreenConfigurationService } from '../service/catalog-screen-configuration.service';
+import { FilterOrder } from '@colijnit/catalog/lib/interface/filter-order.interface';
 import * as i0 from "@angular/core";
 export declare class ProductCatalogComponent implements OnInit, OnDestroy {
     settingsService: HomedecoratorSettingsService;
@@ -33,7 +33,9 @@ export declare class ProductCatalogComponent implements OnInit, OnDestroy {
     private _adapterService;
     private _buildFurnitureService;
     private _thirdPartyModelService;
-    private _screenConfigService;
+    generalFilterOrders: FilterOrder[];
+    purchaseFilterOrders: FilterOrder[];
+    logisticsFilterOrders: FilterOrder[];
     get shown(): boolean;
     loaded: boolean;
     settings: HomedecoratorSettings;
@@ -49,7 +51,7 @@ export declare class ProductCatalogComponent implements OnInit, OnDestroy {
     private _showCatalog;
     private _subs;
     private _source;
-    constructor(settingsService: HomedecoratorSettingsService, _messageBus: MessageBusService, _ioneController: HomedecoratorConnectorService, _screenSizeService: ScreenSizeAnalysisService, _sceneService: SceneService, _floorPlanService: FloorplanService, _injector: Injector, _catalogService: CatalogService, _dynamicScriptService: DynamicScriptService, _adapterService: HomedecoratorConnectorAdapterService, _buildFurnitureService: BuildFurnitureService, _thirdPartyModelService: ThirdPartyModelService, _screenConfigService: CatalogScreenConfigurationService);
+    constructor(settingsService: HomedecoratorSettingsService, _messageBus: MessageBusService, _ioneController: HomedecoratorConnectorService, _screenSizeService: ScreenSizeAnalysisService, _sceneService: SceneService, _floorPlanService: FloorplanService, _injector: Injector, _catalogService: CatalogService, _dynamicScriptService: DynamicScriptService, _adapterService: HomedecoratorConnectorAdapterService, _buildFurnitureService: BuildFurnitureService, _thirdPartyModelService: ThirdPartyModelService);
     ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
     hideCatalog(): void;
@@ -67,5 +69,5 @@ export declare class ProductCatalogComponent implements OnInit, OnDestroy {
     private _buildExternalCatalogRequest;
     private _handleShowProductCatalogMessageReceived;
     static ɵfac: i0.ɵɵFactoryDeclaration<ProductCatalogComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<ProductCatalogComponent, "rp-product-catalog", never, {}, {}, never, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ProductCatalogComponent, "rp-product-catalog", never, { "generalFilterOrders": "generalFilterOrders"; "purchaseFilterOrders": "purchaseFilterOrders"; "logisticsFilterOrders": "logisticsFilterOrders"; }, {}, never, never>;
 }

package/app/plugins/render/render-controls/render-controls.component.scss

@@ -1,6 +1,6 @@
 $border-radius: 20px;
 $border-width: 10px;
-$border-color:  #dda73f;
+$border-color: #dda73f;
 
 
 .render-container {
@@ -47,10 +47,12 @@ $border-color:  #dda73f;
         height: 40px;
         align-items: center;
         justify-content: space-evenly;
+
         ::ng-deep co-icon {
           display: inline-block;
           height: 18px;
           width: 18px;
+
           svg {
             path {
               fill: #fff;
@@ -63,6 +65,7 @@ $border-color:  #dda73f;
         color: #fff;
         background-color: #dda73f;
       }
+
       .cancel-button {
         color: #fff;
         background-color: #5b6875;
@@ -75,6 +78,7 @@ $border-color:  #dda73f;
       min-width: 275px;
       margin: 5px 0;
       position: relative;
+
       .render-popup-preview-placeholder {
         background-color: #fff;
         display: flex;
@@ -86,6 +90,7 @@ $border-color:  #dda73f;
         color: #ddd;
         font-size: 14px;
       }
+
       .render-popup-refresh-preview {
         position: absolute;
         bottom: 0;
@@ -97,6 +102,7 @@ $border-color:  #dda73f;
         width: 30px;
         background-color: #dda73f;
         color: #fff;
+
         ::ng-deep co-icon {
           svg {
             path {
@@ -165,6 +171,7 @@ $border-color:  #dda73f;
     position: relative;
     z-index: 2;
     margin-bottom: 10px;
+
     &.active {
       background: #74B77F;
       color: #fff;
@@ -234,3 +241,80 @@ $border-color:  #dda73f;
     border-bottom-right-radius: $border-radius;
   }
 }
+
+
+.render-warning {
+  width: 500px;
+  position: fixed;
+  top: 20%;
+  left: calc(50% - 250px);
+  border-radius: 15px;
+  box-sizing: border-box;
+  background-color: #fff;
+  box-shadow: 1px 0 20px rgba(0, 0, 0, 0.12);
+
+  .render-warming-header {
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #c5c3c6;
+    padding: 20px 20px 10px;
+    align-items: center;
+
+    h2 {
+      padding: 0;
+      margin: 0;
+    }
+
+    .render-warning-close {
+      mat-icon {
+        fill: #c5c3c6;
+        color: #c5c3c6;
+        cursor: pointer;
+        transition: all 0.2s ease;
+      }
+
+      &:hover {
+        mat-icon {
+          fill: #46494c;
+          color: #46494c;
+        }
+      }
+    }
+  }
+
+  .render-warning-body {
+    padding: 10px 20px;
+  }
+
+  .render-warning-footer {
+    display: flex;
+    justify-content: center;
+    padding: 0 20px 10px;
+
+    .render-popup-button {
+      float: none;
+      width: 110px;
+      border-radius: 3px;
+      cursor: pointer;
+      border: none;
+      display: flex;
+      height: 40px;
+      align-items: center;
+      justify-content: space-evenly;
+      color: #fff;
+      background-color: #5b6875;
+
+      ::ng-deep co-icon {
+        display: inline-block;
+        height: 18px;
+        width: 18px;
+
+        svg {
+          path {
+            fill: #fff;
+          }
+        }
+      }
+    }
+  }
+}

package/app/plugins/room-planner/components/floorplanner/floorplanner.component.d.ts

@@ -70,6 +70,7 @@ export declare class FloorplannerComponent implements AfterViewInit, OnDestroy {
     private _diagramBackgroundHeight;
     private _diagramBackgroundWidth;
     private _diagramBackgroundActiveZoom;
+    private _diagramBackgroundAlpha;
     private _diagramScale;
     private _cameraZoom;
     private _lastTouchPoint;

package/app/plugins/room-planner/components/floorplanner/service/floorplan.service.d.ts

@@ -11,6 +11,9 @@ export declare class FloorplanService {
     roomsUpdated: Subject<void>;
     roomLoaded: Subject<void>;
     redraw: Subject<void>;
+    get defaultFloorPlanTolerance(): number;
+    get defaultCornerSnapTolerance(): number;
+    get defaultWallSnapTolerance(): number;
     /** */
     private _corners;
     /** */

package/app/plugins/room-planner/room-planner/room-planner.component.d.ts

@@ -131,6 +131,7 @@ export declare class RoomPlannerComponent implements OnInit, OnDestroy, PluginIn
     showConversionButton: boolean;
     addSelectedClass: boolean;
     salableObject: boolean;
+    threedIconAvailable: boolean;
     private _subs;
     private _activeCategorySidebarTemplate;
     private _mode;
@@ -231,6 +232,7 @@ export declare class RoomPlannerComponent implements OnInit, OnDestroy, PluginIn
     private _reattachToItemGroup;
     private handleKeyDown;
     private _textInputActive;
+    private _setThreedAvailable;
     static ɵfac: i0.ɵɵFactoryDeclaration<RoomPlannerComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<RoomPlannerComponent, "rp-room-planner", never, { "isLoading": "isLoading"; }, { "done": "done"; "showPlugin": "showPlugin"; "focusControls": "focusControls"; }, never, never>;
 }

package/app/plugins/threedselector/threedselector/service/third-party-model.service.d.ts

@@ -27,6 +27,7 @@ import { ResizeService } from './resize.service';
 import { ViewModeService } from '../../../../core/service/view-mode.service';
 import { Metadata } from '../../../core3d/items/metadata';
 import { CustomFloorGroupResult } from '../../../core3d/model/custom-floor-group-result';
+import { BuildFurnitureService } from './build-furniture.service';
 import * as i0 from "@angular/core";
 export declare class ThirdPartyModelService implements OnDestroy {
     private _dialog;
@@ -54,7 +55,8 @@ export declare class ThirdPartyModelService implements OnDestroy {
     private _variationCacheService;
     private _resizeService;
     private _viewModeService;
-    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);
+    private _buildFurniture;
+    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, _buildFurniture: BuildFurnitureService);
     ngOnDestroy(): void;
     downloadModel(urlToFetch: string): Promise<Response>;
     createThirdParty3dModel(result: Object3D, hash: string, metaData: Metadata): CustomFloorGroupResult;

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

@@ -17,6 +17,7 @@ button {
   &:hover {
     background: #da9803;
     color: #fff;
+
   }
 }
 
@@ -31,6 +32,25 @@ button {
   }
 }
 
+.model-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: start;
+  .close-button{
+    background: none;
+    color: #333;
+    border: none;
+    padding: 0;
+  }
+}
+
+.modal-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: end;
+  margin-top: 30px;
+}
+
 .reference-input-container {
   .input-button-container {
     display: flex;