@colijnit/homedecorator 256.1.12 → 256.1.14

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

@@ -72,5 +72,7 @@ export declare enum MessageType {
     ShowFloorArticleCatalog = "ShowFloorArticleCatalog",
     BlenderRenderPreviewReady = "BlenderRenderPreviewReady",
     FloorRebuild = "FloorRebuild",
-    FloorPlaneAvailable = "FloorPlaneAvailable"
+    FloorPlaneAvailable = "FloorPlaneAvailable",
+    RemoveAllItems = "RemoveAllItems",
+    RemoveItem = "RemoveItem"
 }

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

@@ -86,4 +86,5 @@ export interface MessagesWithPayload {
     };
     [MessageType.ShowFloorArticleCatalog]: any;
     [MessageType.BlenderRenderPreviewReady]: any;
+    [MessageType.RemoveItem]: Item;
 }

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

@@ -35,4 +35,5 @@ export interface MessagesWithoutPayload {
     [MessageType.FloorRebuild]: any;
     [MessageType.FloorPlaneAvailable]: any;
     [MessageType.ToggleDiagram]: any;
+    [MessageType.RemoveAllItems]: any;
 }

package/app/core/model/light-preset.d.ts

@@ -16,6 +16,7 @@ export declare class LightPreset {
     group: string;
     shadowMapType: ShadowMapLocalType;
     outputEncoding: OutputEncoding;
+    colorSpace: ColorSpace;
     shadowRadius: number;
     toneMappingExposure: number;
     physicallyCorrectLights: boolean;

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

@@ -27,6 +27,8 @@ import { HomedecoratorAppEventService } from './homedecorator-app-event.service'
 import { CoDomainValue } from '@colijnit/mainapi/build/model/co-domain-value.bo';
 import { ObjectConfiguration } from '@colijnit/ioneconnector/build/model/object-configuration';
 import { ArticleExtended } from '@colijnit/articleapi/build/model/article-extended.bo';
+import { Metadata } from '../../plugins/core3d/items/metadata';
+import { HomedecoratorSettings } from '../model/homedecorator-settings';
 import * as i0 from "@angular/core";
 export declare class ExternalConnector {
     loginResponse: LoginResponse;
@@ -58,6 +60,7 @@ export declare class HomedecoratorConnectorAdapterService {
     private _mainApi;
     private _boFactory;
     constructor(_appEventService: HomedecoratorAppEventService);
+    initConnectionFromMetadata(metadata: Metadata, settings: HomedecoratorSettings): Promise<void>;
     initConnector(options: Options, externalSource?: string, forceReload?: boolean, externalSourceId?: number): Promise<void>;
     logOut(): Promise<void>;
     getPublicationCodeBasedOnLogin(): number;

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

@@ -5,8 +5,10 @@ import * as i0 from "@angular/core";
 export declare class IntegrationService implements OnDestroy {
     private _messageBus;
     private _appEventService;
-    private _subs;
+    set enabled(value: boolean);
+    get enabled(): boolean;
     private _enabled;
+    private _subs;
     constructor(_messageBus: MessageBusService, _appEventService: HomedecoratorAppEventService);
     ngOnDestroy(): void;
     private _handleMessage;

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

@@ -6,6 +6,7 @@ export declare class FileUtils {
      * Deprecated
      */
     static FileExists(url: string, assetPath?: string): boolean;
+    static DoesFileExist(url: string): Promise<boolean>;
     static CheckModelConversion(url: string, assetPath: string): any;
     static SaveTextureImage(metaData: any, fileName: string, assetPath: string): any;
     static SaveGLBFile(data: Blob, assetPath: string): Promise<any>;

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

@@ -2,6 +2,7 @@ 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 GetUrl(assetPath: string, url: string, fileName: string, includeVariationFolder?: boolean): string;
     static GetVariationSettingsFromFile(id: string, compressedFile: any): Promise<VariationSettings>;
     private static CreateSettingsBasedOnIndex;
     private static CreateSettingsBasedOnFileName;

package/app/homedecorator.component.d.ts

@@ -9,6 +9,7 @@ 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 { IntegrationService } from './core/service/integration.service';
 import * as i0 from "@angular/core";
 export declare class HomedecoratorComponent implements OnInit, OnDestroy {
     controllerService: HomedecoratorConnectorService;
@@ -21,11 +22,14 @@ export declare class HomedecoratorComponent implements OnInit, OnDestroy {
     private _messageService;
     private _homedecoratorService;
     private _eventService;
+    private _integrationService;
     set settings(value: any);
     get settings(): any;
     generalFilterOrders: FilterOrder[];
     purchaseFilterOrders: FilterOrder[];
     logisticsFilterOrders: FilterOrder[];
+    set initCommunication(value: boolean);
+    get initCommunication(): boolean;
     showClass: boolean;
     loaded: boolean;
     title: string;
@@ -35,7 +39,8 @@ export declare class HomedecoratorComponent implements OnInit, OnDestroy {
     shouldShowLandscapeMessage: boolean;
     private _subs;
     private _settings;
-    constructor(controllerService: HomedecoratorConnectorService, appState: AppStateService, presetsService: PresetsService, screenAnalysis: ScreenSizeAnalysisService, _componentFactoryResolver: ComponentFactoryResolver, _iconRegistry: MatIconRegistry, _domSanitizer: DomSanitizer, _messageService: MessageBusService, _homedecoratorService: HomedecoratorService, _eventService: HomedecoratorAppEventService);
+    private _initCommunication;
+    constructor(controllerService: HomedecoratorConnectorService, appState: AppStateService, presetsService: PresetsService, screenAnalysis: ScreenSizeAnalysisService, _componentFactoryResolver: ComponentFactoryResolver, _iconRegistry: MatIconRegistry, _domSanitizer: DomSanitizer, _messageService: MessageBusService, _homedecoratorService: HomedecoratorService, _eventService: HomedecoratorAppEventService, _integrationService: IntegrationService);
     ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
     registerCustomIcons(): void;
@@ -43,6 +48,7 @@ export declare class HomedecoratorComponent implements OnInit, OnDestroy {
     private _setSettings;
     private _startWithEmptyRoom;
     private _startWithPreset;
+    private _setCommunication;
     static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<HomedecoratorComponent, "co-homedecorator", never, { "settings": "settings"; "generalFilterOrders": "generalFilterOrders"; "purchaseFilterOrders": "purchaseFilterOrders"; "logisticsFilterOrders": "logisticsFilterOrders"; }, {}, never, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<HomedecoratorComponent, "co-homedecorator", never, { "settings": "settings"; "generalFilterOrders": "generalFilterOrders"; "purchaseFilterOrders": "purchaseFilterOrders"; "logisticsFilterOrders": "logisticsFilterOrders"; "initCommunication": "initCommunication"; }, {}, never, never>;
 }

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

@@ -15,6 +15,7 @@ export declare class ItemService implements OnDestroy {
     copyItem: Subject<Item>;
     deleteItem: Subject<Item>;
     removeAllItems: Subject<void>;
+    private _subs;
     constructor(_sceneService: SceneService, _messageService: MessageBusService);
     ngOnDestroy(): void;
     addItem(obj: any, addToScene?: boolean): void;

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

@@ -31,6 +31,7 @@ export declare class SceneService implements OnDestroy {
     scene: Scene;
     renderer: WebGLRenderer;
     pathTracer: WebGLPathTracer;
+    standAlone: boolean;
     onBeforeRender: Subject<{
         renderer: WebGLRenderer;
         scene: Scene;

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

@@ -109,7 +109,7 @@ export declare class BuildFurnitureService implements OnDestroy {
     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;
     build(result: CustomFloorGroupResult): Promise<CustomFloorGroupResult>;
-    startToBuild(result?: CustomFloorGroupResult, metadata?: Metadata, shouldCopyInstance?: boolean, looseOriginalConfiguration?: boolean, standAlone?: boolean, firstBuild?: boolean, fromPreset?: boolean): Promise<CustomFloorGroupResult>;
+    startToBuild(result?: CustomFloorGroupResult, metadata?: Metadata, shouldCopyInstance?: boolean, looseOriginalConfiguration?: boolean, standAlone?: boolean, firstBuild?: boolean, fromPreset?: boolean, loadFromProject?: boolean): Promise<CustomFloorGroupResult>;
     getOptionsFromSelection(baseSelection: Selection): Selection[];
     downloadCurrentCustomFloorgroup(): void;
     downloadUDSZforARIOS(): void;

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

@@ -10,14 +10,9 @@ import { ModelsService } from '../../../core3d/service/models.service';
 import { MessageBusService } from '../../../../core/service/message-bus.service';
 import { BuildFurnitureService } from './build-furniture.service';
 import { PresetsService } from '../../../../core/service/presets.service';
-import { HomedecoratorDictionaryService } from '../../../../core/service/homedecorator-dictionary.service';
 import { HomedecoratorSettingsService } from '../../../../core/service/homedecorator-settings.service';
-import { DialogService } from '../../../../shared/dialog/service/dialog.service';
-import { ErrorService } from '../../../../core/service/error.service';
-import { ProgressService } from '../../../../core/service/progress.service';
-import { ItemService } from '../../../core3d/service/item.service';
 import { ThreedselectorService } from './threedselector.service';
-import { ToastService } from '../../../../core/service/toast.service';
+import { HomedecoratorConnectorAdapterService } from '../../../../core/service/homedecorator-connector-adapter.service';
 import * as i0 from "@angular/core";
 export interface FurnitureInitialized {
     initialized: boolean;
@@ -25,18 +20,13 @@ export interface FurnitureInitialized {
 }
 export declare class LoadFurnitureService implements OnDestroy {
     private _iOne;
+    private _connectorAdapterService;
     private _modelService;
     private _threedSelectorService;
     private _messageBus;
     private _buildFurnitureService;
     private _presetService;
-    private _dictionaryService;
     private _settingsService;
-    private _dialogService;
-    private _errorService;
-    private _progressService;
-    private _itemService;
-    private _toastService;
     notLoaded: CustomFloorGroupResult[];
     notFixedObjectCache: CustomFloorGroupResult[];
     obsoleteObjectCache: CustomFloorGroupResult[];
@@ -55,10 +45,10 @@ export declare class LoadFurnitureService implements OnDestroy {
     private _subs;
     private _shouldCopyFurniture;
     private _configurationDirty;
-    constructor(_iOne: HomedecoratorConnectorService, _modelService: ModelsService, _threedSelectorService: ThreedselectorService, _messageBus: MessageBusService, _buildFurnitureService: BuildFurnitureService, _presetService: PresetsService, _dictionaryService: HomedecoratorDictionaryService, _settingsService: HomedecoratorSettingsService, _dialogService: DialogService, _errorService: ErrorService, _progressService: ProgressService, _itemService: ItemService, _toastService: ToastService);
+    constructor(_iOne: HomedecoratorConnectorService, _connectorAdapterService: HomedecoratorConnectorAdapterService, _modelService: ModelsService, _threedSelectorService: ThreedselectorService, _messageBus: MessageBusService, _buildFurnitureService: BuildFurnitureService, _presetService: PresetsService, _settingsService: HomedecoratorSettingsService);
     ngOnDestroy(): void;
     loadArticle(sku: string): Promise<Article>;
-    loadFurniture(furnitureData: Metadata, shouldCopyInstance?: boolean, looseOriginalConfiguration?: boolean, standAlone?: boolean, fromScratch?: boolean, fromPreset?: boolean): Promise<CustomFloorGroupResult>;
+    loadFurniture(furnitureData: Metadata, shouldCopyInstance?: boolean, looseOriginalConfiguration?: boolean, standAlone?: boolean, fromScratch?: boolean, fromPreset?: boolean, loadFromProject?: boolean): Promise<CustomFloorGroupResult>;
     switchConfiguration(furniture: any): Promise<void>;
     configureFurniture: (furniture: any) => Promise<void>;
     deleteFromObjectList(id: string, useInstanceId?: boolean): void;
@@ -70,8 +60,9 @@ export declare class LoadFurnitureService implements OnDestroy {
     private _cleanUp;
     private _needs3DModel;
     private _initFull3DObject;
-    getFull3DObject(sku: string, assetPath: string, name?: string, assetUrl?: string, prepareProgress?: boolean): Promise<Object3D>;
-    private _checkModelURL;
+    private _getAssetPathFromMetadata;
+    private _getAssetPathFromModelUrlAndSchema;
+    getFull3DObject(sku: string, assetPath: string, name: string, assetUrl: string, prepareProgress?: boolean): Promise<Object3D>;
     static ɵfac: i0.ɵɵFactoryDeclaration<LoadFurnitureService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<LoadFurnitureService>;
 }

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

@@ -16,7 +16,7 @@ export declare class ThreedselectorService {
     private _presetService;
     constructor(_variationCacheService: VariationCacheService, _settingsService: HomedecoratorSettingsService, _ione: HomedecoratorConnectorService, _utilsService: UtilsService, _progressService: ProgressService, _presetService: PresetsService);
     downloadAssetsAndReturn(fileName: string, assetPath: string, prepareProgress?: boolean): Promise<THREE.Object3D>;
-    loadVariation(id: string, schema: string): Promise<VariationSettings>;
+    loadVariation(assetPath: string, id: string, schema: string): Promise<VariationSettings>;
     static ɵfac: i0.ɵɵFactoryDeclaration<ThreedselectorService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<ThreedselectorService>;
 }

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

@@ -9,10 +9,10 @@ export declare class VariationService {
     private _lastKnownVariations;
     constructor(_threedSelectorService: ThreedselectorService, _itemService: ItemService);
     clearCache(): void;
-    loadPart(parts: any[], instanceId: string, obj: Item, usePbr?: boolean): Promise<void>;
-    loadVariation(parts: any[], instanceId: string, obj: Item, usePbr?: boolean): Promise<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(gameObject: string, schema: string): Promise<void>;
+    loadVariationForMaterial(assetPath: string, gameObject: string, schema: string): Promise<void>;
     private _applyMaterialPart;
     private _applyVariations;
     private _applyMaterial;

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

@@ -45,6 +45,7 @@ import { RenderService } from '../../render/service/render.service';
 import { NewRenderService } from '../../render/service/new-render.service';
 import { HomedecoratorConnectorAdapterService } from '../../../core/service/homedecorator-connector-adapter.service';
 import { LightPresetsService } from '../../core3d/service/light-presets.service';
+import { ViewModeService } from '../../../core/service/view-mode.service';
 import * as i0 from "@angular/core";
 export declare class ThreedselectorComponent implements OnInit, OnDestroy {
     screenSizeService: ScreenSizeAnalysisService;
@@ -86,6 +87,7 @@ export declare class ThreedselectorComponent implements OnInit, OnDestroy {
     private _newRenderService;
     private _connectorAdapterService;
     private _lightPresetService;
+    private _viewModeService;
     readonly iconName: typeof IconName;
     toolbarIconModels: TemplateRef<any>;
     selectedThreedObjectCustomizationSidebar: TemplateRef<any>;
@@ -121,7 +123,7 @@ export declare class ThreedselectorComponent implements OnInit, OnDestroy {
     private _subs;
     private _loadingFromPreset;
     private _callBackFnWhenBuildFinished;
-    constructor(screenSizeService: ScreenSizeAnalysisService, _dialog: MatDialog, _appService: HomedecoratorAppService, _iOne: HomedecoratorConnectorService, _messageBus: MessageBusService, _loadFurnitureService: LoadFurnitureService, _buildFurnitureService: BuildFurnitureService, _integrationService: IntegrationService, _dictionaryService: HomedecoratorDictionaryService, _toastService: ToastService, _messageService: MessageBusService, _sceneService: SceneService, _dialogService: DialogService, _cameraService: CameraService, _presetsService: PresetsService, _itemService: ItemService, _settingsService: HomedecoratorSettingsService, _sceneOptionsService: SceneOptionsService, _dimensionsService: DimensionsService, _appEventService: HomedecoratorAppEventService, _floorplanService: FloorplanService, _floorService: FloorService, _iconCacheService: HomedecoratorIconCacheService, _arService: ArService, _googleTagManager: GoogleTagManagerService, _errorService: ErrorService, _rotationService: RotationService, _roomService: RoomService, _appStateService: AppStateService, _progressService: ProgressService, _animationService: AnimationService, _resizeService: ResizeService, _customizerService: CustomizerService, _dynamicCameraService: DynamicCameraService, _threedInPhotoInitializerService: ThreedInPhotoInitializerService, _renderService: RenderService, _newRenderService: NewRenderService, _connectorAdapterService: HomedecoratorConnectorAdapterService, _lightPresetService: LightPresetsService);
+    constructor(screenSizeService: ScreenSizeAnalysisService, _dialog: MatDialog, _appService: HomedecoratorAppService, _iOne: HomedecoratorConnectorService, _messageBus: MessageBusService, _loadFurnitureService: LoadFurnitureService, _buildFurnitureService: BuildFurnitureService, _integrationService: IntegrationService, _dictionaryService: HomedecoratorDictionaryService, _toastService: ToastService, _messageService: MessageBusService, _sceneService: SceneService, _dialogService: DialogService, _cameraService: CameraService, _presetsService: PresetsService, _itemService: ItemService, _settingsService: HomedecoratorSettingsService, _sceneOptionsService: SceneOptionsService, _dimensionsService: DimensionsService, _appEventService: HomedecoratorAppEventService, _floorplanService: FloorplanService, _floorService: FloorService, _iconCacheService: HomedecoratorIconCacheService, _arService: ArService, _googleTagManager: GoogleTagManagerService, _errorService: ErrorService, _rotationService: RotationService, _roomService: RoomService, _appStateService: AppStateService, _progressService: ProgressService, _animationService: AnimationService, _resizeService: ResizeService, _customizerService: CustomizerService, _dynamicCameraService: DynamicCameraService, _threedInPhotoInitializerService: ThreedInPhotoInitializerService, _renderService: RenderService, _newRenderService: NewRenderService, _connectorAdapterService: HomedecoratorConnectorAdapterService, _lightPresetService: LightPresetsService, _viewModeService: ViewModeService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     copySceneInstance(saveAs: boolean): Promise<void>;

package/app/shared/model-dialog/model-dialog-furniture-list.component.d.ts

@@ -2,15 +2,15 @@ import { OnInit } from '@angular/core';
 import { IconEnum } from '../../core/enum/icon.enum';
 import { CustomFloorGroupResult } from '../../plugins/core3d/model/custom-floor-group-result';
 import { HomedecoratorIconCacheService } from '../../core/service/homedecorator-icon-cache.service';
-import { ItemService } from '../../plugins/core3d/service/item.service';
 import { GoogleTagManagerService } from '../../service/google-tag-manager.service';
 import { HomedecoratorSettingsService } from '../../core/service/homedecorator-settings.service';
+import { MessageBusService } from '../../core/service/message-bus.service';
 import * as i0 from "@angular/core";
 export declare class ModelDialogFurnitureListComponent implements OnInit {
     iconService: HomedecoratorIconCacheService;
     settingsService: HomedecoratorSettingsService;
-    private _itemService;
     private _googleTagManagerService;
+    private _messagesService;
     readonly icon: typeof IconEnum;
     list: CustomFloorGroupResult[];
     label: string;
@@ -20,7 +20,7 @@ export declare class ModelDialogFurnitureListComponent implements OnInit {
     showTotals: boolean;
     totalPrice: string;
     totalEventSubmitted: boolean;
-    constructor(iconService: HomedecoratorIconCacheService, settingsService: HomedecoratorSettingsService, _itemService: ItemService, _googleTagManagerService: GoogleTagManagerService);
+    constructor(iconService: HomedecoratorIconCacheService, settingsService: HomedecoratorSettingsService, _googleTagManagerService: GoogleTagManagerService, _messagesService: MessageBusService);
     ngOnInit(): void;
     removeFurniture(item: CustomFloorGroupResult): void;
     copyFurnitureName(item: CustomFloorGroupResult): void;