@colijnit/homedecorator 258.1.4 → 259.1.0

package/app/core/model/texture.d.ts

@@ -2,6 +2,7 @@ import * as THREE from 'three';
 import { Vector2 } from 'three';
 import { TextureInterface } from '../interface/texture.interface';
 import { TextureType } from './texture-type';
+import { Metadata } from '../../plugins/core3d/items/metadata';
 export declare class Texture {
     name: string;
     type: TextureType;
@@ -38,6 +39,7 @@ export declare class Texture {
     defaultStandalone: boolean;
     mirror: boolean;
     simplePlane: boolean;
+    metadata?: Metadata;
     static CreateModelFromInterface(modelInterface: TextureInterface): Texture;
 }
 export declare function sameTextures(a: Texture, b: Texture): boolean;

package/app/core/service/homedecorator-app-event.service.d.ts

@@ -3,6 +3,7 @@ import { Selection } from '@colijnit/configuratorapi/build/model/selection';
 import { Answer } from '@colijnit/configuratorapi/build/model/answer';
 import { ArticleExtended } from '@colijnit/articleapi/build/model/article-extended.bo';
 import { ExternalSourceArticleAddInterface } from '@colijnit/articleapi/build/interface/external-source-article-add.interface';
+import { FloorPlaneItem } from '../../plugins/core3d/items/floor-plane-item';
 import * as i0 from "@angular/core";
 export declare class HomedecoratorAppEventService {
     instanceSet: BehaviorSubject<string>;
@@ -22,6 +23,7 @@ export declare class HomedecoratorAppEventService {
     addExternalSourceToCart: Subject<ExternalSourceArticleAddInterface>;
     glbCreated: Subject<string>;
     dirty: Subject<boolean>;
+    floorCreated: BehaviorSubject<FloorPlaneItem>;
     static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorAppEventService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<HomedecoratorAppEventService>;
 }

package/app/core/service/homedecorator-app.service.d.ts

@@ -1,5 +1,5 @@
 import { OnDestroy } from '@angular/core';
-import { BehaviorSubject, Subject } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 import { ThreedModel } from '../../plugins/core3d/model/threed-model';
 import { Category } from '../model/category';
 import { Preset } from '../model/preset';
@@ -25,7 +25,7 @@ export declare class HomedecoratorAppService implements OnDestroy {
     floorplans: Preset[];
     floorTextures: Texture[];
     wallTextures: Texture[];
-    skuSet: Subject<string>;
+    skuSet: BehaviorSubject<string>;
     modelsLoaded: BehaviorSubject<ThreedModel[]>;
     categoriesLoaded: BehaviorSubject<Category[]>;
     presetsLoaded: BehaviorSubject<Preset[]>;

package/app/core/service/item-serialization.service.d.ts

@@ -5,6 +5,7 @@ import * as i0 from "@angular/core";
 export declare class ItemSerializationService {
     constructor();
     itemToObject(item: Item): {};
+    floorItemToObject(item: Item): {};
     furnitureToObject(furniture: Furniture): {
         item_name: any;
         item_description: any;

package/app/core/utils/variation-utils.d.ts

@@ -2,7 +2,9 @@ import { VariationSettings } from '../../plugins/threedselector/threedselector/m
 export declare class VariationUtils {
     private static MaterialCache;
     static LoadVariation(assetPath: string, url: string, fileName: string, includeVariationFolder?: boolean): Promise<VariationSettings>;
+    static LoadVariationByUrl(id: string, variationUrl: string): Promise<VariationSettings>;
     static GetUrl(assetPath: string, url: string, fileName: string, includeVariationFolder?: boolean): string;
+    static GetFloorAssetUrl(assetPath: string, url: string, fileName: string, articleNumber: string): string;
     static GetVariationSettingsFromFile(id: string, compressedFile: any): Promise<VariationSettings>;
     private static CreateSettingsBasedOnIndex;
     private static CreateSettingsBasedOnFileName;

package/app/plugins/core3d/items/metadata.d.ts

@@ -52,6 +52,7 @@ export interface Metadata {
     schema?: string;
     assetPath?: string;
     texture?: Texture;
+    textureAssetName?: string;
     skin?: Skin;
     frameColor?: number;
     doorColor?: number;

package/app/plugins/core3d/service/floor.service.d.ts

@@ -6,17 +6,20 @@ import { Texture } from '../../../core/model/texture';
 import { OutlineService } from './outline.service';
 import { ItemService } from './item.service';
 import { FloorPlaneItem } from '../items/floor-plane-item';
-import { HomedecoratorSettingsService } from '../../../core/service/homedecorator-settings.service';
 import { MessageBusService } from '../../../core/service/message-bus.service';
 import { Article } from '@colijnit/configuratorapi/build/model/article';
 import { CustomFloorGroupResult } from '../model/custom-floor-group-result';
+import { Metadata } from '../items/metadata';
+import { VariationService } from '../../threedselector/threedselector/service/variation.service';
+import { HomedecoratorAppEventService } from '../../../core/service/homedecorator-app-event.service';
 import * as i0 from "@angular/core";
 export declare class FloorService implements OnDestroy {
     private _sceneService;
     private _outlineService;
     private _itemService;
-    private _settingsService;
     private _messageService;
+    private _variationService;
+    private _eventService;
     private _groundPlane;
     private _floorPlane;
     private _selectedFloorArticle;
@@ -53,7 +56,7 @@ export declare class FloorService implements OnDestroy {
     get floorResultObject(): CustomFloorGroupResult;
     set floorResultObject(result: CustomFloorGroupResult);
     floorToConfigure: FloorPlaneItem;
-    constructor(_sceneService: SceneService, _outlineService: OutlineService, _itemService: ItemService, _settingsService: HomedecoratorSettingsService, _messageService: MessageBusService);
+    constructor(_sceneService: SceneService, _outlineService: OutlineService, _itemService: ItemService, _messageService: MessageBusService, _variationService: VariationService, _eventService: HomedecoratorAppEventService);
     ngOnDestroy(): void;
     toggleFloorFrame(visible: boolean): void;
     checkForConfigurableFloor(): boolean;
@@ -62,9 +65,10 @@ export declare class FloorService implements OnDestroy {
     setFloorColor(room: Room, color: number): Promise<void>;
     highLightFloor(floorObject: FloorPlaneItem): void;
     unHighLightFloors(): void;
+    applyMaterialToFloorPlaneItem(floorPlaneItem: FloorPlaneItem, material: any): void;
     configureFloor(floorObject: FloorPlaneItem): void;
     removeFloors(): void;
-    generateFloorPlane(color: Color | string | number, texture?: Texture, corners?: Corner[], nestedRooms?: any, floorGeometry?: BufferGeometry): Promise<FloorPlaneItem>;
+    generateFloorPlane(color: Color | string | number, texture?: Texture, metadata?: Metadata, corners?: Corner[], nestedRooms?: any, floorGeometry?: BufferGeometry): Promise<FloorPlaneItem>;
     getFloorY(): number;
     removeFloor(floor: FloorPlaneItem, forceRender?: boolean): void;
     private _addFloor;
@@ -72,6 +76,7 @@ export declare class FloorService implements OnDestroy {
     private _createGroundPlane;
     private _createFloorMaterial;
     private _getFloorCenter;
+    private _convertFloorMetadata;
     static ɵfac: i0.ɵɵFactoryDeclaration<FloorService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<FloorService>;
 }

package/app/plugins/core3d/service/item.service.d.ts

@@ -24,6 +24,7 @@ export declare class ItemService implements OnDestroy {
     getWallItems(): Item[];
     getFurniture(): Furniture[];
     getNonFurniture(): Item[];
+    getFloorDecorationItems(): Item[];
     getConfigurables(): Item[];
     getIOneFurniture(): Item[];
     getCameraItem(): Item;

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

@@ -3,10 +3,10 @@ import { HomedecoratorIconCacheService } from '../../../../core/service/homedeco
 import { IconEnum } from '../../../../core/enum/icon.enum';
 import { MessageBusService } from '../../../../core/service/message-bus.service';
 import { FloorService } from '../../../core3d/service/floor.service';
-import { Article } from '@colijnit/configuratorapi/build/model/article';
 import { Texture } from '../../../../core/model/texture';
 import { BuildFurnitureService } from '../../../threedselector/threedselector/service/build-furniture.service';
 import { SafeResourceUrl } from '@angular/platform-browser';
+import { Metadata } from '../../../core3d/items/metadata';
 import * as i0 from "@angular/core";
 export declare class FloorCatalogComponent implements OnInit, OnDestroy {
     iconService: HomedecoratorIconCacheService;
@@ -16,13 +16,15 @@ export declare class FloorCatalogComponent implements OnInit, OnDestroy {
     readonly icon: typeof IconEnum;
     type: 'floor';
     currentTexture: Texture;
+    texturePlane: any;
+    plainTexture: any;
     scaleManualInput: ElementRef;
     scaleSliderInput: ElementRef;
     directionInput: ElementRef;
     centerlineZAxisInput: ElementRef;
     centerlineXAxisInput: ElementRef;
     floorSet: boolean;
-    floorData: Article;
+    floorData: Metadata;
     floorArticleImage: SafeResourceUrl;
     currentScale: number;
     currentFloorRotation: number;
@@ -64,5 +66,5 @@ export declare class FloorCatalogComponent implements OnInit, OnDestroy {
     reToggleFloorFrame(): void;
     getFloorInformation(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<FloorCatalogComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<FloorCatalogComponent, "rp-floor-catalog", never, { "type": "type"; "currentTexture": "currentTexture"; }, {}, never, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<FloorCatalogComponent, "rp-floor-catalog", never, { "type": "type"; "currentTexture": "currentTexture"; "texturePlane": "texturePlane"; "plainTexture": "plainTexture"; }, {}, never, never>;
 }

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

@@ -68,7 +68,7 @@ export declare class FloorplanService {
     overlappedWall(x: number, y: number, tolerance?: number): Wall;
     overlappedItem(x: number, y: number, tolerance?: number): Item;
     overlappedFloor(x: number, y: number): Room;
-    saveFloorplan(): {
+    saveFloorplan(floorTypeArticles: any): {
         corners: {};
         walls: any[];
         wallTextures: any[];

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

@@ -40,11 +40,15 @@ import { CustomButton } from '../../../core/model/custom-button';
 import { HomedecoratorAppEventService } from '../../../core/service/homedecorator-app-event.service';
 import { HomedecoratorConnectorService } from '../../../core/service/homedecorator-connector.service';
 import { HomedecoratorConnectorAdapterService } from '../../../core/service/homedecorator-connector-adapter.service';
+import { LoadFurnitureService } from '../../threedselector/threedselector/service/load-furniture.service';
+import { FloorService } from '../../core3d/service/floor.service';
 import * as i0 from "@angular/core";
 export declare class RoomPlannerComponent implements OnInit, OnDestroy, PluginInterface {
     iconService: HomedecoratorIconCacheService;
     viewModeService: ViewModeService;
     modelsService: ModelsService;
+    itemService: ItemService;
+    settingsService: HomedecoratorSettingsService;
     private _presetsService;
     private _appService;
     private _screenAnalysis;
@@ -62,13 +66,13 @@ export declare class RoomPlannerComponent implements OnInit, OnDestroy, PluginIn
     private _itemSerializationService;
     private _lightsService;
     private _arService;
-    itemService: ItemService;
-    settingsService: HomedecoratorSettingsService;
     private _googleTagManager;
     private _permanentStoreService;
     private _appEventService;
     private _connectorService;
     private _connectorAdapterService;
+    private _loadFurnitureService;
+    private _floorService;
     floorplanner: FloorplannerComponent;
     toolbarIconLibrary: TemplateRef<any>;
     toolbarIconAccessoires: TemplateRef<any>;
@@ -134,12 +138,13 @@ export declare class RoomPlannerComponent implements OnInit, OnDestroy, PluginIn
     salableObject: boolean;
     threedIconAvailable: boolean;
     diagramToggleAvailable: boolean;
+    configureButton: CustomButton;
     private _subs;
     private _activeCategorySidebarTemplate;
     private _mode;
     private _catalogIsShown;
     private _blockLeftSideBar;
-    constructor(iconService: HomedecoratorIconCacheService, viewModeService: ViewModeService, modelsService: ModelsService, _presetsService: PresetsService, _appService: HomedecoratorAppService, _screenAnalysis: ScreenSizeAnalysisService, _cd: ChangeDetectorRef, _utilsService: UtilsService, _messageService: MessageBusService, _dialog: MatDialog, _configurationService: ConfigurationService, _floorplanService: FloorplanService, _sceneService: SceneService, _hudService: HudService, _roomService: RoomService, _cameraService: CameraService, _itemService: ItemService, _itemSerializationService: ItemSerializationService, _lightsService: LightsService, _arService: ArService, itemService: ItemService, settingsService: HomedecoratorSettingsService, _googleTagManager: GoogleTagManagerService, _permanentStoreService: PermanentStoreService, _appEventService: HomedecoratorAppEventService, _connectorService: HomedecoratorConnectorService, _connectorAdapterService: HomedecoratorConnectorAdapterService);
+    constructor(iconService: HomedecoratorIconCacheService, viewModeService: ViewModeService, modelsService: ModelsService, itemService: ItemService, settingsService: HomedecoratorSettingsService, _presetsService: PresetsService, _appService: HomedecoratorAppService, _screenAnalysis: ScreenSizeAnalysisService, _cd: ChangeDetectorRef, _utilsService: UtilsService, _messageService: MessageBusService, _dialog: MatDialog, _configurationService: ConfigurationService, _floorplanService: FloorplanService, _sceneService: SceneService, _hudService: HudService, _roomService: RoomService, _cameraService: CameraService, _itemService: ItemService, _itemSerializationService: ItemSerializationService, _lightsService: LightsService, _arService: ArService, _googleTagManager: GoogleTagManagerService, _permanentStoreService: PermanentStoreService, _appEventService: HomedecoratorAppEventService, _connectorService: HomedecoratorConnectorService, _connectorAdapterService: HomedecoratorConnectorAdapterService, _loadFurnitureService: LoadFurnitureService, _floorService: FloorService);
     handleDocKeyDown(event: KeyboardEvent): void;
     get selectedEdges(): any[];
     ngOnInit(): Promise<void>;
@@ -148,7 +153,7 @@ export declare class RoomPlannerComponent implements OnInit, OnDestroy, PluginIn
     private _viewModeChanged;
     objectSelected(object: Item | ItemGroup): void;
     showSelectedObjectSidebar(): void;
-    handleConfigurationButtonClick(btn: CustomButton): void;
+    handleConfigurationButtonClick(event: MouseEvent): void;
     objectUnselected(): void;
     updateSelectedObjectHud(): void;
     handleDeleteObject(): void;

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

@@ -119,6 +119,8 @@ export declare class BuildFurnitureService implements OnDestroy {
     downloadThumbnail(): string;
     downloadScene(): void;
     createSimple3DModel(result: CustomFloorGroupResult, standAlone?: boolean): CustomFloorGroupResult;
+    createNonConfigurableFloor(result: CustomFloorGroupResult): Promise<CustomFloorGroupResult>;
+    private _handleCreateFloor;
     private _buildFloor;
     private _generateLayingPattern;
     private _instancedMeshFromFloorPatternTransform;
@@ -158,6 +160,7 @@ export declare class BuildFurnitureService implements OnDestroy {
     private _createConfigurableItem;
     private _createPositionAnimation;
     private _animateChanges;
+    private _cloneSelections;
     private _replaceCurrentItem;
     mouseOver: () => void;
     mouseOff: () => void;

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

@@ -3,7 +3,6 @@ import { BehaviorSubject } from 'rxjs';
 import { Object3D } from 'three';
 import { Article } from '@colijnit/configuratorapi/build/model/article';
 import { CustomFloorGroupResult } from '../../../core3d/model/custom-floor-group-result';
-import { CustomButton } from '../../../../core/model/custom-button';
 import { Metadata } from '../../../core3d/items/metadata';
 import { HomedecoratorConnectorService } from '../../../../core/service/homedecorator-connector.service';
 import { ModelsService } from '../../../core3d/service/models.service';
@@ -34,7 +33,6 @@ export declare class LoadFurnitureService implements OnDestroy {
     objectListFixed: CustomFloorGroupResult[];
     simpleObjectList: CustomFloorGroupResult[];
     externalSourceNotAvailable: CustomFloorGroupResult[];
-    configureButton: CustomButton;
     shouldLoadSelections: boolean;
     metadataSet: BehaviorSubject<Metadata>;
     set article(value: Article);

package/app/plugins/threedselector/threedselector/service/variation.service.d.ts

@@ -6,13 +6,15 @@ import * as i0 from "@angular/core";
 export declare class VariationService {
     private _threedSelectorService;
     private _itemService;
+    loadedAsset: string;
     private _lastKnownVariations;
     constructor(_threedSelectorService: ThreedselectorService, _itemService: ItemService);
     clearCache(): void;
     loadPart(assetPath: string, parts: any[], instanceId: string, obj: Item, usePbr?: boolean): Promise<void>;
     loadVariation(assetPath: string, parts: any[], instanceId: string, obj: Item, usePbr?: boolean): Promise<void>;
     loadVariationFromLocalFile(id: string, file: any, obj: Object3D): Promise<void>;
-    loadVariationForMaterial(assetPath: string, gameObject: string, schema: string): Promise<void>;
+    loadVariationForMaterial(assetPath: string, gameObject: string, schema: string): Promise<any>;
+    loadVariationByAssetUrl(assetUrl: string): Promise<any>;
     private _applyMaterialPart;
     private _applyVariations;
     private _applyMaterial;

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

@@ -132,8 +132,9 @@ export declare class ThreedselectorComponent implements OnInit, OnDestroy {
     ngOnInit(): void;
     ngOnDestroy(): void;
     copySceneInstance(saveAs: boolean): Promise<void>;
-    loadObjects({ furniture }: {
+    loadObjects({ furniture, floorplan }: {
         furniture: any;
+        floorplan: any;
     }): Promise<any>;
     getObjects(): any;
     objectSelected(object: Item | ItemGroup): void;

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

@@ -78,6 +78,7 @@ export declare class ToolbarComponent implements OnInit, OnDestroy, AfterViewIni
     animateModel(element: Item): void;
     openSaveDialog(): Promise<void>;
     openOpenDialog(): void;
+    goToSearch(): void;
     loadRoom(): Promise<void>;
     loadResizableRoom(): Promise<void>;
     downloadRoom(): void;

package/app/plugins/toolbar/toolbar/toolbar.component.scss

@@ -141,24 +141,20 @@
     justify-content: center;
     margin-left: -16px;
   }
-  .left-toolbar {
+  .left-toolbar,
+  .right-toolbar {
     display: flex;
     align-items: center;
     background: #da9803;
     border-radius: 0 0 10px 0;
-    padding: 0 20px;
+    padding: 0 20px 0 10px;
     box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
     height: 40px;
     gap: 12px;
   }
   .right-toolbar {
-    display: flex;
-    align-items: center;
-    background: #da9803;
     border-radius: 0 0 0 10px;
     padding: 0 5px 0 10px;
-    box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
-    height: 40px;
   }
   .toolbar-icon-list {
     display: flex;
@@ -190,16 +186,19 @@
     co-icon ::ng-deep {
       width: 20px;
       height: 20px;
-      svg {
+      svg,
+      path {
         fill: #FFF;
       }
     }
+    &.search co-icon {
+      height: 30px;
+      width: 30px;
+    }
     &.disabled {
       cursor: default;
-      co-icon ::ng-deep {
-        svg {
-          fill: rgba(0, 0, 0, 0.26);
-        }
+      co-icon ::ng-deep svg {
+        fill: rgba(0, 0, 0, 0.26);
       }
     }
   }