@colijnit/homedecorator 255.1.3 → 255.1.5

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

@@ -65,5 +65,7 @@ export declare enum MessageType {
     LoadScaledDiagram = "LoadScaledDiagram",
     StartCroppingPDF = "StartCroppingPDF",
     BlenderRenderFileReady = "BlenderRenderFileReady",
-    UserModelUploaded = "UserModelUploaded"
+    UserModelUploaded = "UserModelUploaded",
+    ChangeTexture = "ChangeTexture",
+    RenderError = "RenderError"
 }

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

@@ -10,6 +10,7 @@ import { HomedecoratorExternalSettingsInterface } from './homedecorator-external
 import { ToolbarIcon } from './toolbar-icon.interface';
 import { LoadingOverlayData } from './loading-overlay-data.interface';
 import { ArticleListObjectExtended } from '@colijnit/articleapi/build/model/article-list-object-extended.bo';
+import { Texture } from '../model/texture';
 export interface MessagesWithPayload {
     [MessageType.StartWithPreset]: {
         preset: Preset;
@@ -78,4 +79,9 @@ export interface MessagesWithPayload {
     [MessageType.StartCroppingPDF]: any;
     [MessageType.BlenderRenderFileReady]: any;
     [MessageType.UserModelUploaded]: any;
+    [MessageType.ChangeTexture]: Texture;
+    [MessageType.RenderError]: {
+        title: string;
+        message: string;
+    };
 }

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

@@ -20,6 +20,7 @@ export declare class HomedecoratorAppEventService {
         quantity: number;
     }>;
     addExternalSourceToCart: Subject<ExternalSourceArticleAddInterface>;
+    dirty: Subject<boolean>;
     static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorAppEventService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<HomedecoratorAppEventService>;
 }

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

@@ -24,6 +24,7 @@ import { ArticleFullObject } from '@colijnit/articleapi/build/model/article-full
 import { ArticleCategory } from '@colijnit/configuratorapi/build/model/article-category';
 import { ArticleFlat } from '@colijnit/articleapi/build/model/article-flat.bo';
 import { HomedecoratorAppEventService } from './homedecorator-app-event.service';
+import { CoDomainValue } from '@colijnit/mainapi/build/model/co-domain-value.bo';
 import * as i0 from "@angular/core";
 export declare class ExternalConnector {
     loginResponse: LoginResponse;
@@ -66,7 +67,7 @@ export declare class HomedecoratorConnectorAdapterService {
     getSelectionsAsync(): Promise<Selection[]>;
     getDecosAsync(): Promise<DecoNode[]>;
     getAnswerPrices(): Promise<AnswerPrice[]>;
-    getJsonConfiguredArticles(goodId: number, goodType: string, quantity: number, showLoader?: boolean, instanceId?: number, configuratorStatistics?: ConfiguratorStatisticsEnvironment): Promise<string>;
+    getJsonConfiguredArticles(goodId: number, goodType: string, quantity: number, externalSource?: boolean, showLoader?: boolean, instanceId?: number, configuratorStatistics?: ConfiguratorStatisticsEnvironment): Promise<string>;
     setInstanceToConfigure(id: string): Promise<DataServiceResponseData>;
     selectAnswer(answer: Answer, userInput?: string): Promise<DataServiceResponseData>;
     cancelAnswer(getAnswersAndQuestion?: boolean): Promise<DataServiceResponseData>;
@@ -84,6 +85,7 @@ export declare class HomedecoratorConnectorAdapterService {
     getArticleFullObject(goodId: number): Promise<ArticleFullObject>;
     getArticleCategories(publicationCode: number): Promise<ArticleCategory[]>;
     getArticleFlat(sku: string): Promise<ArticleFlat>;
+    getModelPlacementOptions(): Promise<CoDomainValue[]>;
     private _getPublicationCodeForRole;
     static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorConnectorAdapterService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<HomedecoratorConnectorAdapterService>;

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

@@ -18,6 +18,7 @@ import { CustomFloorGroupResult } from '../../plugins/core3d/model/custom-floor-
 import { HomedecoratorSettingsService } from './homedecorator-settings.service';
 import { HomedecoratorAppEventService } from './homedecorator-app-event.service';
 import { GoogleTagManagerService } from '../../service/google-tag-manager.service';
+import { Question } from '@colijnit/configuratorapi/build/model/question';
 import * as i0 from "@angular/core";
 export declare class HomedecoratorConnectorService implements OnDestroy {
     private _connector;
@@ -32,7 +33,6 @@ export declare class HomedecoratorConnectorService implements OnDestroy {
     set selections(value: Selection[]);
     get selections(): Selection[];
     get currentSelections(): Selection[];
-    get activeAnswers(): Answer[];
     get activeSelection(): Selection;
     get totalPrice(): number;
     get shouldShowLoader(): boolean;
@@ -40,20 +40,20 @@ export declare class HomedecoratorConnectorService implements OnDestroy {
     controllerInitialized: BehaviorSubject<boolean>;
     readonly articleReceived: Subject<Article>;
     readonly selectionsReceived: Subject<Selection[]>;
-    readonly answerCountReceived: Subject<number>;
     readonly answersReceived: Subject<Answer[]>;
     readonly extraAnswerDataLoaded: Subject<void>;
     readonly selectionsAndDecosLinked: Subject<void>;
     readonly connectionReset: Subject<void>;
     assetPath: string;
     selectionsToDisplay: Selection[];
+    activeQuestion: Question;
+    activeAnswers: Answer[];
     private _hideLoaderTimeout;
     private readonly _hideLoaderTimerTimeout;
     private _article;
     private _selections;
     private _currentSelections;
     private _decoNodes;
-    private _activeAnswers;
     private _activeSelection;
     private _articlePrice;
     private _totalPrice;
@@ -69,6 +69,7 @@ export declare class HomedecoratorConnectorService implements OnDestroy {
     initNodeInstance(sku: string): Promise<DataServiceResponseData>;
     changeConnection(instanceId: string, oldConnection: string, newConnection: string): Promise<boolean>;
     emptySelections(): void;
+    emptyAnswersAndQuestion(): void;
     /**
      * Used for obsolete furniture
      * @param selections
@@ -82,7 +83,7 @@ export declare class HomedecoratorConnectorService implements OnDestroy {
     setDecoNodes(decoNodes: DecoNode[]): void;
     initConnection(forceReload?: boolean): Promise<void>;
     getInternalParameter(param: InternalParam): Promise<string>;
-    getJsonConfiguredArticles(goodId: number, goodType: string, quantity: number, showLoader?: boolean, instanceId?: number, configuratorStatistics?: ConfiguratorStatisticsEnvironment): Promise<any>;
+    getJsonConfiguredArticles(goodId: number, goodType: string, quantity: number, externalSource?: boolean, showLoader?: boolean, instanceId?: number, configuratorStatistics?: ConfiguratorStatisticsEnvironment): Promise<any>;
     setInstance(id: string): Promise<DataServiceResponseData>;
     copyInstanceAndSaveOriginalConfiguration(instanceId: string, result: CustomFloorGroupResult): Promise<string>;
     copyInstanceAndLoseOriginalConfiguration(instanceId: string, result: CustomFloorGroupResult): Promise<string>;
@@ -109,8 +110,8 @@ export declare class HomedecoratorConnectorService implements OnDestroy {
     private _isAllSelectionPublished;
     private _isAnswerPublished;
     private _preloadCachedImages;
-    addToCart(goodId: number, goodType: string, quantity: number, instanceId: number): Promise<string>;
-    handleAnswersReceived(answers: Answer[]): Promise<void>;
+    addToCart(goodId: number, goodType: string, quantity: number, instanceId: number, externalSource: boolean): Promise<string>;
+    handleAnswersReceived(answers: Answer[]): void;
     private _prepareSelectionsToDisplayImages;
     private _prepareSelectionsNextOptionValues;
     private _getPublicationCode;

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

@@ -10,6 +10,7 @@ import { ConfigurationService } from './configuration.service';
 import { LocalStorageService } from '../../service/local-storage.service';
 import { ProgressService } from './progress.service';
 import { SceneService } from '../../plugins/core3d/service/scene.service';
+import { HomedecoratorAppEventService } from './homedecorator-app-event.service';
 import * as i0 from "@angular/core";
 export declare class PresetsService implements OnDestroy {
     private _appStateService;
@@ -21,6 +22,7 @@ export declare class PresetsService implements OnDestroy {
     private _storageService;
     private _progressService;
     private _sceneService;
+    private _eventService;
     isLoading: boolean;
     beforeLoad: Subject<any>;
     afterLoad: Subject<any>;
@@ -28,7 +30,7 @@ export declare class PresetsService implements OnDestroy {
     assetPath: string;
     stateCreated: Subject<void>;
     private _subs;
-    constructor(_appStateService: AppStateService, _permanentStoreService: PermanentStoreService, _jsonUtils: JsonUtilsService, _messageService: MessageBusService, _settingsService: HomedecoratorSettingsService, _configurationService: ConfigurationService, _storageService: LocalStorageService, _progressService: ProgressService, _sceneService: SceneService);
+    constructor(_appStateService: AppStateService, _permanentStoreService: PermanentStoreService, _jsonUtils: JsonUtilsService, _messageService: MessageBusService, _settingsService: HomedecoratorSettingsService, _configurationService: ConfigurationService, _storageService: LocalStorageService, _progressService: ProgressService, _sceneService: SceneService, _eventService: HomedecoratorAppEventService);
     ngOnDestroy(): void;
     register(plugin: PluginInterface): void;
     reopenState(model: string): void;

package/app/homedecorator.component.d.ts

@@ -7,6 +7,7 @@ import { HomedecoratorConnectorService } from './core/service/homedecorator-conn
 import { ScreenSizeAnalysisService } from './shared/screen-size-analysis/screen-size-analysis.service';
 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 * as i0 from "@angular/core";
 export declare class HomedecoratorComponent implements OnInit, OnDestroy {
     controllerService: HomedecoratorConnectorService;
@@ -18,6 +19,7 @@ export declare class HomedecoratorComponent implements OnInit, OnDestroy {
     private _domSanitizer;
     private _messageService;
     private _homedecoratorService;
+    private _eventService;
     set settings(value: any);
     get settings(): any;
     showClass: boolean;
@@ -29,7 +31,7 @@ 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);
+    constructor(controllerService: HomedecoratorConnectorService, appState: AppStateService, presetsService: PresetsService, screenAnalysis: ScreenSizeAnalysisService, _componentFactoryResolver: ComponentFactoryResolver, _iconRegistry: MatIconRegistry, _domSanitizer: DomSanitizer, _messageService: MessageBusService, _homedecoratorService: HomedecoratorService, _eventService: HomedecoratorAppEventService);
     ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
     registerCustomIcons(): void;

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

@@ -7,12 +7,14 @@ 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 * as i0 from "@angular/core";
 export declare class FloorService implements OnDestroy {
     private _sceneService;
     private _outlineService;
     private _itemService;
     private _settingsService;
+    private _messageService;
     private _groundPlane;
     private _floorPlane;
     private _floors;
@@ -21,7 +23,7 @@ export declare class FloorService implements OnDestroy {
     get groundPlane(): Mesh;
     set groundPlane(mesh: Mesh);
     floorToConfigure: FloorPlaneItem;
-    constructor(_sceneService: SceneService, _outlineService: OutlineService, _itemService: ItemService, _settingsService: HomedecoratorSettingsService);
+    constructor(_sceneService: SceneService, _outlineService: OutlineService, _itemService: ItemService, _settingsService: HomedecoratorSettingsService, _messageService: MessageBusService);
     ngOnDestroy(): void;
     getFloorPlane(): FloorPlaneItem;
     setFloorTexture(room: Room, texture: Texture): Promise<void>;

package/app/plugins/core3d/service/post-processing.service.d.ts

@@ -4,22 +4,34 @@ import { ConfigurationService } from '../../../core/service/configuration.servic
 import * as i0 from "@angular/core";
 export declare class PostProcessingService implements OnDestroy {
     private _configurationService;
-    private _composer;
+    private _aaComposer;
+    private _aoComposer;
+    private _blendComposer;
     private _n8aoPass;
     private _taaRenderPass;
-    private _outputPass;
+    private _aaOutputPass;
     private _renderPass;
+    private _outputPass;
+    private _aoRenderPass;
+    private _saoPass;
+    private _ssaoPass;
     private _scene;
     private _renderer;
     private _camera;
-    private _renderTarget;
+    private _aaRenderTarget;
+    private _aoRenderTarget;
+    private _blendShader;
+    private _width;
+    private _height;
     private _effectController;
     private _postProcessingGui;
-    private _taaPassGui;
     private _subs;
     constructor(_configurationService: ConfigurationService);
     ngOnDestroy(): void;
     init(renderer: WebGLRenderer, scene: Scene, camera: PerspectiveCamera, width: number, height: number): void;
+    private _initAaComposer;
+    private _initAoComposer;
+    private _initBlendComposer;
     private _updatePass;
     private _createGuiTaaPass;
     setSize(width: number, height: number): void;

package/app/plugins/model-uploader/model-previewer/model-preview.component.d.ts

@@ -11,12 +11,16 @@ import { LightPresetsService } from '../../core3d/service/light-presets.service'
 import { HomedecoratorDictionaryService } from '../../../core/service/homedecorator-dictionary.service';
 import { FontService } from '../../core3d/service/font.service';
 import { Font } from 'three/examples/jsm/loaders/FontLoader';
+import { IconEnum } from '../../../core/enum/icon.enum';
+import { HomedecoratorIconCacheService } from '../../../core/service/homedecorator-icon-cache.service';
+import { CoDomainValue } from '@colijnit/mainapi/build/model/co-domain-value.bo';
 import * as i0 from "@angular/core";
 export declare class ModelPreviewComponent implements OnInit, OnDestroy {
     data: {
         file: any;
     };
     settingsService: HomedecoratorSettingsService;
+    iconCache: HomedecoratorIconCacheService;
     private _dialogRef;
     private _thirdPartyModelService;
     private _messageService;
@@ -34,6 +38,7 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
     boundingBoxSize: Vector3;
     loadedModel: any;
     unitsOfMeasurement: string;
+    units: string[];
     modelName: string;
     mathPi: number;
     showReferenceModel: boolean;
@@ -45,10 +50,12 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
     font: Font;
     stackable: boolean;
     heightAdjustable: boolean;
+    placementOptions: CoDomainValue[];
+    selectedPlacement: number;
     private _measurements;
     constructor(data: {
         file: any;
-    }, settingsService: HomedecoratorSettingsService, _dialogRef: MatDialogRef<ModelPreviewComponent>, _thirdPartyModelService: ThirdPartyModelService, _messageService: MessageBusService, _dialog: MatDialog, _adapterService: HomedecoratorConnectorAdapterService, _lightPresetsService: LightPresetsService, _dictionaryService: HomedecoratorDictionaryService, _fontService: FontService);
+    }, settingsService: HomedecoratorSettingsService, iconCache: HomedecoratorIconCacheService, _dialogRef: MatDialogRef<ModelPreviewComponent>, _thirdPartyModelService: ThirdPartyModelService, _messageService: MessageBusService, _dialog: MatDialog, _adapterService: HomedecoratorConnectorAdapterService, _lightPresetsService: LightPresetsService, _dictionaryService: HomedecoratorDictionaryService, _fontService: FontService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     initScene(): void;
@@ -62,7 +69,7 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
     rotateModel(axis: string, degrees: number): void;
     moveModel(axis: string, amount: number): void;
     setUnit(event: any): void;
-    toggleShowReferenceModel(): void;
+    toggleShowReferenceModel($event: any): void;
     setStackable(event: any): void;
     setHeightAdjustable(event: any): void;
     private _animate;
@@ -89,6 +96,7 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
     private _blobToArrayBuffer;
     private _createLightFromProperties;
     private _setObjectProperties;
+    protected readonly icon: typeof IconEnum;
     static ɵfac: i0.ɵɵFactoryDeclaration<ModelPreviewComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<ModelPreviewComponent, "rp-model-preview", never, {}, {}, never, never>;
 }

package/app/plugins/model-uploader/model-previewer/model-preview.component.scss

@@ -1,20 +1,51 @@
 .model-preview {
   display: flex;
   flex-direction: row;
+  font-size: 14px;
+
+  .model-preview-window {
+    .model-preview-window-bottom {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+
+      .disclaimer-text-container {
+        padding-right: 20px;
+        text-align: right;
+        font-style: italic;
+        font-size: 12px;
+      }
+    }
+  }
 
   .model-preview-actions {
-    min-width: 240px;
+    min-width: 350px;
     box-sizing: border-box;
     padding: 10px 20px;
     border-left: 1px solid #5b6875;
+
+    #heightArticle {
+      max-width: 160px;
+    }
+
+    .units-select-form {
+      width: 80px;
+      margin: 0 5px;
+    }
+
     .model-preview-info-container {
       margin-bottom: 10px;
+
       .model-preview-info-left {
         font-weight: bolder;
       }
-      .model-preview-info-right {}
-
 
+      .model-preview-info-right {
+      }
+    }
+    .model-preview-info {
+      margin-top: 80px;
     }
   }
 
@@ -34,15 +65,19 @@
       color: #fff;
     }
   }
-}
 
-input {
-  border: 1px solid #5b6875;
-  box-sizing: border-box;
-  padding: 3px 10px;
-  border-radius: 3px;
+  input {
+    border: 1px solid #5b6875;
+    box-sizing: border-box;
+    padding: 3px 10px;
+    border-radius: 3px;
+    line-height: 30px;
+    width: 100%;
+  }
+
 }
 
+
 .mat-radio-wrapper {
   margin: 10px 0;
 }
@@ -53,23 +88,153 @@ mat-radio-group {
   }
 }
 
+.base-button {
+  cursor: pointer;
+  color: #fff;
+  background: #dda73f;
+  border: 1px solid #dda73f;
+  border-radius: 3px;
+  box-sizing: border-box;
+  padding: 4px 10px;
+  line-height: 30px;
+  &:hover {
+    background: #dda73f;
+    color: #fff;
+  }
+}
+
+.model-placement-container {
+  div {
+    display: flex;
+    justify-content: space-between;
+    margin: 5px 0;
+    align-items: center;
+  }
+}
+
+
 .rotation-button-container {
   div {
     display: flex;
     justify-content: space-between;
-    margin-bottom: 10px;
+    margin-bottom: 5px;
+    p {
+      margin: 0;
+      padding: 0;
+    }
+
     button {
+      margin: 0 0 0 10px;
       cursor: pointer;
-      color: #fff;
-      background: #dda73f;
-      border: 1px solid #dda73f;
-      border-radius: 3px;
+      color: #5b6875;
+      background: #fff;
+      border: 2px solid #5b6875;
+      border-radius: 50%;
       box-sizing: border-box;
-      padding: 5px;
+      padding: 0;
+      height: 22px;
+      width: 22px;
+      font-size: 18px;
+      text-align: center;
+
       &:hover {
         background: #dda73f;
         color: #fff;
       }
     }
+
+    .button-as-link {
+      color: #dda73f;
+      border: none;
+      width: 100%;
+      height: 100%;
+      font-size: 14px;
+      position: relative;
+      top: -15px;
+      ::ng-deep mat-icon {
+        width: 25px;
+        height: 25px;
+        position: relative;
+        top: 8px;
+        svg {
+          path {
+            fill: #dda73f;
+          }
+        }
+      }
+      &:hover {
+        background: none;
+        color: #dda73f;
+      }
+    }
+  }
+}
+
+.error-container {
+  position: relative;
+  padding: .75rem 1.25rem;
+  margin-bottom: 1rem;
+  border: 1px solid #f5c6cb;
+  border-radius: .25rem;
+  color: #721c24;
+  background-color: #f8d7da;
+  max-width: 190px;
+}
+
+.exportButton, .exportButtonDark {
+  display: inline-block !important;
+  margin-right: 10px;
+}
+
+.exportButtonDark {
+  background: #5b6875;
+  border-color: #5b6875;
+  &:hover {
+    background: #5b6875;
+    color: #fff;
+  }
+}
+
+:host {
+  ::ng-deep .mat-form-field-wrapper {
+    padding-bottom: 0;
+    border: 1px solid #5b6875;
+    border-radius: 4px;
+  }
+
+  ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-infix {
+    padding: 0;
+    border: none;
+  }
+
+  ::ng-deep .mat-select-value {
+    padding-left: 5px;
+  }
+
+  ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-underline {
+    height: 0;
+  }
+
+  ::ng-deep .mat-select-trigger {
+    line-height: 36px;
+  }
+
+  ::ng-deep mat-icon {
+    width: 18px;
+    height: 18px;
+
+    svg {
+      path {
+        fill: #5b6875;
+      }
+    }
+  }
+
+  ::ng-deep .mat-slide-toggle-content {
+    width: calc(100% - 36px);
+    min-width: 300px;
   }
 }
+
+
+

package/app/plugins/model-uploader/model-uploader.module.d.ts

@@ -9,8 +9,12 @@ import * as i7 from "@colijnit/corecomponents";
 import * as i8 from "@colijnit/corecomponents_v12";
 import * as i9 from "@colijnit/catalog";
 import * as i10 from "@angular/material/radio";
+import * as i11 from "@angular/material/slide-toggle";
+import * as i12 from "@angular/material/form-field";
+import * as i13 from "@angular/material/core";
+import * as i14 from "@angular/material/select";
 export declare class ModelUploaderModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<ModelUploaderModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<ModelUploaderModule, [typeof i1.ModelUploaderComponent, typeof i2.ModelPreviewComponent], [typeof i3.CommonModule, typeof i4.CoreModule, typeof i5.MatIconModule, typeof i6.MatButtonModule, typeof i7.ButtonModule, typeof i8.ImageModule, typeof i9.CatalogExternalSourcesModule, typeof i9.CatalogExternalSourceModule, typeof i10.MatRadioModule], [typeof i1.ModelUploaderComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<ModelUploaderModule, [typeof i1.ModelUploaderComponent, typeof i2.ModelPreviewComponent], [typeof i3.CommonModule, typeof i4.CoreModule, typeof i5.MatIconModule, typeof i6.MatButtonModule, typeof i7.ButtonModule, typeof i8.ImageModule, typeof i9.CatalogExternalSourcesModule, typeof i9.CatalogExternalSourceModule, typeof i10.MatRadioModule, typeof i11.MatSlideToggleModule, typeof i12.MatFormFieldModule, typeof i13.MatOptionModule, typeof i14.MatSelectModule, typeof i7.IconModule], [typeof i1.ModelUploaderComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<ModelUploaderModule>;
 }

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

@@ -10,6 +10,7 @@ import { NewRenderService } from '../service/new-render.service';
 import { ApiServiceModule } from '../../../core/service/3dm-api';
 import { MessageBusService } from '../../../core/service/message-bus.service';
 import { UtilsService } from '../../../core/service/utils.service';
+import { MatDialog } from '@angular/material/dialog';
 import * as i0 from "@angular/core";
 export declare class RenderDialogComponent implements OnDestroy {
     cameraService: CameraService;
@@ -20,6 +21,7 @@ export declare class RenderDialogComponent implements OnDestroy {
     private _settingsService;
     private _newRenderService;
     private _3dmRenderApi;
+    private _dialog;
     readonly renderStatus: typeof RenderStatus;
     readonly iconName: typeof IconName;
     readonly renderModes: typeof RenderModes;
@@ -38,7 +40,7 @@ export declare class RenderDialogComponent implements OnDestroy {
     get disablePictureButton(): boolean;
     get renderedImages(): string[];
     private _subs;
-    constructor(cameraService: CameraService, renderService: RenderService, messageService: MessageBusService, _utilsService: UtilsService, _domSanitizer: DomSanitizer, _settingsService: HomedecoratorSettingsService, _newRenderService: NewRenderService, _3dmRenderApi: ApiServiceModule);
+    constructor(cameraService: CameraService, renderService: RenderService, messageService: MessageBusService, _utilsService: UtilsService, _domSanitizer: DomSanitizer, _settingsService: HomedecoratorSettingsService, _newRenderService: NewRenderService, _3dmRenderApi: ApiServiceModule, _dialog: MatDialog);
     ngOnDestroy(): void;
     changeInputSize(model: number): void;
     addRenderCustom(): void;
@@ -49,6 +51,7 @@ export declare class RenderDialogComponent implements OnDestroy {
     addRendersToQueue(): Promise<void>;
     startRenderingRoom(): Promise<void>;
     createBlenderRender(): void;
+    cancelBlenderRender(): void;
     saveImage(url: string): void;
     removeRender(url: string, index: number): boolean;
     renderOnChange(): void;

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

@@ -7,6 +7,7 @@ import { MessageBusService } from '../../../../core/service/message-bus.service'
 import { ConfigurationService } from '../../../../core/service/configuration.service';
 import { DimensioningService } from '../../../../core/service/dimensioning.service';
 import { ViewModeService } from '../../../../core/service/view-mode.service';
+import { RoomService } from './service/room.service';
 import * as i0 from "@angular/core";
 export declare class FloorplannerComponent implements AfterViewInit, OnDestroy {
     private _floorplanService;
@@ -14,6 +15,7 @@ export declare class FloorplannerComponent implements AfterViewInit, OnDestroy {
     private _configurationService;
     private _dimensionService;
     private _viewModeService;
+    private _roomService;
     canvasElement: ElementRef;
     selectedWallChange: Subject<SelectedWallEvent>;
     private readonly _viewScaleMin;
@@ -82,7 +84,7 @@ export declare class FloorplannerComponent implements AfterViewInit, OnDestroy {
     handleDocKeyDown(event: KeyboardEvent): void;
     handleDocKeyUp(event: KeyboardEvent): void;
     resizeGrid(): void;
-    constructor(_floorplanService: FloorplanService, _messageBusService: MessageBusService, _configurationService: ConfigurationService, _dimensionService: DimensioningService, _viewModeService: ViewModeService);
+    constructor(_floorplanService: FloorplanService, _messageBusService: MessageBusService, _configurationService: ConfigurationService, _dimensionService: DimensioningService, _viewModeService: ViewModeService, _roomService: RoomService);
     ngOnDestroy(): void;
     ngAfterViewInit(): void;
     showStartMessage(): void;

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

@@ -65,6 +65,7 @@ export declare class RoomService implements OnDestroy {
     getRoomCenter(): Vector3;
     updateFloorsAndEdges(): Promise<void>;
     updateCeilings(): void;
+    resetAllRooms(): void;
     private _showHideWalls;
     private _updateEdgeVisibility;
     private _setAllEdgesVisible;

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

@@ -3,6 +3,7 @@ import { ElementRef, EventEmitter, OnChanges, OnDestroy, OnInit, SimpleChanges }
 import { TextureType } from '../../../../core/model/texture-type';
 import { Texture } from '../../../../core/model/texture';
 import { HomedecoratorSettingsService } from '../../../../core/service/homedecorator-settings.service';
+import { MessageBusService } from '../../../../core/service/message-bus.service';
 import * as i0 from "@angular/core";
 export declare enum TextureEditorOptions {
     None = 0,
@@ -11,6 +12,7 @@ export declare enum TextureEditorOptions {
     Both = 3
 }
 export declare class TextureEditorComponent implements OnInit, OnChanges, OnDestroy {
+    messageService: MessageBusService;
     private _settingsService;
     readonly textureType: typeof TextureType;
     fileInput: ElementRef;
@@ -70,10 +72,11 @@ export declare class TextureEditorComponent implements OnInit, OnChanges, OnDest
         emit: (value: any) => void;
         release: () => void;
     };
-    constructor(_settingsService: HomedecoratorSettingsService);
+    constructor(messageService: MessageBusService, _settingsService: HomedecoratorSettingsService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     ngOnChanges(changes: SimpleChanges): void;
+    setNewTexture(texture: Texture): void;
     handleRemoveTextureClick(event: any): void;
     private _loadTextureData;
     setPhotoImage(dataUrl: string, resize?: boolean): Promise<void>;

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

@@ -4,7 +4,6 @@ import { Subject } from 'rxjs';
 import { Answer } from '@colijnit/configuratorapi/build/model/answer';
 import { Mesh, Object3D, Vector3 } from 'three';
 import { MatDialog } from '@angular/material/dialog';
-import { Question } from '@colijnit/configuratorapi/build/model/question';
 import { Item } from '../../../core3d/items/item';
 import { Metadata } from '../../../core3d/items/metadata';
 import { CustomFloorGroupResult } from '../../../core3d/model/custom-floor-group-result';
@@ -84,8 +83,6 @@ export declare class BuildFurnitureService implements OnDestroy {
     activeConnector: any;
     get useNodeIdToLink(): boolean;
     get currentCustomFloorGroup(): Item;
-    activeQuestion: Question;
-    activeAnswers: Answer[];
     get standAlone(): boolean;
     set standAlone(value: boolean);
     get selections(): Selection[];