@colijnit/homedecorator 256.1.8 → 256.1.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/app/core/enum/icon.enum.d.ts +1 -0
- package/app/core/enum/message-type.enum.d.ts +4 -1
- package/app/core/interface/message-without-payload.interface.d.ts +3 -0
- package/app/core/model/homedecorator-settings-options.d.ts +1 -0
- package/app/core/model/homedecorator-settings.d.ts +3 -0
- package/app/core/service/app-state.service.d.ts +3 -1
- package/app/core/service/homedecorator-connector-adapter.service.d.ts +6 -0
- package/app/core/service/homedecorator-connector.service.d.ts +2 -0
- package/app/core/service/presets.service.d.ts +3 -1
- package/app/core/service/utils.service.d.ts +1 -1
- package/app/homedecorator.component.d.ts +5 -1
- package/app/plugins/core3d/core3d/core3d.component.d.ts +2 -0
- package/app/plugins/core3d/hud/measurements.d.ts +1 -1
- package/app/plugins/core3d/items/base-item.d.ts +1 -0
- package/app/plugins/core3d/items/custom-objects.d.ts +1 -0
- package/app/plugins/core3d/service/floor.service.d.ts +9 -1
- package/app/plugins/model-uploader/model-previewer/model-preview.component.d.ts +2 -0
- package/app/plugins/product-catalog/own-collection-catalog/product-own-collection.component.d.ts +7 -7
- package/app/plugins/product-catalog/product-catalog/product-catalog.component.d.ts +7 -5
- package/app/plugins/render/render-controls/render-controls.component.d.ts +2 -1
- package/app/plugins/render/render-controls/render-controls.component.scss +85 -1
- package/app/plugins/room-planner/components/appearance-section/appearance-section.component.d.ts +4 -1
- package/app/plugins/room-planner/components/floor-catalog/floor-catalog.component.d.ts +17 -9
- package/app/plugins/room-planner/components/floor-catalog/floor-catalog.component.scss +41 -2
- package/app/plugins/room-planner/components/floorplanner/floorplanner.component.d.ts +3 -0
- package/app/plugins/room-planner/components/floorplanner/service/floorplan.service.d.ts +3 -0
- package/app/plugins/room-planner/components/selected-floor/selected-floor.component.d.ts +3 -1
- package/app/plugins/room-planner/components/texture-editor/texture-editor.component.d.ts +2 -2
- package/app/plugins/room-planner/room-planner/room-planner.component.d.ts +6 -0
- package/app/plugins/room-planner/room-planner.module.d.ts +2 -1
- package/app/plugins/threedselector/threedselector/service/load-furniture.service.d.ts +3 -1
- package/app/plugins/threedselector/threedselector/service/third-party-model.service.d.ts +3 -1
- package/app/plugins/threedselector/threedselector/threedselector.component.d.ts +3 -0
- package/app/plugins/threedselector/threedselector/threedselector.component.scss +39 -0
- package/app/plugins/toolbar/draw-dialog/draw-dialog.component.scss +20 -0
- package/app/shared/context-menu/item-context-menu/item-context-menu.component.d.ts +1 -0
- package/app/shared/pdf-export/pdf-export.component.d.ts +5 -1
- package/app/shared/pdf-export/pdf-export.component.scss +20 -0
- package/assets/hdri/ground_MASK.jpg +0 -0
- package/assets/icons/image_slash_regular.svg +1 -0
- package/bundles/colijnit-homedecorator.umd.js +17089 -16750
- package/bundles/colijnit-homedecorator.umd.js.map +1 -1
- package/esm2015/app/core/enum/icon.enum.js +2 -1
- package/esm2015/app/core/enum/message-type.enum.js +4 -1
- package/esm2015/app/core/interface/message-without-payload.interface.js +1 -1
- package/esm2015/app/core/model/homedecorator-settings-options.js +2 -1
- package/esm2015/app/core/model/homedecorator-settings.js +1 -1
- package/esm2015/app/core/model/icon.js +2 -1
- package/esm2015/app/core/service/app-state.service.js +7 -4
- package/esm2015/app/core/service/homedecorator-connector-adapter.service.js +43 -1
- package/esm2015/app/core/service/homedecorator-connector.service.js +20 -2
- package/esm2015/app/core/service/homedecorator-settings.service.js +4 -1
- package/esm2015/app/core/service/presets.service.js +20 -12
- package/esm2015/app/core/service/utils.service.js +44 -46
- package/esm2015/app/homedecorator.component.js +34 -6
- package/esm2015/app/plugins/core3d/core3d/core3d.component.js +12 -3
- package/esm2015/app/plugins/core3d/hud/furniture-measurements.js +2 -2
- package/esm2015/app/plugins/core3d/hud/measurements.js +6 -5
- package/esm2015/app/plugins/core3d/hud/on-wall-measurements.js +3 -3
- package/esm2015/app/plugins/core3d/items/base-item.js +3 -1
- package/esm2015/app/plugins/core3d/items/custom-objects.js +18 -2
- package/esm2015/app/plugins/core3d/items/floor-plane-item.js +2 -2
- package/esm2015/app/plugins/core3d/items/wall-objects.js +5 -1
- package/esm2015/app/plugins/core3d/service/floor-tile-intersection.service.js +17 -18
- package/esm2015/app/plugins/core3d/service/floor.service.js +29 -1
- package/esm2015/app/plugins/core3d/service/hud.service.js +4 -2
- package/esm2015/app/plugins/furniture-manager/furniture-manager/furniture-manager.component.js +3 -2
- package/esm2015/app/plugins/lite-selector/lite-selector/lite-selector.component.js +2 -2
- package/esm2015/app/plugins/lite-selector/lite-selector.module.js +1 -1
- package/esm2015/app/plugins/model-uploader/model-previewer/model-preview.component.js +56 -2
- package/esm2015/app/plugins/product-catalog/own-collection-catalog/product-own-collection.component.js +27 -38
- package/esm2015/app/plugins/product-catalog/product-catalog/product-catalog.component.js +75 -54
- package/esm2015/app/plugins/product-catalog/product-catalog.module.js +3 -12
- package/esm2015/app/plugins/render/render-controls/render-controls.component.js +105 -46
- package/esm2015/app/plugins/room-planner/components/appearance-section/appearance-section.component.js +19 -15
- package/esm2015/app/plugins/room-planner/components/floor-catalog/floor-catalog.component.js +145 -32
- package/esm2015/app/plugins/room-planner/components/floorplanner/floorplanner.component.js +25 -7
- package/esm2015/app/plugins/room-planner/components/floorplanner/service/floorplan.service.js +11 -1
- package/esm2015/app/plugins/room-planner/components/selected-floor/selected-floor.component.js +19 -11
- package/esm2015/app/plugins/room-planner/components/texture-editor/texture-editor.component.js +6 -3
- package/esm2015/app/plugins/room-planner/components/texture-picker/texture-picker.component.js +1 -1
- package/esm2015/app/plugins/room-planner/room-planner/room-planner.component.js +45 -6
- package/esm2015/app/plugins/room-planner/room-planner.module.js +6 -2
- package/esm2015/app/plugins/threedselector/threedselector/service/build-furniture.service.js +21 -6
- package/esm2015/app/plugins/threedselector/threedselector/service/load-furniture.service.js +26 -5
- package/esm2015/app/plugins/threedselector/threedselector/service/third-party-model.service.js +11 -8
- package/esm2015/app/plugins/threedselector/threedselector/threedselector.component.js +66 -58
- package/esm2015/app/plugins/toolbar/draw-dialog/draw-dialog.component.js +3 -3
- package/esm2015/app/plugins/toolbar/save-dialog/save-dialog.component.js +19 -7
- package/esm2015/app/shared/category-library/category-library.component.js +1 -1
- package/esm2015/app/shared/context-menu/item-context-menu/item-context-menu.component.js +23 -3
- package/esm2015/app/shared/pdf-export/pdf-export.component.js +21 -15
- package/fesm2015/colijnit-homedecorator.js +15557 -15048
- package/fesm2015/colijnit-homedecorator.js.map +1 -1
- package/package.json +2 -2
- package/styles.scss +0 -1
- package/app/plugins/product-catalog/service/catalog-base-module.service.d.ts +0 -7
- package/app/plugins/product-catalog/service/catalog-screen-configuration.service.d.ts +0 -15
- package/app/service/dynamic-script.service.d.ts +0 -8
- package/esm2015/app/plugins/product-catalog/service/catalog-base-module.service.js +0 -18
- package/esm2015/app/plugins/product-catalog/service/catalog-screen-configuration.service.js +0 -50
- package/esm2015/app/service/dynamic-script.service.js +0 -56
|
@@ -63,11 +63,14 @@ export declare enum MessageType {
|
|
|
63
63
|
StartWithDiagram = "StartWithDiagram",
|
|
64
64
|
StartDrawingDiagram = "StartDrawingDiagram",
|
|
65
65
|
LoadScaledDiagram = "LoadScaledDiagram",
|
|
66
|
+
ToggleDiagram = "ToggleDiagram",
|
|
66
67
|
StartCroppingPDF = "StartCroppingPDF",
|
|
67
68
|
BlenderRenderFileReady = "BlenderRenderFileReady",
|
|
68
69
|
UserModelUploaded = "UserModelUploaded",
|
|
69
70
|
ChangeTexture = "ChangeTexture",
|
|
70
71
|
RenderError = "RenderError",
|
|
71
72
|
ShowFloorArticleCatalog = "ShowFloorArticleCatalog",
|
|
72
|
-
BlenderRenderPreviewReady = "BlenderRenderPreviewReady"
|
|
73
|
+
BlenderRenderPreviewReady = "BlenderRenderPreviewReady",
|
|
74
|
+
FloorRebuild = "FloorRebuild",
|
|
75
|
+
FloorPlaneAvailable = "FloorPlaneAvailable"
|
|
73
76
|
}
|
|
@@ -32,4 +32,7 @@ export interface MessagesWithoutPayload {
|
|
|
32
32
|
[MessageType.StartGroupObject]: any;
|
|
33
33
|
[MessageType.CancelGroupObject]: any;
|
|
34
34
|
[MessageType.StartWithDiagram]: any;
|
|
35
|
+
[MessageType.FloorRebuild]: any;
|
|
36
|
+
[MessageType.FloorPlaneAvailable]: any;
|
|
37
|
+
[MessageType.ToggleDiagram]: any;
|
|
35
38
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { OnDestroy } from '@angular/core';
|
|
2
2
|
import { MessageBusService } from './message-bus.service';
|
|
3
|
+
import { UtilsService } from './utils.service';
|
|
3
4
|
import * as i0 from "@angular/core";
|
|
4
5
|
export declare type StateValue = string;
|
|
5
6
|
declare type Action = string;
|
|
@@ -20,6 +21,7 @@ interface ValueState {
|
|
|
20
21
|
declare type State = DiffState | ValueState;
|
|
21
22
|
export declare class AppStateService implements OnDestroy {
|
|
22
23
|
private messageBusService;
|
|
24
|
+
private _utilsService;
|
|
23
25
|
createStateFn: CreateStateInterface;
|
|
24
26
|
applyStateFn: ApplyStateInterface;
|
|
25
27
|
states: State[];
|
|
@@ -27,7 +29,7 @@ export declare class AppStateService implements OnDestroy {
|
|
|
27
29
|
undoDisabled: boolean;
|
|
28
30
|
redoDisabled: boolean;
|
|
29
31
|
private _subs;
|
|
30
|
-
constructor(messageBusService: MessageBusService);
|
|
32
|
+
constructor(messageBusService: MessageBusService, _utilsService: UtilsService);
|
|
31
33
|
ngOnDestroy(): void;
|
|
32
34
|
init(stateApi: StateApi, initialState: StateValue): void;
|
|
33
35
|
canRedo(): boolean;
|
|
@@ -26,6 +26,7 @@ import { ArticleFlat } from '@colijnit/articleapi/build/model/article-flat.bo';
|
|
|
26
26
|
import { HomedecoratorAppEventService } from './homedecorator-app-event.service';
|
|
27
27
|
import { CoDomainValue } from '@colijnit/mainapi/build/model/co-domain-value.bo';
|
|
28
28
|
import { ObjectConfiguration } from '@colijnit/ioneconnector/build/model/object-configuration';
|
|
29
|
+
import { ArticleExtended } from '@colijnit/articleapi/build/model/article-extended.bo';
|
|
29
30
|
import * as i0 from "@angular/core";
|
|
30
31
|
export declare class ExternalConnector {
|
|
31
32
|
loginResponse: LoginResponse;
|
|
@@ -50,6 +51,8 @@ export declare class HomedecoratorConnectorAdapterService {
|
|
|
50
51
|
loginResponse: LoginResponse;
|
|
51
52
|
private _catalogDefinitions;
|
|
52
53
|
private _externalSources;
|
|
54
|
+
private _catalogDefinitionsOriginal;
|
|
55
|
+
private _externalSourcesOriginal;
|
|
53
56
|
private _connector?;
|
|
54
57
|
private _articleApi;
|
|
55
58
|
private _mainApi;
|
|
@@ -91,7 +94,10 @@ export declare class HomedecoratorConnectorAdapterService {
|
|
|
91
94
|
getModelPlacementOptions(): Promise<CoDomainValue[]>;
|
|
92
95
|
getObjectConfiguration(screenCfgModule: string, params?: string | string[], insertMode?: boolean): Promise<ObjectConfiguration[]>;
|
|
93
96
|
getExternalSourceFromId(id: number): ExternalSource;
|
|
97
|
+
saveExternalSources(): void;
|
|
98
|
+
resetExternalSources(): void;
|
|
94
99
|
prepareExternalSources(): Promise<void>;
|
|
100
|
+
getArticleExtended(articleNumber: string): Promise<ArticleExtended>;
|
|
95
101
|
private _getPublicationCodeForRole;
|
|
96
102
|
static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorConnectorAdapterService, never>;
|
|
97
103
|
static ɵprov: i0.ɵɵInjectableDeclaration<HomedecoratorConnectorAdapterService>;
|
|
@@ -83,6 +83,8 @@ export declare class HomedecoratorConnectorService implements OnDestroy {
|
|
|
83
83
|
setDecoNodes(decoNodes: DecoNode[]): void;
|
|
84
84
|
getImageCache(): any;
|
|
85
85
|
getImageById(id: number): any;
|
|
86
|
+
beforeLoadPreset(): Promise<void>;
|
|
87
|
+
afterLoadPreset(): Promise<void>;
|
|
86
88
|
initConnection(forceReload?: boolean): Promise<void>;
|
|
87
89
|
getInternalParameter(param: InternalParam): Promise<string>;
|
|
88
90
|
getJsonConfiguredArticles(goodId: number, goodType: string, quantity: number, externalSource?: boolean, showLoader?: boolean, instanceId?: number, configuratorStatistics?: ConfiguratorStatisticsEnvironment): Promise<any>;
|
|
@@ -11,6 +11,7 @@ import { LocalStorageService } from '../../service/local-storage.service';
|
|
|
11
11
|
import { ProgressService } from './progress.service';
|
|
12
12
|
import { SceneService } from '../../plugins/core3d/service/scene.service';
|
|
13
13
|
import { HomedecoratorAppEventService } from './homedecorator-app-event.service';
|
|
14
|
+
import { HomedecoratorConnectorService } from './homedecorator-connector.service';
|
|
14
15
|
import * as i0 from "@angular/core";
|
|
15
16
|
export declare class PresetsService implements OnDestroy {
|
|
16
17
|
private _appStateService;
|
|
@@ -23,6 +24,7 @@ export declare class PresetsService implements OnDestroy {
|
|
|
23
24
|
private _progressService;
|
|
24
25
|
private _sceneService;
|
|
25
26
|
private _eventService;
|
|
27
|
+
private _connector;
|
|
26
28
|
isLoading: boolean;
|
|
27
29
|
beforeLoad: Subject<any>;
|
|
28
30
|
afterLoad: Subject<any>;
|
|
@@ -30,7 +32,7 @@ export declare class PresetsService implements OnDestroy {
|
|
|
30
32
|
assetPath: string;
|
|
31
33
|
stateCreated: Subject<void>;
|
|
32
34
|
private _subs;
|
|
33
|
-
constructor(_appStateService: AppStateService, _permanentStoreService: PermanentStoreService, _jsonUtils: JsonUtilsService, _messageService: MessageBusService, _settingsService: HomedecoratorSettingsService, _configurationService: ConfigurationService, _storageService: LocalStorageService, _progressService: ProgressService, _sceneService: SceneService, _eventService: HomedecoratorAppEventService);
|
|
35
|
+
constructor(_appStateService: AppStateService, _permanentStoreService: PermanentStoreService, _jsonUtils: JsonUtilsService, _messageService: MessageBusService, _settingsService: HomedecoratorSettingsService, _configurationService: ConfigurationService, _storageService: LocalStorageService, _progressService: ProgressService, _sceneService: SceneService, _eventService: HomedecoratorAppEventService, _connector: HomedecoratorConnectorService);
|
|
34
36
|
ngOnDestroy(): void;
|
|
35
37
|
register(plugin: PluginInterface): void;
|
|
36
38
|
reopenState(model: string): void;
|
|
@@ -60,11 +60,11 @@ export declare class UtilsService implements OnDestroy {
|
|
|
60
60
|
forceChangeDetection(cd: ChangeDetectorRef, component: any, propName: string): void;
|
|
61
61
|
getKTX2Loader(): KTX2Loader;
|
|
62
62
|
downloadUSDZforARIOS(object: Object3D): Promise<void>;
|
|
63
|
+
cleanedUpObjects(object: Object3D, cleanUp?: boolean): Object3D;
|
|
63
64
|
private _download3DModelAsGLB;
|
|
64
65
|
private _download3DModelAsUSDZ;
|
|
65
66
|
private _downloadFile;
|
|
66
67
|
private _loadGroup;
|
|
67
|
-
private _cleanedUpObjects;
|
|
68
68
|
private _addGroupChildrenToObject;
|
|
69
69
|
private _iterateChildren;
|
|
70
70
|
private _includeBaseUrl;
|
|
@@ -8,6 +8,7 @@ import { ScreenSizeAnalysisService } from './shared/screen-size-analysis/screen-
|
|
|
8
8
|
import { MessageBusService } from './core/service/message-bus.service';
|
|
9
9
|
import { HomedecoratorService } from './core/service/homedecorator.service';
|
|
10
10
|
import { HomedecoratorAppEventService } from './core/service/homedecorator-app-event.service';
|
|
11
|
+
import { FilterOrder } from '@colijnit/catalog/lib/interface/filter-order.interface';
|
|
11
12
|
import * as i0 from "@angular/core";
|
|
12
13
|
export declare class HomedecoratorComponent implements OnInit, OnDestroy {
|
|
13
14
|
controllerService: HomedecoratorConnectorService;
|
|
@@ -22,6 +23,9 @@ export declare class HomedecoratorComponent implements OnInit, OnDestroy {
|
|
|
22
23
|
private _eventService;
|
|
23
24
|
set settings(value: any);
|
|
24
25
|
get settings(): any;
|
|
26
|
+
generalFilterOrders: FilterOrder[];
|
|
27
|
+
purchaseFilterOrders: FilterOrder[];
|
|
28
|
+
logisticsFilterOrders: FilterOrder[];
|
|
25
29
|
showClass: boolean;
|
|
26
30
|
loaded: boolean;
|
|
27
31
|
title: string;
|
|
@@ -40,5 +44,5 @@ export declare class HomedecoratorComponent implements OnInit, OnDestroy {
|
|
|
40
44
|
private _startWithEmptyRoom;
|
|
41
45
|
private _startWithPreset;
|
|
42
46
|
static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorComponent, never>;
|
|
43
|
-
static ɵcmp: i0.ɵɵComponentDeclaration<HomedecoratorComponent, "co-homedecorator", never, { "settings": "settings"; }, {}, never, never>;
|
|
47
|
+
static ɵcmp: i0.ɵɵComponentDeclaration<HomedecoratorComponent, "co-homedecorator", never, { "settings": "settings"; "generalFilterOrders": "generalFilterOrders"; "purchaseFilterOrders": "purchaseFilterOrders"; "logisticsFilterOrders": "logisticsFilterOrders"; }, {}, never, never>;
|
|
44
48
|
}
|
|
@@ -49,6 +49,7 @@ export declare class Core3dComponent implements OnInit, OnDestroy, PluginInterfa
|
|
|
49
49
|
showLightplan: boolean;
|
|
50
50
|
showCameraControlButtons: boolean;
|
|
51
51
|
show3DWaterMark: boolean;
|
|
52
|
+
threedOptionsAvailable: boolean;
|
|
52
53
|
private _subs;
|
|
53
54
|
constructor(viewModeService: ViewModeService, settingsService: HomedecoratorSettingsService, xrService: XrService, _vrService: VrService, _presetService: PresetsService, _messageService: MessageBusService, _configurationService: ConfigurationService, _cameraService: CameraService, _floorplanService: FloorplanService, _itemService: ItemService, _dialog: MatDialog, iconService: HomedecoratorIconCacheService, _screenSizeService: ScreenSizeAnalysisService, _wallMeasurementsService: WallMeasurementsService);
|
|
54
55
|
ngOnInit(): void;
|
|
@@ -71,6 +72,7 @@ export declare class Core3dComponent implements OnInit, OnDestroy, PluginInterfa
|
|
|
71
72
|
};
|
|
72
73
|
copySceneInstance(saveAs: boolean): Promise<void>;
|
|
73
74
|
loadObjects(data: any): Promise<any>;
|
|
75
|
+
private _viewModeChanged;
|
|
74
76
|
static ɵfac: i0.ɵɵFactoryDeclaration<Core3dComponent, never>;
|
|
75
77
|
static ɵcmp: i0.ɵɵComponentDeclaration<Core3dComponent, "rp-core3d", never, {}, {}, never, never>;
|
|
76
78
|
}
|
|
@@ -38,7 +38,7 @@ export declare abstract class Measurements {
|
|
|
38
38
|
direction: THREE.Vector3;
|
|
39
39
|
value: number;
|
|
40
40
|
};
|
|
41
|
-
}, index: number): (THREE.Mesh | THREE.ArrowHelper)[];
|
|
41
|
+
}, index: number, placement: string): (THREE.Mesh | THREE.ArrowHelper)[];
|
|
42
42
|
protected nonItemPlane(item: any, plane: any): boolean;
|
|
43
43
|
protected rotateDirection(rotateY: number, direction: THREE.Vector3): THREE.Vector3;
|
|
44
44
|
protected rotatedBoundingBoxBottomPoint(item: any, point: THREE.Vector3): THREE.Vector3;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { OnDestroy } from '@angular/core';
|
|
2
|
-
import { BufferGeometry, Color, Mesh } from 'three';
|
|
2
|
+
import { BufferGeometry, Color, Mesh, Object3D } from 'three';
|
|
3
3
|
import { SceneService } from './scene.service';
|
|
4
4
|
import { Corner, Room } from '../items/wall-objects';
|
|
5
5
|
import { Texture } from '../../../core/model/texture';
|
|
@@ -20,6 +20,7 @@ export declare class FloorService implements OnDestroy {
|
|
|
20
20
|
private _groundPlane;
|
|
21
21
|
private _floorPlane;
|
|
22
22
|
private _selectedFloorArticle;
|
|
23
|
+
private _configurableFloor;
|
|
23
24
|
private _showFloorCenterLineZAxis;
|
|
24
25
|
private _floorCenterLineZAxis;
|
|
25
26
|
private _showFloorCenterLineXAxis;
|
|
@@ -29,8 +30,13 @@ export declare class FloorService implements OnDestroy {
|
|
|
29
30
|
private _subs;
|
|
30
31
|
private _floorResultObject;
|
|
31
32
|
private _mirrorPlane;
|
|
33
|
+
private _toggleState;
|
|
32
34
|
get groundPlane(): Mesh;
|
|
33
35
|
set groundPlane(mesh: Mesh);
|
|
36
|
+
get configurableFloor(): Object3D;
|
|
37
|
+
set configurableFloor(object: Object3D);
|
|
38
|
+
get toggleState(): boolean;
|
|
39
|
+
set toggleState(state: boolean);
|
|
34
40
|
get floorPlane(): FloorPlaneItem;
|
|
35
41
|
get selectedFloorArticle(): Article;
|
|
36
42
|
set selectedFloorArticle(article: Article);
|
|
@@ -49,6 +55,8 @@ export declare class FloorService implements OnDestroy {
|
|
|
49
55
|
floorToConfigure: FloorPlaneItem;
|
|
50
56
|
constructor(_sceneService: SceneService, _outlineService: OutlineService, _itemService: ItemService, _settingsService: HomedecoratorSettingsService, _messageService: MessageBusService);
|
|
51
57
|
ngOnDestroy(): void;
|
|
58
|
+
toggleFloorFrame(visible: boolean): void;
|
|
59
|
+
checkForConfigurableFloor(): boolean;
|
|
52
60
|
getFloorPlane(): FloorPlaneItem;
|
|
53
61
|
setFloorTexture(room: Room, texture: Texture): Promise<void>;
|
|
54
62
|
setFloorColor(room: Room, color: number): Promise<void>;
|
|
@@ -92,6 +92,8 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
|
|
|
92
92
|
private _blobToArrayBuffer;
|
|
93
93
|
private _createLightFromProperties;
|
|
94
94
|
private _setObjectProperties;
|
|
95
|
+
private _validateTextures;
|
|
96
|
+
private _replaceProceduralTextures;
|
|
95
97
|
static ɵfac: i0.ɵɵFactoryDeclaration<ModelPreviewComponent, never>;
|
|
96
98
|
static ɵcmp: i0.ɵɵComponentDeclaration<ModelPreviewComponent, "rp-model-preview", never, {}, {}, never, never>;
|
|
97
99
|
}
|
package/app/plugins/product-catalog/own-collection-catalog/product-own-collection.component.d.ts
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import { EventEmitter
|
|
1
|
+
import { EventEmitter } from '@angular/core';
|
|
2
2
|
import { HomedecoratorExternalSettingsInterface } from '../../../core/interface/homedecorator-external-settings.interface';
|
|
3
3
|
import { ArticleListObjectExtended } from '@colijnit/articleapi/build/model/article-list-object-extended.bo';
|
|
4
|
-
import {
|
|
4
|
+
import { FilterOrder } from '@colijnit/catalog/lib/interface/filter-order.interface';
|
|
5
5
|
import * as i0 from "@angular/core";
|
|
6
|
-
export declare class ProductOwnCollectionComponent
|
|
7
|
-
private _screenConfigService;
|
|
6
|
+
export declare class ProductOwnCollectionComponent {
|
|
8
7
|
settings: any;
|
|
8
|
+
generalFilterOrders: FilterOrder[];
|
|
9
|
+
purchaseFilterOrders: FilterOrder[];
|
|
10
|
+
logisticsFilterOrders: FilterOrder[];
|
|
9
11
|
articleClick: EventEmitter<{
|
|
10
12
|
article: ArticleListObjectExtended;
|
|
11
13
|
settings?: HomedecoratorExternalSettingsInterface;
|
|
@@ -14,10 +16,8 @@ export declare class ProductOwnCollectionComponent implements OnInit {
|
|
|
14
16
|
article: ArticleListObjectExtended;
|
|
15
17
|
settings?: HomedecoratorExternalSettingsInterface;
|
|
16
18
|
}>;
|
|
17
|
-
constructor(_screenConfigService: CatalogScreenConfigurationService);
|
|
18
|
-
ngOnInit(): Promise<void>;
|
|
19
19
|
handleArticleClick(article: ArticleListObjectExtended): void;
|
|
20
20
|
handleArButtonClick(article: ArticleListObjectExtended): void;
|
|
21
21
|
static ɵfac: i0.ɵɵFactoryDeclaration<ProductOwnCollectionComponent, never>;
|
|
22
|
-
static ɵcmp: i0.ɵɵComponentDeclaration<ProductOwnCollectionComponent, "rp-product-own-collection", never, { "settings": "settings"; }, { "articleClick": "articleClick"; "arButtonClick": "arButtonClick"; }, never, never>;
|
|
22
|
+
static ɵcmp: i0.ɵɵComponentDeclaration<ProductOwnCollectionComponent, "rp-product-own-collection", never, { "settings": "settings"; "generalFilterOrders": "generalFilterOrders"; "purchaseFilterOrders": "purchaseFilterOrders"; "logisticsFilterOrders": "logisticsFilterOrders"; }, { "articleClick": "articleClick"; "arButtonClick": "arButtonClick"; }, never, never>;
|
|
23
23
|
}
|
|
@@ -16,7 +16,7 @@ import { HomedecoratorExternalSettingsInterface } from '../../../core/interface/
|
|
|
16
16
|
import { ThirdPartyModelService } from '../../threedselector/threedselector/service/third-party-model.service';
|
|
17
17
|
import { ExternalSourceArticleClickInterface } from '@colijnit/articleapi/build/interface/external-source-article-click.interface';
|
|
18
18
|
import { ArticleListObjectExtended } from '@colijnit/articleapi/build/model/article-list-object-extended.bo';
|
|
19
|
-
import {
|
|
19
|
+
import { FilterOrder } from '@colijnit/catalog/lib/interface/filter-order.interface';
|
|
20
20
|
import * as i0 from "@angular/core";
|
|
21
21
|
export declare class ProductCatalogComponent implements OnInit, OnDestroy {
|
|
22
22
|
settingsService: HomedecoratorSettingsService;
|
|
@@ -28,8 +28,10 @@ export declare class ProductCatalogComponent implements OnInit, OnDestroy {
|
|
|
28
28
|
private _catalogService;
|
|
29
29
|
private _adapterService;
|
|
30
30
|
private _thirdPartyModelService;
|
|
31
|
-
private _screenConfigService;
|
|
32
31
|
private _changeDetection;
|
|
32
|
+
generalFilterOrders: FilterOrder[];
|
|
33
|
+
purchaseFilterOrders: FilterOrder[];
|
|
34
|
+
logisticsFilterOrders: FilterOrder[];
|
|
33
35
|
get shown(): boolean;
|
|
34
36
|
loaded: boolean;
|
|
35
37
|
settings: HomedecoratorSettings;
|
|
@@ -45,7 +47,7 @@ export declare class ProductCatalogComponent implements OnInit, OnDestroy {
|
|
|
45
47
|
private _showCatalog;
|
|
46
48
|
private _subs;
|
|
47
49
|
private _source;
|
|
48
|
-
constructor(settingsService: HomedecoratorSettingsService, _messageBus: MessageBusService, _ioneController: HomedecoratorConnectorService, _screenSizeService: ScreenSizeAnalysisService, _sceneService: SceneService, _floorPlanService: FloorplanService, _catalogService: CatalogService, _adapterService: HomedecoratorConnectorAdapterService, _thirdPartyModelService: ThirdPartyModelService,
|
|
50
|
+
constructor(settingsService: HomedecoratorSettingsService, _messageBus: MessageBusService, _ioneController: HomedecoratorConnectorService, _screenSizeService: ScreenSizeAnalysisService, _sceneService: SceneService, _floorPlanService: FloorplanService, _catalogService: CatalogService, _adapterService: HomedecoratorConnectorAdapterService, _thirdPartyModelService: ThirdPartyModelService, _changeDetection: ChangeDetectorRef);
|
|
49
51
|
ngOnInit(): Promise<void>;
|
|
50
52
|
ngOnDestroy(): void;
|
|
51
53
|
checkHomeDecohub(): void;
|
|
@@ -59,10 +61,10 @@ export declare class ProductCatalogComponent implements OnInit, OnDestroy {
|
|
|
59
61
|
handleShowOwnCollectionClick(event: MouseEvent): void;
|
|
60
62
|
handleBackClick(event: MouseEvent): void;
|
|
61
63
|
handleRefreshClick(event: MouseEvent): void;
|
|
62
|
-
handleIFrameFeedback(jsonString:
|
|
64
|
+
handleIFrameFeedback(jsonString: any): Promise<void>;
|
|
63
65
|
iframeTest(): Promise<void>;
|
|
64
66
|
private _buildExternalCatalogRequest;
|
|
65
67
|
private _handleShowProductCatalogMessageReceived;
|
|
66
68
|
static ɵfac: i0.ɵɵFactoryDeclaration<ProductCatalogComponent, never>;
|
|
67
|
-
static ɵcmp: i0.ɵɵComponentDeclaration<ProductCatalogComponent, "rp-product-catalog", never, {}, {}, never, never>;
|
|
69
|
+
static ɵcmp: i0.ɵɵComponentDeclaration<ProductCatalogComponent, "rp-product-catalog", never, { "generalFilterOrders": "generalFilterOrders"; "purchaseFilterOrders": "purchaseFilterOrders"; "logisticsFilterOrders": "logisticsFilterOrders"; }, {}, never, never>;
|
|
68
70
|
}
|
|
@@ -43,13 +43,14 @@ export declare class RenderControlsComponent {
|
|
|
43
43
|
readonly renderModes: typeof RenderModes;
|
|
44
44
|
showRenderForm(event: MouseEvent): void;
|
|
45
45
|
checkCameraPosition(event: MouseEvent): void;
|
|
46
|
-
private _validateRenderPosition;
|
|
47
46
|
startRenderingRoom(): Promise<void>;
|
|
48
47
|
createBlenderRender(): void;
|
|
49
48
|
resetBlenderRenderScene(): void;
|
|
50
49
|
moveCameraWithinBounds(): void;
|
|
51
50
|
getPreviewRender(): void;
|
|
52
51
|
showPreview(image: string): void;
|
|
52
|
+
private _validateRenderPosition;
|
|
53
|
+
private _getObjectsByName;
|
|
53
54
|
static ɵfac: i0.ɵɵFactoryDeclaration<RenderControlsComponent, never>;
|
|
54
55
|
static ɵcmp: i0.ɵɵComponentDeclaration<RenderControlsComponent, "rp-render-controls", never, {}, {}, never, never>;
|
|
55
56
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
$border-radius: 20px;
|
|
2
2
|
$border-width: 10px;
|
|
3
|
-
$border-color:
|
|
3
|
+
$border-color: #dda73f;
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
.render-container {
|
|
@@ -47,10 +47,12 @@ $border-color: #dda73f;
|
|
|
47
47
|
height: 40px;
|
|
48
48
|
align-items: center;
|
|
49
49
|
justify-content: space-evenly;
|
|
50
|
+
|
|
50
51
|
::ng-deep co-icon {
|
|
51
52
|
display: inline-block;
|
|
52
53
|
height: 18px;
|
|
53
54
|
width: 18px;
|
|
55
|
+
|
|
54
56
|
svg {
|
|
55
57
|
path {
|
|
56
58
|
fill: #fff;
|
|
@@ -63,6 +65,7 @@ $border-color: #dda73f;
|
|
|
63
65
|
color: #fff;
|
|
64
66
|
background-color: #dda73f;
|
|
65
67
|
}
|
|
68
|
+
|
|
66
69
|
.cancel-button {
|
|
67
70
|
color: #fff;
|
|
68
71
|
background-color: #5b6875;
|
|
@@ -75,6 +78,7 @@ $border-color: #dda73f;
|
|
|
75
78
|
min-width: 275px;
|
|
76
79
|
margin: 5px 0;
|
|
77
80
|
position: relative;
|
|
81
|
+
|
|
78
82
|
.render-popup-preview-placeholder {
|
|
79
83
|
background-color: #fff;
|
|
80
84
|
display: flex;
|
|
@@ -86,6 +90,7 @@ $border-color: #dda73f;
|
|
|
86
90
|
color: #ddd;
|
|
87
91
|
font-size: 14px;
|
|
88
92
|
}
|
|
93
|
+
|
|
89
94
|
.render-popup-refresh-preview {
|
|
90
95
|
position: absolute;
|
|
91
96
|
bottom: 0;
|
|
@@ -97,6 +102,7 @@ $border-color: #dda73f;
|
|
|
97
102
|
width: 30px;
|
|
98
103
|
background-color: #dda73f;
|
|
99
104
|
color: #fff;
|
|
105
|
+
|
|
100
106
|
::ng-deep co-icon {
|
|
101
107
|
svg {
|
|
102
108
|
path {
|
|
@@ -165,6 +171,7 @@ $border-color: #dda73f;
|
|
|
165
171
|
position: relative;
|
|
166
172
|
z-index: 2;
|
|
167
173
|
margin-bottom: 10px;
|
|
174
|
+
|
|
168
175
|
&.active {
|
|
169
176
|
background: #74B77F;
|
|
170
177
|
color: #fff;
|
|
@@ -234,3 +241,80 @@ $border-color: #dda73f;
|
|
|
234
241
|
border-bottom-right-radius: $border-radius;
|
|
235
242
|
}
|
|
236
243
|
}
|
|
244
|
+
|
|
245
|
+
|
|
246
|
+
.render-warning {
|
|
247
|
+
width: 500px;
|
|
248
|
+
position: fixed;
|
|
249
|
+
top: 20%;
|
|
250
|
+
left: calc(50% - 250px);
|
|
251
|
+
border-radius: 15px;
|
|
252
|
+
box-sizing: border-box;
|
|
253
|
+
background-color: #fff;
|
|
254
|
+
box-shadow: 1px 0 20px rgba(0, 0, 0, 0.12);
|
|
255
|
+
|
|
256
|
+
.render-warming-header {
|
|
257
|
+
display: flex;
|
|
258
|
+
justify-content: space-between;
|
|
259
|
+
border-bottom: 1px solid #c5c3c6;
|
|
260
|
+
padding: 20px 20px 10px;
|
|
261
|
+
align-items: center;
|
|
262
|
+
|
|
263
|
+
h2 {
|
|
264
|
+
padding: 0;
|
|
265
|
+
margin: 0;
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
.render-warning-close {
|
|
269
|
+
mat-icon {
|
|
270
|
+
fill: #c5c3c6;
|
|
271
|
+
color: #c5c3c6;
|
|
272
|
+
cursor: pointer;
|
|
273
|
+
transition: all 0.2s ease;
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
&:hover {
|
|
277
|
+
mat-icon {
|
|
278
|
+
fill: #46494c;
|
|
279
|
+
color: #46494c;
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
|
|
285
|
+
.render-warning-body {
|
|
286
|
+
padding: 10px 20px;
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
.render-warning-footer {
|
|
290
|
+
display: flex;
|
|
291
|
+
justify-content: center;
|
|
292
|
+
padding: 0 20px 10px;
|
|
293
|
+
|
|
294
|
+
.render-popup-button {
|
|
295
|
+
float: none;
|
|
296
|
+
width: 110px;
|
|
297
|
+
border-radius: 3px;
|
|
298
|
+
cursor: pointer;
|
|
299
|
+
border: none;
|
|
300
|
+
display: flex;
|
|
301
|
+
height: 40px;
|
|
302
|
+
align-items: center;
|
|
303
|
+
justify-content: space-evenly;
|
|
304
|
+
color: #fff;
|
|
305
|
+
background-color: #5b6875;
|
|
306
|
+
|
|
307
|
+
::ng-deep co-icon {
|
|
308
|
+
display: inline-block;
|
|
309
|
+
height: 18px;
|
|
310
|
+
width: 18px;
|
|
311
|
+
|
|
312
|
+
svg {
|
|
313
|
+
path {
|
|
314
|
+
fill: #fff;
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
}
|
package/app/plugins/room-planner/components/appearance-section/appearance-section.component.d.ts
CHANGED
|
@@ -4,9 +4,11 @@ import { TextureType } from '../../../../core/model/texture-type';
|
|
|
4
4
|
import { Texture } from '../../../../core/model/texture';
|
|
5
5
|
import { IconEnum } from '../../../../core/enum/icon.enum';
|
|
6
6
|
import { HomedecoratorIconCacheService } from '../../../../core/service/homedecorator-icon-cache.service';
|
|
7
|
+
import { HomedecoratorSettingsService } from '../../../../core/service/homedecorator-settings.service';
|
|
7
8
|
import * as i0 from "@angular/core";
|
|
8
9
|
export declare class AppearanceSectionComponent implements OnInit, OnChanges {
|
|
9
10
|
iconService: HomedecoratorIconCacheService;
|
|
11
|
+
settingsService: HomedecoratorSettingsService;
|
|
10
12
|
readonly textureType: typeof TextureType;
|
|
11
13
|
readonly icon: typeof IconEnum;
|
|
12
14
|
type: 'wall' | 'floor';
|
|
@@ -28,7 +30,8 @@ export declare class AppearanceSectionComponent implements OnInit, OnChanges {
|
|
|
28
30
|
backup: Texture | number;
|
|
29
31
|
options: typeof TextureEditorOptions;
|
|
30
32
|
selectedTabIndex: number;
|
|
31
|
-
|
|
33
|
+
showProductTab: boolean;
|
|
34
|
+
constructor(iconService: HomedecoratorIconCacheService, settingsService: HomedecoratorSettingsService);
|
|
32
35
|
ngOnInit(): void;
|
|
33
36
|
ngOnChanges(changes: SimpleChanges): void;
|
|
34
37
|
updateSelectedTabIndex(index: number): void;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ElementRef, OnInit } from '@angular/core';
|
|
1
|
+
import { ElementRef, OnDestroy, OnInit } from '@angular/core';
|
|
2
2
|
import { HomedecoratorIconCacheService } from '../../../../core/service/homedecorator-icon-cache.service';
|
|
3
3
|
import { IconEnum } from '../../../../core/enum/icon.enum';
|
|
4
4
|
import { MessageBusService } from '../../../../core/service/message-bus.service';
|
|
@@ -6,18 +6,13 @@ import { FloorService } from '../../../core3d/service/floor.service';
|
|
|
6
6
|
import { Article } from '@colijnit/configuratorapi/build/model/article';
|
|
7
7
|
import { Texture } from '../../../../core/model/texture';
|
|
8
8
|
import { BuildFurnitureService } from '../../../threedselector/threedselector/service/build-furniture.service';
|
|
9
|
-
import {
|
|
10
|
-
import { HomedecoratorConnectorService } from '../../../../core/service/homedecorator-connector.service';
|
|
11
|
-
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
|
|
9
|
+
import { SafeResourceUrl } from '@angular/platform-browser';
|
|
12
10
|
import * as i0 from "@angular/core";
|
|
13
|
-
export declare class FloorCatalogComponent implements OnInit {
|
|
11
|
+
export declare class FloorCatalogComponent implements OnInit, OnDestroy {
|
|
14
12
|
iconService: HomedecoratorIconCacheService;
|
|
15
13
|
private _messageService;
|
|
16
14
|
private _floorService;
|
|
17
15
|
private _buildFurnitureService;
|
|
18
|
-
private _connectorAdapterService;
|
|
19
|
-
private _iOne;
|
|
20
|
-
private _domSanitizer;
|
|
21
16
|
readonly icon: typeof IconEnum;
|
|
22
17
|
type: 'floor';
|
|
23
18
|
currentTexture: Texture;
|
|
@@ -35,8 +30,17 @@ export declare class FloorCatalogComponent implements OnInit {
|
|
|
35
30
|
currentCenterlineXAxis: number;
|
|
36
31
|
showCenterlineZAxis: boolean;
|
|
37
32
|
showCenterlineXAxis: boolean;
|
|
38
|
-
|
|
33
|
+
checkboxState: boolean;
|
|
34
|
+
showFloorToggle: boolean;
|
|
35
|
+
showFloorDetails: boolean;
|
|
36
|
+
amountPlanksLeft: number;
|
|
37
|
+
amountPlanksRight: number;
|
|
38
|
+
amountOfPlanks: number;
|
|
39
|
+
angleOfPlanks: number;
|
|
40
|
+
private _subs;
|
|
41
|
+
constructor(iconService: HomedecoratorIconCacheService, _messageService: MessageBusService, _floorService: FloorService, _buildFurnitureService: BuildFurnitureService);
|
|
39
42
|
ngOnInit(): void;
|
|
43
|
+
ngOnDestroy(): void;
|
|
40
44
|
checkFloorArticle(): void;
|
|
41
45
|
updateScale(): void;
|
|
42
46
|
updateRotation(): void;
|
|
@@ -55,6 +59,10 @@ export declare class FloorCatalogComponent implements OnInit {
|
|
|
55
59
|
showCenterlineX(event: any): void;
|
|
56
60
|
showCatalog(): void;
|
|
57
61
|
updateFloorItem(): void;
|
|
62
|
+
toggleFloorFrame(): void;
|
|
63
|
+
checkFloor(): void;
|
|
64
|
+
reToggleFloorFrame(): void;
|
|
65
|
+
getFloorInformation(): void;
|
|
58
66
|
static ɵfac: i0.ɵɵFactoryDeclaration<FloorCatalogComponent, never>;
|
|
59
67
|
static ɵcmp: i0.ɵɵComponentDeclaration<FloorCatalogComponent, "rp-floor-catalog", never, { "type": "type"; "currentTexture": "currentTexture"; }, {}, never, never>;
|
|
60
68
|
}
|
|
@@ -21,6 +21,7 @@ $input-border-color: #9FA9B4;
|
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
+
|
|
24
25
|
.floor-catalog-wrap {
|
|
25
26
|
.floor-catalog-selected-floor {
|
|
26
27
|
background: $selected-floor-background;
|
|
@@ -30,7 +31,19 @@ $input-border-color: #9FA9B4;
|
|
|
30
31
|
margin: 5px 0 15px;
|
|
31
32
|
|
|
32
33
|
.selected-floor-thumbnail {
|
|
33
|
-
min-width:
|
|
34
|
+
min-width: 105px;
|
|
35
|
+
max-width: 160px;
|
|
36
|
+
margin-right: 10px;
|
|
37
|
+
justify-content: center;
|
|
38
|
+
align-items: center;
|
|
39
|
+
vertical-align: middle;
|
|
40
|
+
display: flex;
|
|
41
|
+
height: auto;
|
|
42
|
+
img {
|
|
43
|
+
display: block;
|
|
44
|
+
max-width: 100%;
|
|
45
|
+
height: max-content;
|
|
46
|
+
}
|
|
34
47
|
}
|
|
35
48
|
}
|
|
36
49
|
.selected-floor-info {
|
|
@@ -72,10 +85,19 @@ $input-border-color: #9FA9B4;
|
|
|
72
85
|
margin-bottom: 20px;
|
|
73
86
|
align-items: center;
|
|
74
87
|
|
|
88
|
+
.up-down-input-wrapper {
|
|
89
|
+
position: relative;
|
|
90
|
+
label {
|
|
91
|
+
position: absolute;
|
|
92
|
+
font-size: 12px;
|
|
93
|
+
padding: 5px;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
|
|
75
97
|
.selected-floor-input {
|
|
76
98
|
border: 1px solid $input-border-color;
|
|
77
99
|
box-sizing: border-box;
|
|
78
|
-
padding:
|
|
100
|
+
padding: 15px 10px 0;
|
|
79
101
|
border-radius: 3px;
|
|
80
102
|
line-height: 30px;
|
|
81
103
|
width: 100%;
|
|
@@ -145,3 +167,20 @@ $input-border-color: #9FA9B4;
|
|
|
145
167
|
background-color: #5b6875;
|
|
146
168
|
}
|
|
147
169
|
|
|
170
|
+
.floor-detail-item {
|
|
171
|
+
display: flex;
|
|
172
|
+
justify-content: space-between;
|
|
173
|
+
p {
|
|
174
|
+
font-weight: 300;
|
|
175
|
+
font-size: 14px;
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
.floor-detail-download {
|
|
180
|
+
display: flex;
|
|
181
|
+
justify-content: end;
|
|
182
|
+
button {
|
|
183
|
+
max-width: 150px;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
|