@colijnit/homedecorator 255.1.4 → 255.1.6

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/render/render-dialog/render-dialog.component.scss

@@ -28,11 +28,11 @@
     position: absolute;
     top: 0;
     right: 0;
-    font-size: 30px;
+    font-size: 20px;
     padding: 0;
-    width: 50px;
+    width: 30px;
     min-width: 0px;
-    line-height: 45px;
+    line-height: 30px;
   }
 
   .render_btn {
@@ -48,9 +48,9 @@
 
     .render-camera-positions-left {
       //width: 30%;
-      min-width: 300px;
+      min-width: 400px;
       background: #e4edf4;
-      padding: 15px;
+      padding: 30px;
       text-align: center;
 
       //&.large {

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/settings/settings.component.d.ts

@@ -18,6 +18,7 @@ export declare class SettingsComponent implements OnInit, OnDestroy {
     private _itemService;
     private _appService;
     private _fontService;
+    private _settingsService;
     readonly configurationKey: typeof ConfigurationKey;
     versionFieldRef: ElementRef;
     minWallHeight: number;
@@ -36,6 +37,8 @@ export declare class SettingsComponent implements OnInit, OnDestroy {
     showCameraControls: boolean;
     showLightControls: boolean;
     showPostProcessingSettings: boolean;
+    showAA: boolean;
+    showAO: boolean;
     showWalls: boolean;
     showCeiling: boolean;
     wallSnapping: boolean;
@@ -45,11 +48,12 @@ export declare class SettingsComponent implements OnInit, OnDestroy {
     interiorLightIntensity: number;
     showSettingsOptions: boolean;
     enableTouch: boolean;
-    constructor(settingsService: HomedecoratorSettingsService, _snackBar: MatSnackBar, _messageBus: MessageBusService, _configurationService: ConfigurationService, _sceneService: SceneService, _itemService: ItemService, _appService: HomedecoratorAppService, _fontService: FontService);
+    constructor(settingsService: HomedecoratorSettingsService, _snackBar: MatSnackBar, _messageBus: MessageBusService, _configurationService: ConfigurationService, _sceneService: SceneService, _itemService: ItemService, _appService: HomedecoratorAppService, _fontService: FontService, _settingsService: HomedecoratorSettingsService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     applyNewHeight(height: number): void;
     toggle(key: ConfigurationKey, checked: boolean): void;
+    toggleOption(option: string, checked: boolean): void;
     setInteriorLightIntensity(value: number): void;
     removeAll(): void;
     compareEnum(a: string, b: string): boolean;

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/room-planner/room-planner/room-planner.component.scss

@@ -161,6 +161,7 @@
 
 /* New save grouping button */
 .mrp-save-grouping {
+  pointer-events: all;
   position: absolute;
   bottom: 10%;
   left: 50%;

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[];
@@ -116,6 +113,7 @@ export declare class BuildFurnitureService implements OnDestroy {
     createSimple3DModel(result: CustomFloorGroupResult, standAlone?: boolean): CustomFloorGroupResult;
     private _buildFloor;
     private _generateLayingPattern;
+    private _instancedMeshFromFloorPatternTransform;
     private _generateFloorPatternInfo;
     private _generateSelectedInMetadata;
     private _normalizeMesh;

package/app/plugins/toolbar/draw-dialog/draw-dialog.component.d.ts

@@ -17,6 +17,7 @@ export declare class DrawDialogComponent implements OnDestroy, OnInit, AfterView
     canvasElement: ElementRef;
     inputLength: ElementRef;
     hiddenImage: ElementRef;
+    customerInputLenght: number;
     draftingMode: string;
     diagramImage: string;
     cameraOffset: any;
@@ -44,6 +45,7 @@ export declare class DrawDialogComponent implements OnDestroy, OnInit, AfterView
     ngOnDestroy(): void;
     draw: () => void;
     handleStartCanvas(): void;
+    updateUserValue(): void;
     handleMouseDown(event: MouseEvent): void;
     handleMouseMove(event: MouseEvent): void;
     handleMouseUp(event: MouseEvent): void;

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

@@ -90,7 +90,7 @@ button {
 }
 
 .canvas-wrapper {
-  overflow: scroll;
+  overflow: hidden;
   max-height: 60vh;
   max-width: 80vw;
 }

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

@@ -25,6 +25,7 @@ import { DevelopmentService } from '../../../development/service/development.ser
 import { Item } from '../../core3d/items/item';
 import { ToolbarIcon } from '../../../core/interface/toolbar-icon.interface';
 import { NewRenderService } from '../../render/service/new-render.service';
+import { ErrorDialogData } from '../../../shared/error-dialog/error-dialog.component';
 import * as i0 from "@angular/core";
 export declare class ToolbarComponent implements OnInit, OnDestroy, AfterViewInit {
     appState: AppStateService;
@@ -89,6 +90,7 @@ export declare class ToolbarComponent implements OnInit, OnDestroy, AfterViewIni
     openDrawDiagram(file: any): void;
     openCroppingDiagram(file: any): void;
     openModelPreview(file: any): void;
+    showRenderError(data: ErrorDialogData): void;
     testRender(): void;
     private _showSaveDialog;
     private _hideToast;

package/assets/icons/dash-button.svg

@@ -0,0 +1,7 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg width="64px" height="64px" viewBox="-8 -8 32.00 32.00" xmlns="http://www.w3.org/2000/svg" fill="#000000">
+
+
+
+

package/assets/icons/pen-ruler.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M373.2 16.97C395.1-4.901 430.5-4.901 452.4 16.97L495 59.6C516.9 81.47 516.9 116.9 495 138.8L182.3 451.6C170.9 462.9 156.9 471.2 141.5 475.8L20.52 511.3C14.9 512.1 8.827 511.5 4.687 507.3C.5466 503.2-1.002 497.1 .6506 491.5L36.23 370.5C40.76 355.1 49.09 341.1 60.44 329.7L373.2 16.97zM429.8 39.6C420.4 30.22 405.2 30.22 395.8 39.6L341 94.4L417.6 170.1L472.4 116.2C481.8 106.8 481.8 91.6 472.4 82.23L429.8 39.6zM66.93 379.5L39.63 472.4L132.4 445.1C142.7 442 152.1 436.5 159.6 428.9L394.1 193.6L318.4 117L83.07 352.4C75.5 359.9 69.95 369.3 66.93 379.5V379.5zM173.3 27.31L244.1 98.18L221.5 120.8L189.7 88.97L155.3 123.3C149.1 129.6 138.9 129.6 132.7 123.3C126.4 117.1 126.4 106.9 132.7 100.7L167 66.34L150.6 49.94C138.1 37.44 117.9 37.44 105.4 49.94L49.94 105.4C37.44 117.9 37.44 138.1 49.94 150.6L120.8 221.5L98.18 244.1L27.31 173.3C2.32 148.3 2.32 107.7 27.31 82.75L82.75 27.31C107.7 2.32 148.3 2.32 173.3 27.31V27.31zM338.7 484.7L267.9 413.8L290.5 391.2L361.4 462.1C373.9 474.6 394.1 474.6 406.6 462.1L462.1 406.6C474.6 394.1 474.6 373.9 462.1 361.4L445.7 344.1L411.3 379.3C405.1 385.6 394.9 385.6 388.7 379.3C382.4 373.1 382.4 362.9 388.7 356.7L423 322.3L391.2 290.5L413.8 267.9L484.7 338.7C509.7 363.7 509.7 404.3 484.7 429.3L429.3 484.7C404.3 509.7 363.7 509.7 338.7 484.7V484.7z"/></svg>

package/assets/icons/retry-button.svg

@@ -0,0 +1,7 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg width="64px" height="64px" viewBox="-8 -8 32.00 32.00" xmlns="http://www.w3.org/2000/svg" fill="#000000" stroke="#000000" stroke-width="0.00016">
+
+
+
+