@colijnit/homedecorator 255.1.5 → 255.1.7

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

@@ -44,4 +44,6 @@ export declare class HomedecoratorSettingsOptions {
     pathTracer: boolean;
     ssrEnabled: boolean;
     maxRenderSamples: number;
+    aoEnabled: boolean;
+    aaEnabled: boolean;
 }

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

@@ -1,6 +1,6 @@
 import { HomedecoratorSettings } from '../model/homedecorator-settings';
 import { JsonUtilsService } from './json-utils.service';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Subject } from 'rxjs';
 import { HomedecoratorDictionaryService } from './homedecorator-dictionary.service';
 import { HomedecoratorConnectorAdapterService } from './homedecorator-connector-adapter.service';
 import * as i0 from "@angular/core";
@@ -12,6 +12,7 @@ export declare class HomedecoratorSettingsService {
     get settings(): HomedecoratorSettings;
     get isPrivate(): boolean;
     settingsLoaded: BehaviorSubject<boolean>;
+    settingsChanged: Subject<void>;
     private _settings;
     constructor(_jsonUtilsService: JsonUtilsService, _dictionaryService: HomedecoratorDictionaryService, _connectorService: HomedecoratorConnectorAdapterService);
     createSettingsFromObject(obj: any): void;

package/app/homedecorator.module.d.ts

@@ -9,10 +9,12 @@ import * as i6 from "./shared/export-dialog/export-dialog.module";
 import * as i7 from "./shared/info-dialog/info-dialog.module";
 import * as i8 from "./plugins/plugins.module";
 import * as i9 from "./shared/dialog/dialog.module";
+import * as i10 from "ngx-lightbox";
+import * as i11 from "@angular/cdk/a11y";
 export declare class HomedecoratorModule {
     private _injector;
     constructor(_injector: Injector);
     static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<HomedecoratorModule, [typeof i1.HomedecoratorComponent], [typeof i2.CommonModule, typeof i3.ProgressBarModule, typeof i4.LoadingOverlayModule, typeof i5.HdLoaderModule, typeof i6.ExportDialogModule, typeof i7.InfoDialogModule, typeof i8.PluginsModule, typeof i9.DialogModule], [typeof i1.HomedecoratorComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<HomedecoratorModule, [typeof i1.HomedecoratorComponent], [typeof i2.CommonModule, typeof i3.ProgressBarModule, typeof i4.LoadingOverlayModule, typeof i5.HdLoaderModule, typeof i6.ExportDialogModule, typeof i7.InfoDialogModule, typeof i8.PluginsModule, typeof i9.DialogModule, typeof i10.LightboxModule, typeof i11.A11yModule], [typeof i1.HomedecoratorComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<HomedecoratorModule>;
 }

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

@@ -16,7 +16,7 @@ export interface FloorPatternTransform {
     isLeft: boolean;
 }
 export declare class FloorPatternService {
-    generatePattern(floorPattern: FloorPattern, plankSize: Vector3, floorSize: Vector3, direction?: FloorPatternDirection): FloorPatternTransform[];
+    generatePattern(floorPattern: FloorPattern, plankSize: Vector3, floorSize: Vector3, direction?: FloorPatternDirection, heartLine?: number): FloorPatternTransform[];
     private _rotatePatternOnZAxis;
     private _normalPattern;
     private _herringBone;

package/app/plugins/core3d/service/floor-tile-intersection.service.d.ts

@@ -8,6 +8,7 @@ export interface FloorCountResult {
     right: number;
     edge: number;
     total: number;
+    filtered?: Array<FloorPatternTransform>;
 }
 export declare class FloorTileIntersectionService implements OnDestroy {
     private _sceneService;
@@ -15,7 +16,7 @@ export declare class FloorTileIntersectionService implements OnDestroy {
     private _edgeCollisionMargin;
     constructor(_sceneService: SceneService);
     toggleDebug(): void;
-    countTiles(floorMesh: Mesh, floorPattern: Array<FloorPatternTransform>, geometry: BufferGeometry): FloorCountResult;
+    countTiles(floorMesh: Mesh, floorPattern: Array<FloorPatternTransform>, geometryLeft: BufferGeometry, geometryRight?: BufferGeometry, addFiltered?: boolean): FloorCountResult;
     private _checkIntersection2;
     private _generateEdgeColliders;
     private _randomColMat;

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

@@ -1,20 +1,21 @@
 import { OnDestroy } from '@angular/core';
 import { PerspectiveCamera, Scene, WebGLRenderer } from 'three';
 import { ConfigurationService } from '../../../core/service/configuration.service';
+import { HomedecoratorSettingsService } from '../../../core/service/homedecorator-settings.service';
 import * as i0 from "@angular/core";
 export declare class PostProcessingService implements OnDestroy {
     private _configurationService;
+    private _settingsService;
+    private _aoEnabled;
+    private _aaEnabled;
     private _aaComposer;
     private _aoComposer;
     private _blendComposer;
     private _n8aoPass;
     private _taaRenderPass;
-    private _aaOutputPass;
     private _renderPass;
     private _outputPass;
-    private _aoRenderPass;
-    private _saoPass;
-    private _ssaoPass;
+    private _fxaaPass;
     private _scene;
     private _renderer;
     private _camera;
@@ -26,18 +27,19 @@ export declare class PostProcessingService implements OnDestroy {
     private _effectController;
     private _postProcessingGui;
     private _subs;
-    constructor(_configurationService: ConfigurationService);
+    constructor(_configurationService: ConfigurationService, _settingsService: HomedecoratorSettingsService);
     ngOnDestroy(): void;
     init(renderer: WebGLRenderer, scene: Scene, camera: PerspectiveCamera, width: number, height: number): void;
+    setSize(width: number, height: number): void;
+    render(): void;
+    showGui(): void;
+    hideGui(): void;
+    private _initComposers;
     private _initAaComposer;
     private _initAoComposer;
     private _initBlendComposer;
     private _updatePass;
     private _createGuiTaaPass;
-    setSize(width: number, height: number): void;
-    render(): void;
-    showGui(): void;
-    hideGui(): void;
     private _showHideGui;
     private _createGui;
     static ɵfac: i0.ɵɵFactoryDeclaration<PostProcessingService, never>;

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

@@ -53,7 +53,7 @@ export declare class SceneService implements OnDestroy {
     getScene(): Scene;
     set arMode(value: boolean);
     get arMode(): boolean;
-    init(element: HTMLElement): void;
+    init(element: HTMLElement): Promise<void>;
     addObject(obj: Object3D, forceRender?: boolean): void;
     removeObject(obj: Object3D, forceRender?: boolean, cleanUp?: boolean): void;
     updatePathTracer(): void;

package/app/plugins/help/help-dialog/help-dialog.component.scss

@@ -25,4 +25,10 @@
             margin-top: 10px;
         }
     }
-}
+}
+
+.help-image {
+  display: block;
+  max-width: 100%;
+  max-height: 100%;
+}

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

@@ -29,6 +29,9 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
     private _lightPresetsService;
     private _dictionaryService;
     private _fontService;
+    constructor(data: {
+        file: any;
+    }, settingsService: HomedecoratorSettingsService, iconCache: HomedecoratorIconCacheService, _dialogRef: MatDialogRef<ModelPreviewComponent>, _thirdPartyModelService: ThirdPartyModelService, _messageService: MessageBusService, _dialog: MatDialog, _adapterService: HomedecoratorConnectorAdapterService, _lightPresetsService: LightPresetsService, _dictionaryService: HomedecoratorDictionaryService, _fontService: FontService);
     glbExportName: ElementRef;
     heightArticle: ElementRef;
     scenePreview: THREE.Scene;
@@ -53,9 +56,7 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
     placementOptions: CoDomainValue[];
     selectedPlacement: number;
     private _measurements;
-    constructor(data: {
-        file: any;
-    }, settingsService: HomedecoratorSettingsService, iconCache: HomedecoratorIconCacheService, _dialogRef: MatDialogRef<ModelPreviewComponent>, _thirdPartyModelService: ThirdPartyModelService, _messageService: MessageBusService, _dialog: MatDialog, _adapterService: HomedecoratorConnectorAdapterService, _lightPresetsService: LightPresetsService, _dictionaryService: HomedecoratorDictionaryService, _fontService: FontService);
+    protected readonly icon: typeof IconEnum;
     ngOnInit(): void;
     ngOnDestroy(): void;
     initScene(): void;
@@ -72,6 +73,7 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
     toggleShowReferenceModel($event: any): void;
     setStackable(event: any): void;
     setHeightAdjustable(event: any): void;
+    closePreview(): void;
     private _animate;
     private _render;
     private _downloadModel;
@@ -85,18 +87,11 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
     private _addFromGeometry;
     private _prepModelForScene;
     private _getBoundingBox;
-    private _showMeasurements;
     private _setMeasurements;
-    private _createHeightMeasurement;
-    private _createWidthMeasurement;
-    private _createDepthMeasurement;
-    private _calculateHeightPositions;
-    private _calculateWidthPositions;
-    private _calculateDepthPositions;
+    private _create3DText;
     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

@@ -195,6 +195,11 @@ mat-radio-group {
   }
 }
 
+.model-close-preview {
+  text-align: right;
+  cursor: pointer;
+}
+
 :host {
   ::ng-deep .mat-form-field-wrapper {
     padding-bottom: 0;

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/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/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

@@ -113,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;