@colijnit/homedecorator 255.1.1 → 255.1.2

package/app/core/enum/configuration-key.enum.d.ts

@@ -28,6 +28,7 @@ export declare enum ConfigurationKey {
     WalkThroughCameraFoV = "WalkThroughCameraFoV",
     WalkThroughCameraAspectRatio = "WalkThroughCameraAspectRatio",
     WalkThroughCameraFocus = "WalkThroughCameraFocus",
+    ShowPostProcessingSettings = "showPostProcessingSettings",
     ShowWalls = "ShowWalls",
     ShowCeiling = "ShowCeiling",
     IsLimited = "IsLimited",

package/app/core/interface/configuration-data.interface.d.ts

@@ -29,6 +29,7 @@ export interface ConfigurationData {
     [ConfigurationKey.WalkThroughCameraFoV]?: number;
     [ConfigurationKey.WalkThroughCameraAspectRatio]?: number;
     [ConfigurationKey.WalkThroughCameraFocus]?: number;
+    [ConfigurationKey.ShowPostProcessingSettings]?: boolean;
     [ConfigurationKey.ShowWalls]?: boolean;
     [ConfigurationKey.ShowCeiling]?: boolean;
     [ConfigurationKey.IsLimited]?: boolean;

package/app/core/interface/homedecorator-external-settings.interface.d.ts

@@ -0,0 +1,9 @@
+import { CatalogDefinition } from '@colijnit/articleapi/build/model/catalog-definition.bo';
+import { ExternalSource } from '@colijnit/articleapi/build/model/external-source.bo';
+export interface HomedecoratorExternalSettingsInterface {
+    name: string;
+    settings: any;
+    catalogDefinition: CatalogDefinition;
+    externalSource: ExternalSource;
+    schema: string;
+}

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

@@ -6,10 +6,10 @@ import type { Item } from '../../plugins/core3d/items/item';
 import type { ItemGroup } from '../../plugins/core3d/items/item-group';
 import { Category } from '../model/category';
 import { DraggedData } from '../../plugins/core3d/interface/dragged-data.interface';
-import { ExternalSettingsInterface } from './external-settings.interface';
+import { HomedecoratorExternalSettingsInterface } from './homedecorator-external-settings.interface';
 import { ToolbarIcon } from './toolbar-icon.interface';
 import { LoadingOverlayData } from './loading-overlay-data.interface';
-import { ArticleListObjectExtended } from '@colijnit/configuratorapi/build/model/article-list-object-extended';
+import { ArticleListObjectExtended } from '@colijnit/articleapi/build/model/article-list-object-extended.bo';
 export interface MessagesWithPayload {
     [MessageType.StartWithPreset]: {
         preset: Preset;
@@ -29,7 +29,7 @@ export interface MessagesWithPayload {
     };
     [MessageType.LoadIOneFurnitureIntoSceneBySKU]: {
         sku: string;
-        settings: ExternalSettingsInterface;
+        settings: HomedecoratorExternalSettingsInterface;
         position: {
             x: number;
             y: number;

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

@@ -2,6 +2,7 @@ import { BehaviorSubject, Subject } from 'rxjs';
 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 * as i0 from "@angular/core";
 export declare class HomedecoratorAppEventService {
     instanceSet: BehaviorSubject<string>;
@@ -18,6 +19,7 @@ export declare class HomedecoratorAppEventService {
         article: string | ArticleExtended;
         quantity: number;
     }>;
+    addExternalSourceToCart: Subject<ExternalSourceArticleAddInterface>;
     static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorAppEventService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<HomedecoratorAppEventService>;
 }

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

@@ -5,7 +5,7 @@ import { Euler, Vector3 } from 'three';
 import { DecoNode } from '@colijnit/configuratorapi/build/model/deco-node';
 import { Selection } from '@colijnit/configuratorapi/build/model/selection';
 import { AdjustableElementInterface } from '../../../core/interface/adjustable-element.interface';
-import { ExternalSettingsInterface } from '../../../core/interface/external-settings.interface';
+import { HomedecoratorExternalSettingsInterface } from '../../../core/interface/homedecorator-external-settings.interface';
 /** Meta data for items. */
 export interface Metadata {
     itemName?: string;
@@ -34,7 +34,7 @@ export interface Metadata {
     updatePivotOnCreate?: boolean;
     elementConfiguration?: AdjustableElementInterface[];
     obsolete?: boolean;
-    externalSettings?: ExternalSettingsInterface;
+    externalSettings?: HomedecoratorExternalSettingsInterface;
     thirdPartyModel?: boolean;
     usePivot?: boolean;
     decos?: DecoNode[];

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

@@ -0,0 +1,27 @@
+import { OnDestroy } from '@angular/core';
+import { PerspectiveCamera, Scene, WebGLRenderer } from 'three';
+import { ConfigurationService } from '../../../core/service/configuration.service';
+import * as i0 from "@angular/core";
+export declare class PostProcessingService implements OnDestroy {
+    private _configurationService;
+    private _composer;
+    private _n8aoPass;
+    private _scene;
+    private _renderer;
+    private _camera;
+    private _effectController;
+    private _postProcessingGui;
+    private _subs;
+    constructor(_configurationService: ConfigurationService);
+    ngOnDestroy(): void;
+    init(renderer: WebGLRenderer, scene: Scene, camera: PerspectiveCamera, width: number, height: number): void;
+    private _updatePass;
+    setSize(width: number, height: number): void;
+    render(): void;
+    showGui(): void;
+    hideGui(): void;
+    private _showHideGui;
+    private _createGui;
+    static ɵfac: i0.ɵɵFactoryDeclaration<PostProcessingService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<PostProcessingService>;
+}

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

@@ -11,6 +11,7 @@ import { ViewModeService } from '../../../core/service/view-mode.service';
 import { OutlineService } from './outline.service';
 import { HomedecoratorSettingsService } from '../../../core/service/homedecorator-settings.service';
 import { WebGLPathTracer } from 'three-gpu-pathtracer';
+import { PostProcessingService } from './post-processing.service';
 import * as i0 from "@angular/core";
 export declare class SceneService implements OnDestroy {
     private _cameraService;
@@ -22,6 +23,7 @@ export declare class SceneService implements OnDestroy {
     private _viewModeService;
     private _outlineService;
     private _settingsService;
+    private _postProcessing;
     set needsRender(value: boolean);
     get needsRender(): boolean;
     scene: Scene;
@@ -44,7 +46,7 @@ export declare class SceneService implements OnDestroy {
     private _subs;
     private _maxRenderSamples;
     private _numberOfSamplesRendered;
-    constructor(_cameraService: CameraService, _configurationService: ConfigurationService, _xrService: XrService, _vrService: VrService, _arService: ArService, _messageBusService: MessageBusService, _viewModeService: ViewModeService, _outlineService: OutlineService, _settingsService: HomedecoratorSettingsService);
+    constructor(_cameraService: CameraService, _configurationService: ConfigurationService, _xrService: XrService, _vrService: VrService, _arService: ArService, _messageBusService: MessageBusService, _viewModeService: ViewModeService, _outlineService: OutlineService, _settingsService: HomedecoratorSettingsService, _postProcessing: PostProcessingService);
     ngOnDestroy(): void;
     getScene(): Scene;
     set arMode(value: boolean);
@@ -58,6 +60,7 @@ export declare class SceneService implements OnDestroy {
     private _initScene;
     private _initCamera;
     private _initOutline;
+    private _initPostProcessing;
     private _initPathTracer;
     private _initRenderer;
     private _resizeRendererToDisplaySize;

package/app/plugins/product-catalog/own-collection-catalog/product-own-collection.component.d.ts

@@ -1,16 +1,16 @@
 import { EventEmitter } from '@angular/core';
-import { ArticleListObjectExtended } from '@colijnit/configuratorapi/build/model/article-list-object-extended';
-import { ExternalSettingsInterface } from '../../../core/interface/external-settings.interface';
+import { HomedecoratorExternalSettingsInterface } from '../../../core/interface/homedecorator-external-settings.interface';
+import { ArticleListObjectExtended } from '@colijnit/articleapi/build/model/article-list-object-extended.bo';
 import * as i0 from "@angular/core";
 export declare class ProductOwnCollectionComponent {
     settings: any;
     articleClick: EventEmitter<{
         article: ArticleListObjectExtended;
-        settings?: ExternalSettingsInterface;
+        settings?: HomedecoratorExternalSettingsInterface;
     }>;
     arButtonClick: EventEmitter<{
         article: ArticleListObjectExtended;
-        settings?: ExternalSettingsInterface;
+        settings?: HomedecoratorExternalSettingsInterface;
     }>;
     handleArticleClick(article: ArticleListObjectExtended): void;
     handleArButtonClick(article: ArticleListObjectExtended): void;

package/app/plugins/product-catalog/product-catalog/product-catalog.component.d.ts

@@ -14,9 +14,10 @@ import { CatalogService } from '@colijnit/catalog';
 import { DynamicScriptService } from '../../../service/dynamic-script.service';
 import { HomedecoratorConnectorService } from '../../../core/service/homedecorator-connector.service';
 import { HomedecoratorConnectorAdapterService } from '../../../core/service/homedecorator-connector-adapter.service';
-import { ExternalSettingsInterface } from '../../../core/interface/external-settings.interface';
-import { ArticleListObjectExtended } from '@colijnit/configuratorapi/build/model/article-list-object-extended';
+import { HomedecoratorExternalSettingsInterface } from '../../../core/interface/homedecorator-external-settings.interface';
 import { ThirdPartyModelService } from '../../threedselector/threedselector/service/third-party-model.service';
+import { ExternalSourceArticleClickInterface } from '@colijnit/articleapi/build/interface/external-source-article-click.interface';
+import { ArticleListObjectExtended } from '@colijnit/articleapi/build/model/article-list-object-extended.bo';
 import * as i0 from "@angular/core";
 export declare class ProductCatalogComponent implements OnInit, OnDestroy {
     settingsService: HomedecoratorSettingsService;
@@ -49,13 +50,10 @@ export declare class ProductCatalogComponent implements OnInit, OnDestroy {
     ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
     hideCatalog(): void;
-    handleArticleClick(data: {
-        article: ArticleListObjectExtended;
-        settings: ExternalSettingsInterface;
-    }, catalogInfo?: ExternalCatalogStartupInfo): void;
+    handleArticleClick(data: ExternalSourceArticleClickInterface, catalogInfo?: ExternalCatalogStartupInfo): void;
     handleArButtonClick(data: {
         article: ArticleListObjectExtended;
-        settings: ExternalSettingsInterface;
+        settings: HomedecoratorExternalSettingsInterface;
     }): void;
     handleExternalSourceClick(source?: ExternalSourceViewmodel): Promise<void>;
     handleShowOwnCollectionClick(event: MouseEvent): void;

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

@@ -67,6 +67,7 @@ export declare class FloorplannerComponent implements AfterViewInit, OnDestroy {
     private _diagramScale;
     private _cameraZoom;
     private _lastTouchPoint;
+    private _readyToDraw;
     readonly floorplannerMode: typeof FloorplannerMode;
     readonly initialViewScale = 100;
     readonly scalingFactor = 1.2;

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

@@ -35,6 +35,7 @@ export declare class SettingsComponent implements OnInit, OnDestroy {
     rotationSnappingEnabled: boolean;
     showCameraControls: boolean;
     showLightControls: boolean;
+    showPostProcessingSettings: boolean;
     showWalls: boolean;
     showCeiling: boolean;
     wallSnapping: boolean;

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

@@ -39,6 +39,7 @@ import { PermanentStoreService } from '../../../core/service/permanent-store.ser
 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 * as i0 from "@angular/core";
 export declare class RoomPlannerComponent implements OnInit, OnDestroy, PluginInterface {
     iconService: HomedecoratorIconCacheService;
@@ -67,6 +68,7 @@ export declare class RoomPlannerComponent implements OnInit, OnDestroy, PluginIn
     private _permanentStoreService;
     private _appEventService;
     private _connectorService;
+    private _connectorAdapterService;
     floorplanner: FloorplannerComponent;
     toolbarIconLibrary: TemplateRef<any>;
     toolbarIconAccessoires: TemplateRef<any>;
@@ -133,7 +135,7 @@ export declare class RoomPlannerComponent implements OnInit, OnDestroy, PluginIn
     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);
+    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);
     handleDocKeyDown(event: KeyboardEvent): void;
     get selectedEdges(): any[];
     ngOnInit(): Promise<void>;