@colijnit/homedecorator 261.20.7 → 261.20.9

package/index.d.ts

@@ -500,7 +500,9 @@ declare class HomedecoratorSettingsOptions {
     useAnimations: boolean;
     useThreedScene: boolean;
     showSlowConnectionWarning: boolean;
-    useExternalOpenSave: boolean;
+    useExternalSave: boolean;
+    useExternalOpen: boolean;
+    shadowSaveToCloud: boolean;
     floorFadeStart: number;
     floorFadeEnd: number;
 }
@@ -682,6 +684,7 @@ declare class FloorPlaneItem extends Item {
 interface ExternalSave {
     screenShot: string;
     project: string;
+    code: string;
 }
 
 declare class HomedecoratorAppEventService {
@@ -704,8 +707,11 @@ declare class HomedecoratorAppEventService {
     glbCreated: Subject<string>;
     dirty: Subject<boolean>;
     floorCreated: BehaviorSubject<FloorPlaneItem>;
-    externalSave: BehaviorSubject<ExternalSave>;
+    externalSave: Subject<ExternalSave>;
+    externalOpen: Subject<void>;
     searchClick: Subject<void>;
+    shareProject: Subject<void>;
+    configurationFromPresetLoaded: Subject<boolean>;
     static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorAppEventService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<HomedecoratorAppEventService>;
 }
@@ -2056,6 +2062,7 @@ interface Metadata {
     colorable?: boolean;
     default180?: boolean;
     objectUUID?: string;
+    materialDiff?: any;
     conversionGTMSend?: boolean;
     conversionSubmittedPrice?: string;
     hdecoType?: string;
@@ -2355,6 +2362,7 @@ declare class Item extends BaseItem {
     beforeRemoveFromWall(): void;
     protected handlePositionFromRawMetadata(): void;
     protected handleScaleFromRawMetadata(): void;
+    protected handleMaterialDiffFromRawMetadata(): void;
     protected handleElevationFromRawMetadata(): void;
     protected handleRotationFromRawMetadata(): void;
     private _fakeHandler;
@@ -2727,8 +2735,8 @@ declare class UtilsService implements OnDestroy {
 
 type StateValue = string;
 type Action = string;
-type CreateStateInterface = () => StateValue;
-type ApplyStateInterface = (StateValue: any) => void;
+type CreateStateInterface = () => StateValue | Promise<StateValue>;
+type ApplyStateInterface = (state: StateValue) => void | Promise<void>;
 interface StateApi {
     createState: CreateStateInterface;
     applyState: ApplyStateInterface;
@@ -2775,6 +2783,7 @@ declare class AppStateService implements OnDestroy {
 interface PluginInterface {
     getObjects: Function;
     loadObjects: Function;
+    saveObjects: Function;
     copySceneInstance: Function;
 }
 
@@ -2842,7 +2851,8 @@ declare class PresetsService implements OnDestroy {
     ngOnDestroy(): void;
     register(plugin: PluginInterface): void;
     reopenState(model: string): void;
-    createState(): StateValue;
+    createState(save?: boolean): Promise<StateValue>;
+    saveToCloud(asNew?: boolean): Promise<string>;
     private _loadSavedRoomFromPreset;
     private _loadSavedRoomFromCloud;
     private _clear;
@@ -2906,6 +2916,7 @@ declare class HomedecoratorComponent implements OnInit, OnDestroy {
     set initCommunication(value: boolean);
     get initCommunication(): boolean;
     projectToLoad: string;
+    shareButton: boolean;
     set settings(value: any);
     get settings(): any;
     showClass: boolean;
@@ -2925,14 +2936,15 @@ declare class HomedecoratorComponent implements OnInit, OnDestroy {
     ngOnDestroy(): void;
     registerCustomIcons(): void;
     keyup(event: KeyboardEvent): void;
-    handleExternalSave(): void;
+    handleExternalSave(code: string): Promise<void>;
+    handleExternalOpen(): Promise<void>;
     private _startWithRoom;
     private _startWithEmptyRoom;
     private _startWithPreset;
     private _setCommunication;
     private _initConnection;
     static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorComponent, [null, null, null, null, null, null, null, null, null, { optional: true; skipSelf: true; }, { optional: true; self: true; }, null, null, null, null]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<HomedecoratorComponent, "co-homedecorator", never, { "generalFilterOrders": { "alias": "generalFilterOrders"; "required": false; }; "purchaseFilterOrders": { "alias": "purchaseFilterOrders"; "required": false; }; "logisticsFilterOrders": { "alias": "logisticsFilterOrders"; "required": false; }; "initCommunication": { "alias": "initCommunication"; "required": false; }; "projectToLoad": { "alias": "projectToLoad"; "required": false; }; "settings": { "alias": "settings"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<HomedecoratorComponent, "co-homedecorator", never, { "generalFilterOrders": { "alias": "generalFilterOrders"; "required": false; }; "purchaseFilterOrders": { "alias": "purchaseFilterOrders"; "required": false; }; "logisticsFilterOrders": { "alias": "logisticsFilterOrders"; "required": false; }; "initCommunication": { "alias": "initCommunication"; "required": false; }; "projectToLoad": { "alias": "projectToLoad"; "required": false; }; "shareButton": { "alias": "shareButton"; "required": false; }; "settings": { "alias": "settings"; "required": false; }; }, {}, never, never, false, never>;
 }
 
 declare class ProgressBarComponent {
@@ -3931,6 +3943,41 @@ declare class BaseWall extends Mesh implements BluePrintWall {
     private _updateDirectionVector;
     private _positionWall;
     private _reCreateWallGeometry;
+    /**
+     * Build the wall solid in wall-local space as a mitred prism. The footprint comes from
+     * _footprintCornersLocal() (symmetric mitre, so adjacent walls meet exactly and never overlap).
+     * Six faces map onto the same material indices as the old BoxGeometry: room-facing (+Z) = front,
+     * far side (-Z) = back, the two ends are the caps (index 0 = start/+X, index 1 = end/-X), plus
+     * top (2) and bottom (3). A degenerate footprint falls back to a straight rectangle.
+     */
+    private _createWallGeometry;
+    /**
+     * Append one planar quad (a->b->c->d) as two triangles. Winding is chosen so the face normal
+     * points along `outward`, so all faces are correctly oriented for FrontSide rendering regardless
+     * of how the mitred corners fall. UVs span 0..1 (U across, V up) so wall textures tile as before.
+     */
+    private _pushQuad;
+    private _toLocal;
+    /**
+     * The wall footprint (interior/exterior corners at both ends) in wall-local space, computed
+     * symmetrically so adjacent walls agree on the shared corner. calculateCorners()/GetHalfAngleVector
+     * offset the neighbour's line using THIS wall's interiorSign; when two neighbours are wound in
+     * opposite directions (common after loading a saved project) they then compute slightly different
+     * mitre points, leaving an overlap wedge that z-fights. Here the mitre is the intersection of the
+     * two walls' offset lines, using roomCenter as the shared "which side is inside" reference, so both
+     * neighbours produce the identical point. Free ends (no single neighbour) get a straight cap.
+     */
+    private _footprintCornersLocal;
+    /** Interior + exterior footprint point at one wall end, mitred with the single connected neighbour. */
+    private _cornerFootprint;
+    /** The single other wall attached to this corner, or null for free ends and >2-wall junctions. */
+    private _neighbourAtCorner;
+    /** Point on the segment p1->corner shifted perpendicular by `off` (>0 toward room, <0 away). */
+    private _offsetPoint;
+    /** Offset the segment p1->p2 sideways by `off` (>0 toward room); returns a point + direction, or null if degenerate. */
+    private _offsetLine;
+    /** Intersection of the two walls' offset lines (side=1 interior, side=-1 exterior), or null if parallel. */
+    private _intersectOffsetLines;
     private _disposePreviousGeometries;
 }
 
@@ -5164,6 +5211,7 @@ declare class Core3dComponent implements OnInit, OnDestroy, PluginInterface {
     getObjects(): {
         view: any;
     };
+    saveObjects(): Promise<void>;
     copySceneInstance(saveAs: boolean): Promise<void>;
     loadObjects(data: any): Promise<any>;
     private _viewModeChanged;
@@ -5497,8 +5545,6 @@ declare abstract class BuildFurnitureBaseService implements OnDestroy {
     get useNodeIdToLink(): boolean;
     get currentCustomFloorGroup(): Item;
     set currentCustomFloorGroup(item: Item);
-    get standAlone(): boolean;
-    set standAlone(value: boolean);
     get selections(): Selection[];
     get scene(): Scene;
     defaultPosition: Vector3;
@@ -5565,7 +5611,7 @@ declare abstract class BuildFurnitureBaseService implements OnDestroy {
     replaceSelection(selection: Selection, metadata: Metadata): Promise<void>;
     selectAnswer(answer: Answer, input: string, metadata: Metadata): Promise<void>;
     selectSelectionAsAnswer(chosenOption: SelectorStructure, metadata: Metadata): Promise<void>;
-    createConfigurableItemWithObject(instanceId: string, metadata: Metadata, object: Object3D): Item;
+    createConfigurableItemWithObject(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>;
@@ -7007,6 +7053,7 @@ declare class RoomPlannerComponent implements OnInit, OnDestroy, PluginInterface
         floorplan: BluePrintFloorplan;
         items: {}[];
     };
+    saveObjects(): Promise<void>;
     hasCustomObjects(): boolean;
     onObjectLibraryClick(object: ModelInterface): void;
     onGroupClick(): void;
@@ -8018,6 +8065,7 @@ declare class FurnitureManagerComponent implements OnInit, OnDestroy, PluginInte
     loadNonIONEObjects(objects: any): Promise<void>;
     copySceneInstance(saveAs: boolean): Promise<void>;
     getObjects(): any;
+    saveObjects(): Promise<void>;
     hasCustomFurniture(): boolean;
     private _showWarning;
     private _isNonIONEObject;
@@ -8163,6 +8211,7 @@ declare class ThreedselectorComponent implements OnInit, OnDestroy {
     showProgressText: boolean;
     showLoaderBar: boolean;
     showFullConfiguration: boolean;
+    currentMetadata: Metadata;
     configuratorSettings: any;
     configuratorSku: string;
     configuratorInstanceId: string;
@@ -8181,6 +8230,7 @@ declare class ThreedselectorComponent implements OnInit, OnDestroy {
     private _loadedFromPreset;
     private _loadedFromProject;
     private _loadedShouldCopyInstance;
+    private _userActionNeeded;
     constructor(screenSizeService: ScreenSizeAnalysisService, _dialog: MatDialog, _appService: HomedecoratorAppService, _iOne: HomedecoratorConnectorService, _messageBus: MessageBusService, _loadFurnitureService: SwitchLoadFurnitureService, _buildFurnitureService: SwitchBuildFurnitureService, _toastService: ToastService, _messageService: MessageBusService, _sceneService: SceneService, _dialogService: DialogService, _cameraService: CameraService, _presetsService: PresetsService, _itemService: ItemService, _settingsService: HomedecoratorSettingsService, _appEventService: HomedecoratorAppEventService, _bluePrintService: BluePrintService, _wallService: WallService, _floorService: FloorService, _iconCacheService: HomedecoratorIconCacheService, _googleTagManager: GoogleTagManagerService, _appStateService: AppStateService, _progressService: ProgressService, _resizeService: ResizeService, _connectorAdapterService: HomedecoratorConnectorAdapterService, _lightPresetService: LightPresetsService, _variationService: VariationService, _configuringService: ConfiguringService, _configuratorEventService: ConfiguratorEventService, _changeDetector: ChangeDetectorRef);
     ngOnInit(): void;
     ngOnDestroy(): void;
@@ -8204,8 +8254,11 @@ declare class ThreedselectorComponent implements OnInit, OnDestroy {
     showConfiguratorChange(show: boolean): void;
     loadFurnitureFromSku(position: Vector3, sku: string, settings?: HomedecoratorExternalSettingsInterface): Promise<CustomFloorGroupResult>;
     configureFurniture(object: Item | ItemGroup): Promise<void>;
+    handleLoadIOneFurnitureIntoSceneByPreset(sku: string, instanceId: string, settings: Options): Promise<void>;
+    configureFurnitureFromPreset(sku: string, instanceId: string, settings?: Options): Promise<CustomFloorGroupResult>;
     private _initConfigurator;
     private _prepareSettings;
+    private _shouldResetConfigurator;
     private _resetConfigurator;
     private _waitForBuildToFinish;
     private _setSourceSettings;
@@ -8662,7 +8715,9 @@ declare class ToolbarComponent implements OnInit, OnDestroy, AfterViewInit {
     private _adapterService;
     private _connectionHealthService;
     private _homedecoratorEventService;
-    externalSave: EventEmitter<void>;
+    shareButton: boolean;
+    externalSave: EventEmitter<string>;
+    externalOpen: EventEmitter<void>;
     readonly toastType: typeof ToastType;
     readonly messageType: typeof MessageType;
     readonly icons: typeof IconEnum;
@@ -8680,7 +8735,9 @@ declare class ToolbarComponent implements OnInit, OnDestroy, AfterViewInit {
     interval: any;
     tooltipDisabled: boolean;
     badgeDisabled: boolean;
-    useExternalOpenSave: boolean;
+    useExternalSave: boolean;
+    useExternalOpen: boolean;
+    shadowSaveToCloud: boolean;
     enableSlowConnectionWarning: boolean;
     connectionStatus: string;
     private _subs;
@@ -8695,9 +8752,11 @@ declare class ToolbarComponent implements OnInit, OnDestroy, AfterViewInit {
     clickCloseLeftSidebar(): void;
     newRoom(): void;
     animateModel(element: Item): void;
-    handleExternalSave(): void;
-    openSaveDialog(): Promise<void>;
+    handleSave(saveOnOpen?: boolean): void;
+    handleExternalSave(): Promise<void>;
+    openSaveDialog(saveOnOpen?: boolean): Promise<void>;
     openOpenDialog(): void;
+    openShareDialog(): void;
     handleSearchButtonClick(): void;
     loadRoom(): Promise<void>;
     loadResizableRoom(): Promise<void>;
@@ -8711,7 +8770,6 @@ declare class ToolbarComponent implements OnInit, OnDestroy, AfterViewInit {
     saveNotification(): void;
     openDrawDiagram(file: any): void;
     openCroppingDiagram(file: any): void;
-    openModelPreview(file: any): void;
     showRenderError(data: ErrorDialogData): void;
     testRender(): void;
     openFaq(url: string): Window;
@@ -8725,7 +8783,7 @@ declare class ToolbarComponent implements OnInit, OnDestroy, AfterViewInit {
     private _registerToolbarIcon;
     private _closeLeftSidebar;
     static ɵfac: i0.ɵɵFactoryDeclaration<ToolbarComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<ToolbarComponent, "rp-toolbar", never, {}, { "externalSave": "externalSave"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ToolbarComponent, "rp-toolbar", never, { "shareButton": { "alias": "shareButton"; "required": false; }; }, { "externalSave": "externalSave"; "externalOpen": "externalOpen"; }, never, never, false, never>;
 }
 
 interface SavedDialogData {
@@ -9364,7 +9422,6 @@ declare class MaterialBuilderComponent implements OnInit, OnDestroy {
     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>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/homedecorator",
-  "version": "261.20.7",
+  "version": "261.20.9",
   "description": "Homedecorator application based on 261 version of iOne backend",
   "repository": "npm/npm",
   "author": "Colijn IT",

package/style/_variables.scss

@@ -2,6 +2,6 @@ $hd-color-primary: #171721 !default;
 $add-to-cart-button-color: #da9803 !default;
 $hd-color-main: #da9803 !default;
 $hd-color-main-accent: #da980380 !default;
-$hd-color-dialog-background: #F5F5F7 !default;
+$hd-color-dialog-background: #FAF8F7 !default;
 
 $hd-color-active-dark: #212437 !default;

package/style/material.scss

@@ -58,9 +58,6 @@ $mat-font-family: mat.m2-define-typography-config($font-family: "Montserrat, Ari
   padding: 0 !important;
 }
 
-//.mat-mdc-dialog-surface {
-//  padding: 24px;
-//}
 .mat-mdc-option {
   .mdc-list-item__primary-text {
     color: #000000 !important;

package/style/styles.scss

@@ -157,13 +157,20 @@ canvas {
   .part-material {
     margin-top: 20px;
     flex-basis: 100%;
-    overflow: auto;
+    overflow-x: hidden;
+    overflow-y: auto;
     .material-color {
       display: block;
       height: 40px;
     }
   }
 }
+#material_color_dialog {
+  width: 800px;
+  .mat-mdc-dialog-surface {
+    padding: 24px;
+  }
+}
 
 #upload_model_dialog {
   width: 800px;