@colijnit/homedecorator 261.20.1 → 261.20.2

package/index.d.ts

@@ -1207,7 +1207,7 @@ declare class HomedecoratorConnectorService implements OnDestroy {
     getImageById(id: number): any;
     beforeLoadPreset(): Promise<void>;
     afterLoadPreset(): Promise<void>;
-    initConnection(forceReload?: boolean, standAlone?: boolean): Promise<void>;
+    initConnection(forceReload?: boolean, loadExternalSources?: boolean): Promise<void>;
     getInternalParameter(param: InternalParam): Promise<string>;
     getDefaultLanguage(upId: number): Promise<string>;
     googleTranslateEnabled(): Promise<boolean>;
@@ -1727,7 +1727,8 @@ declare class HomedecoratorAppService implements OnDestroy {
     settingsLoaded: BehaviorSubject<Setting[]>;
     loadedHelpGifs: BehaviorSubject<MediaResource[]>;
     materialPreviewSet: BehaviorSubject<string>;
-    materialPreviewUpdate: BehaviorSubject<any>;
+    materialPreviewLoaded: BehaviorSubject<any>;
+    materialPreviewUpdate: BehaviorSubject<Blob>;
     allLoaded: BehaviorSubject<boolean>;
     userRegistered: boolean;
     private _sku;
@@ -2298,6 +2299,7 @@ declare class CustomObject3D extends THREE.Object3D {
  */
 declare class Item extends BaseItem {
     rawMetadata: Metadata;
+    private _metadataSet;
     set allwaysConfigureMode(value: boolean);
     get allwaysConfigureMode(): boolean;
     set configuring(value: boolean);
@@ -2854,7 +2856,7 @@ declare class HomedecoratorService {
     private _connectorService;
     loaded: BehaviorSubject<boolean>;
     constructor(_settingsService: HomedecoratorSettingsService, _connectorService: HomedecoratorConnectorService);
-    init(settings: HomedecoratorSettings, forceReload?: boolean): Promise<void>;
+    init(settings: HomedecoratorSettings, forceReload?: boolean, loadExternalSources?: boolean): Promise<void>;
     static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<HomedecoratorService>;
 }
@@ -3270,7 +3272,7 @@ declare abstract class WallItem extends Item {
     resized(): void;
     getMaskedGeometry(): BufferGeometry$1;
     /** */
-    placeOnWall(wall: WallInterface): void;
+    placeOnWall(wall: WallInterface, force?: boolean): void;
     reposition(): void;
     getFloorY(): number;
     isValidPosition(position: Vector3, rotation?: Euler, options?: any): CollisionInfo;
@@ -5513,6 +5515,7 @@ declare abstract class BuildFurnitureBaseService implements OnDestroy {
     selectSelectionAsAnswer(chosenOption: SelectorStructure, metadata: Metadata): Promise<void>;
     createConfigurableItemWithObject(instanceId: string, metadata: Metadata, object: Object3D): Item;
     createFloorWithMaterial(instanceId: string, metadata: Metadata, material: Material): CustomFloorGroupResult;
+    replaceCurrentItem(newItem: Item, metadata: Metadata, animate?: boolean): Promise<Item>;
     protected prepareInstanceForBuild(shouldCopyInstance: boolean, loadFromProject: boolean, looseOriginalConfiguration: boolean, result: CustomFloorGroupResult): Promise<CustomFloorGroupResult>;
     protected getSelectionsAndDecos(): Promise<void>;
     protected handlePrepareSelectionsDecos(result: CustomFloorGroupResult): Promise<CustomFloorGroupResult>;
@@ -5551,7 +5554,6 @@ declare abstract class BuildFurnitureBaseService implements OnDestroy {
     protected createPositionAnimation(object: Object3D, from: Vector3, to: Vector3, easing: TWEEN.Easing): Promise<void>;
     protected animateChanges(furniture: Item, changes: ChangesInterface[]): Promise<void[]>;
     protected cloneSelections(): Selection[];
-    replaceCurrentItem(newItem: Item, metadata: Metadata, animate?: boolean): Promise<Item>;
     protected isMoveableObject(obj: Object3D): boolean;
     protected addElementOnConnector(currentItem: Item, element: Object3D, connector: string, connectedNodeId: number): Promise<void>;
     protected saveElementConnector(element: Object3D, connector: string): void;
@@ -5895,7 +5897,6 @@ declare class SelectedChildMaterialComponent implements OnInit {
 
 declare class SelectedChildMaterialTextureComponent {
     iconService: HomedecoratorIconCacheService;
-    private _sceneService;
     readonly icon: typeof IconEnum;
     input: ElementRef;
     set map(value: Texture$1);
@@ -5940,7 +5941,7 @@ declare class SelectedChildMaterialTextureComponent {
     private _map;
     private _loadedImage;
     private _color;
-    constructor(iconService: HomedecoratorIconCacheService, _sceneService: SceneService);
+    constructor(iconService: HomedecoratorIconCacheService);
     showLargeImage(): void;
     hideZoomImage(event: MouseEvent): void;
     showColorPicker(): void;
@@ -6283,7 +6284,7 @@ declare class NewRenderService implements OnDestroy {
     private _dictionaryService;
     renderImageChanged: BehaviorSubject<string>;
     renderImageError: BehaviorSubject<string>;
-    blenderRenderStarted: EventEmitter<string>;
+    blenderRenderStarted: Subject<string>;
     renderUpdateImageChanged: BehaviorSubject<{
         image: string;
         progress: number;
@@ -6444,7 +6445,7 @@ declare class SliderInputModule {
 
 declare class Core3dModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<Core3dModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<Core3dModule, [typeof SceneDirective, typeof Core3dComponent, typeof SceneControlComponent, typeof WalkthroughCameraControlsComponent, typeof LightplanComponent, typeof EditLightComponent, typeof SceneOptionsComponent, typeof EditLightplanComponent, typeof ArGuiRootComponent, typeof ArGuiButtonsComponent, typeof ArGuiConfiguratorComponent, typeof ArGuiContextMenuComponent, typeof ArGuiNotificationsComponent], [typeof CoreModule, typeof i3.CommonModule, typeof i6.FormsModule, typeof i5$1.MatInputModule, typeof i4.MatButtonModule, typeof i19.MatCheckboxModule, typeof i8.MatTooltipModule, typeof i11.MatSliderModule, typeof i10.MatSelectModule, typeof DevelopmentModule, typeof i7$1.IconModule, typeof ToolbarIconModule, typeof ZoomControlsModule, typeof RenderModule, typeof i7.MatIconModule, typeof i29.MatProgressBarModule, typeof SliderInputModule, typeof i31.MatOptionModule, typeof i19.MatCheckboxModule], [typeof Core3dComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<Core3dModule, [typeof SceneDirective, typeof Core3dComponent, typeof SceneControlComponent, typeof WalkthroughCameraControlsComponent, typeof LightplanComponent, typeof EditLightComponent, typeof SceneOptionsComponent, typeof EditLightplanComponent, typeof ArGuiRootComponent, typeof ArGuiButtonsComponent, typeof ArGuiConfiguratorComponent, typeof ArGuiContextMenuComponent, typeof ArGuiNotificationsComponent], [typeof CoreModule, typeof i3.CommonModule, typeof i6.FormsModule, typeof i5$1.MatInputModule, typeof i4.MatButtonModule, typeof i19.MatCheckboxModule, typeof i8.MatTooltipModule, typeof i11.MatSliderModule, typeof i10.MatSelectModule, typeof DevelopmentModule, typeof i7$1.IconModule, typeof ToolbarIconModule, typeof ZoomControlsModule, typeof RenderModule, typeof i7.MatIconModule, typeof i29.MatProgressBarModule, typeof SliderInputModule, typeof i31.MatOptionModule, typeof i19.MatCheckboxModule], [typeof Core3dComponent, typeof SceneDirective]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<Core3dModule>;
 }
 
@@ -7170,7 +7171,7 @@ declare class TextureEditorComponent implements OnInit, OnChanges, OnDestroy {
     dampSetTexture: any;
     createDampener: (emitter: any) => {
         emit: (value: any) => void;
-        release: () => void;
+        release: () => any;
     };
     constructor(messageService: MessageBusService, _settingsService: HomedecoratorSettingsService);
     ngOnInit(): void;
@@ -7676,12 +7677,16 @@ declare class FloorCatalogComponent implements OnInit, OnDestroy {
 }
 
 declare class CustomShapeFloorItem extends FloorItem {
+    oldPosition: Vector3;
+    oldElevation: number;
     get customMesh(): Mesh;
     constructor(metadata: Metadata, object: Object3D | Mesh, texture?: Texture);
     cloneItem(): CustomShapeFloorItem;
 }
 
 declare class CustomShapeWallItem extends WallItem {
+    oldPosition: Vector3;
+    oldElevation: number;
     get customMesh(): Mesh;
     constructor(metadata: Metadata, object: Mesh | Object3D, texture?: Texture);
     cloneItem(): CustomShapeWallItem;
@@ -7729,6 +7734,8 @@ declare class CustomShapeCreatorComponent implements OnInit {
     private _updateShapesColor;
     setTexture(texture: Texture): Promise<void>;
     toggleItemType(): void;
+    private _createAsFloorType;
+    private _createAsWallType;
     private _updateShapesTexture;
     private _setShapeMaterial;
     static ɵfac: i0.ɵɵFactoryDeclaration<CustomShapeCreatorComponent, never>;
@@ -7978,17 +7985,17 @@ declare class ExportPdfModule {
 
 interface MaterialDialogData {
     object: Item;
+    settingsService: any;
     sceneService: any;
 }
 
 declare class MaterialDialogComponent implements OnInit, OnDestroy {
     data: MaterialDialogData;
-    private _settingsService;
     availableMeshes: Mesh[];
     selectedMesh: Mesh;
     showMaps: boolean;
     private _subs;
-    constructor(data: MaterialDialogData, _settingsService: HomedecoratorSettingsService);
+    constructor(data: MaterialDialogData);
     ngOnInit(): void;
     ngOnDestroy(): void;
     handleMapChange(mapChange: MapChange): void;
@@ -8261,11 +8268,11 @@ declare class ThreedselectorComponent implements OnInit, OnDestroy {
     cancelElementReplace(rebuild?: boolean): void;
     openAnimationSidebar(): void;
     setModelErrorDialog(): void;
-    handleBuildResult(result: ConfigurationResultObject): void;
+    handleBuildResult(result: ConfigurationResultObject): Promise<CustomFloorGroupResult>;
     handleErrorMessages(errors: ConfiguratorErrorMessage[]): void;
     setMetadateFromObject(result: ConfigurationResultObject): Metadata;
     showConfiguratorChange(show: boolean): void;
-    loadFurnitureFromSku(position: Vector3, sku: string, settings?: HomedecoratorExternalSettingsInterface): Promise<void>;
+    loadFurnitureFromSku(position: Vector3, sku: string, settings?: HomedecoratorExternalSettingsInterface): Promise<CustomFloorGroupResult>;
     configureFurniture(object: Item | ItemGroup): Promise<void>;
     private _setSourceSettings;
     private _closeConfigurator;
@@ -9396,5 +9403,45 @@ declare class HomedecoratorModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<HomedecoratorModule>;
 }
 
-export { ConfigurationService, HomedecoratorAppEventService, HomedecoratorComponent, HomedecoratorModule, HomedecoratorService };
+declare class MaterialBuilderComponent implements OnInit, OnDestroy {
+    appService: HomedecoratorAppService;
+    controllerService: HomedecoratorConnectorService;
+    appState: AppStateService;
+    settingsService: HomedecoratorSettingsService;
+    presetsService: PresetsService;
+    private _bluePrintService;
+    private _viewModeService;
+    private _homedecoratorService;
+    private _parentEventService;
+    private _ownEventService;
+    private _integrationService;
+    private _sceneService;
+    private _webWorkerService;
+    set settings(value: any);
+    get settings(): any;
+    set materialPreview(value: string);
+    set materialPreviewUpdate(value: Blob);
+    showClass: boolean;
+    loaded: boolean;
+    title: string;
+    private _subs;
+    private _settings;
+    private _eventService;
+    constructor(appService: HomedecoratorAppService, // don't remove this, needs to be created on a high level
+    controllerService: HomedecoratorConnectorService, appState: AppStateService, settingsService: HomedecoratorSettingsService, presetsService: PresetsService, _bluePrintService: BluePrintService, _viewModeService: ViewModeService, _homedecoratorService: HomedecoratorService, _parentEventService: HomedecoratorAppEventService, _ownEventService: HomedecoratorAppEventService, _integrationService: IntegrationService, _sceneService: SceneService, _webWorkerService: WebWorkerService);
+    ngOnInit(): Promise<void>;
+    ngOnDestroy(): void;
+    handleExternalSave(): void;
+    private _initConnection;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MaterialBuilderComponent, [null, null, null, null, null, null, null, null, { optional: true; skipSelf: true; }, { optional: true; self: true; }, null, null, null]>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MaterialBuilderComponent, "co-material-builder", never, { "settings": { "alias": "settings"; "required": false; }; "materialPreview": { "alias": "materialPreview"; "required": false; }; "materialPreviewUpdate": { "alias": "materialPreviewUpdate"; "required": false; }; }, {}, never, never, false, never>;
+}
+
+declare class MaterialBuilderModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MaterialBuilderModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MaterialBuilderModule, [typeof MaterialBuilderComponent], [typeof LoadingOverlayModule, typeof RoomPlannerModule, typeof Core3dModule, typeof ThreedselectorModule, typeof ToolbarModule, typeof i25.LiteSelectorModule, typeof DevelopmentModule, typeof HdLoaderModule], [typeof MaterialBuilderComponent]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<MaterialBuilderModule>;
+}
+
+export { ConfigurationService, HomedecoratorAppEventService, HomedecoratorComponent, HomedecoratorModule, HomedecoratorService, MaterialBuilderComponent, MaterialBuilderModule };
 export type { ExternalSave };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/homedecorator",
-  "version": "261.20.1",
+  "version": "261.20.2",
   "description": "Homedecorator application based on 261 version of iOne backend",
   "repository": "npm/npm",
   "author": "Colijn IT",
@@ -11,7 +11,7 @@
     "@angular/core": ">=20.0.0",
     "@colijnit/catalog": ">=261.20.0",
     "@colijnit/articleapi": ">=261.1.0",
-    "@colijnit/configurator": ">=261.20.0",
+    "@colijnit/configurator": ">=261.20.4",
     "@colijnit/configuratorapi": ">=261.1.3",
     "@colijnit/corecomponents_v12": ">=261.20.0",
     "@colijnit/ioneconnector": ">=261.1.3",
@@ -32,6 +32,7 @@
     "ngx-color": "^10.1.0",
     "ngx-device-detector": "^10.1.0",
     "polygon-tools": "^0.4.8",
+    "postprocessing": "^6.36.1",
     "textdiff-patch": "^1.0.5",
     "three": "^0.178.0",
     "three-bvh-csg": "0.0.17",

package/style/homedecorator-globals.scss

@@ -32,6 +32,31 @@ $scrollbar-small-stop-point: 25%;
   font-feature-settings: 'liga';
 }
 
+#material_color_dialog {
+  max-height: 600px;
+  width: 600px;
+  background: white;
+  overflow: hidden;
+  color: $hd-color-primary;
+  .co-list-of-values {
+    color: $hd-color-primary;
+  }
+  .mat-dialog-content {
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+  }
+  .part-material {
+    margin-top: 20px;
+    flex-basis: 100%;
+    overflow: auto;
+    .material-color {
+      display: block;
+      height: 40px;
+    }
+  }
+}
+
 .co-homedecorator {
   //> * {
   //  pointer-events: none;

package/style/material.scss

@@ -58,9 +58,9 @@ $mat-font-family: mat.m2-define-typography-config($font-family: "Montserrat, Ari
   padding: 0 !important;
 }
 
-.mat-mdc-dialog-surface {
-  padding: 24px;
-}
+//.mat-mdc-dialog-surface {
+//  padding: 24px;
+//}
 .mat-mdc-option {
   .mdc-list-item__primary-text {
     color: #000000 !important;
@@ -83,6 +83,11 @@ $mat-font-family: mat.m2-define-typography-config($font-family: "Montserrat, Ari
 }
 
 :root {
+  @include mat.dialog-overrides((
+          content-padding: 24px,
+          container-color: white
+
+  ));
   @include mat.slider-overrides((
           active-track-color: $hd-color-main,
           focus-handle-color: $hd-color-main,
@@ -166,3 +171,31 @@ $mat-font-family: mat.m2-define-typography-config($font-family: "Montserrat, Ari
   height: 24px !important;
   width: 24px !important;
 }
+
+.mat-mdc-dialog-container {
+  padding: 24px;
+  background-color: white;
+  border-radius: 4px;
+  h2, h3, h4, p {
+    margin: 0;
+    padding: 0;
+    margin-block-start: 0;
+    margin-block-end: 0;
+    margin-inline-start: 0;
+    margin-inline-end: 0;
+  }
+  .mat-mdc-dialog-surface {
+    box-shadow: none;
+    border-radius: 0;
+  }
+}
+
+.mat-mdc-dialog-content {
+  .mat-mdc-list-item {
+    height: 72px !important;
+  }
+  .mdc-list-item__primary-text {
+    color: #000000 !important;
+    white-space: break-spaces;
+  }
+}

package/style/styles.scss

@@ -354,18 +354,20 @@ canvas {
 @import "../../client/app/core/components/lightbox/style/material.scss";
 
 @import "@colijnit/corecomponents_v12/lib/style/corecomponents-globals";
+@import "@colijnit/corecomponents_v12/lib/components/button/style/material.scss";
 @import "@colijnit/corecomponents_v12/lib/components/icon/style/material.scss";
 @import "@colijnit/corecomponents_v12/lib/components/input-text/style/material.scss";
 @import "@colijnit/corecomponents_v12/lib/components/input-search/style/material.scss";
 @import "@colijnit/corecomponents_v12/lib/components/collapsible/style/material.scss";
 @import "@colijnit/corecomponents_v12/lib/components/input-checkbox/style/material.scss";
 @import "@colijnit/corecomponents_v12/lib/components/input-radio-button/style/material.scss";
-@import "@colijnit/corecomponents_v12/lib/components/icon/style/material.scss";
 @import "@colijnit/corecomponents_v12/lib/components/filter-item/style/material.scss";
 @import "@colijnit/corecomponents_v12/lib/components/pagination-bar/style/material.scss";
 @import "@colijnit/corecomponents_v12/lib/components/image/style/material.scss";
 @import "@colijnit/corecomponents_v12/lib/components/loader/style/material.scss";
 @import "@colijnit/corecomponents_v12/lib/components/list-of-values/style/material.scss";
+@import "@colijnit/corecomponents_v12/lib/components/card/style/material.scss";
+
 @import "@colijnit/catalog/lib/style/catalog-globals";
 @import "@colijnit/catalog/lib/component/catalog-search/style/material";
 @import "@colijnit/catalog/lib/component/catalog-search-header/style/material";
@@ -378,7 +380,7 @@ canvas {
 @import "@colijnit/catalog/lib/component/catalog-external-source/style/material";
 @import "@colijnit/catalog/lib/component/catalog-navigation/style/material";
 
-@import "@colijnit/configurator/lib/style/template_variables.scss";
+@import "@colijnit/configurator/lib/style/variables.scss";
 @import '@colijnit/configurator/lib/components/configurator/style/material.scss';
 @import '@colijnit/configurator/lib/components/configurator-loader/style/material.scss';
 @import '@colijnit/configurator/lib/components/scene-options/style/material.scss';
@@ -403,4 +405,4 @@ canvas {
 @import '@colijnit/configurator/lib/components/color-filter/style/material.scss';
 @import '@colijnit/configurator/lib/components/tag-filter/style/material.scss';
 @import "@colijnit/configurator/lib/components/image-zoom/style/material.scss";
-
+@import "@colijnit/configurator/lib/components/slideout/style/material.scss";