@colijnit/homedecorator 256.1.19 → 256.1.21
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/model/homedecorator-settings.d.ts +2 -2
- package/app/core/service/3dm-api.d.ts +38 -4
- package/app/core/service/homedecorator-connector-adapter.service.d.ts +3 -0
- package/app/core/service/utils.service.d.ts +1 -1
- package/app/plugins/core3d/service/wall-measurements.service.d.ts +2 -0
- package/app/plugins/model-uploader/model-previewer/model-preview.component.d.ts +6 -2
- package/app/plugins/model-uploader/model-uploader/model-upload.component.scss +5 -0
- package/app/plugins/model-uploader/model-uploader/model-uploader.component.d.ts +2 -4
- package/app/plugins/model-uploader/model-uploader.module.d.ts +2 -1
- package/app/plugins/render/render-controls/render-controls.component.d.ts +13 -3
- package/app/plugins/render/render-controls/render-controls.component.scss +74 -1
- package/app/plugins/render/render.module.d.ts +2 -1
- package/app/plugins/render/service/new-render.service.d.ts +8 -2
- package/app/plugins/render/service/render.service.d.ts +1 -1
- package/app/shared/loader/loader.component.d.ts +6 -0
- package/app/shared/loader/loader.module.d.ts +8 -0
- package/assets/icons/triangle_exclamation.svg +1 -0
- package/bundles/colijnit-homedecorator.umd.js +950 -474
- package/bundles/colijnit-homedecorator.umd.js.map +1 -1
- package/esm2015/app/app.version.js +3 -3
- package/esm2015/app/core/enum/icon.enum.js +2 -1
- package/esm2015/app/core/model/homedecorator-settings.js +2 -2
- package/esm2015/app/core/model/icon.js +2 -1
- package/esm2015/app/core/service/3dm-api.js +131 -34
- package/esm2015/app/core/service/homedecorator-connector-adapter.service.js +5 -5
- package/esm2015/app/core/service/homedecorator-settings.service.js +6 -3
- package/esm2015/app/core/service/utils.service.js +148 -76
- package/esm2015/app/plugins/core3d/core3d/core3d.component.js +2 -2
- package/esm2015/app/plugins/core3d/service/ssr.service.js +3 -3
- package/esm2015/app/plugins/core3d/service/wall-measurements.service.js +7 -1
- package/esm2015/app/plugins/model-uploader/model-previewer/model-preview.component.js +188 -61
- package/esm2015/app/plugins/model-uploader/model-uploader/model-uploader.component.js +5 -7
- package/esm2015/app/plugins/model-uploader/model-uploader.module.js +8 -4
- package/esm2015/app/plugins/render/render-controls/render-controls.component.js +323 -99
- package/esm2015/app/plugins/render/render-dialog/render-dialog.component.js +2 -2
- package/esm2015/app/plugins/render/render.module.js +8 -4
- package/esm2015/app/plugins/render/service/new-render.service.js +125 -58
- package/esm2015/app/plugins/render/service/render.service.js +9 -8
- package/esm2015/app/plugins/room-planner/room-planner/room-planner.component.js +11 -9
- package/esm2015/app/plugins/threedselector/threedselector/service/load-furniture.service.js +3 -3
- package/esm2015/app/shared/loader/loader.component.js +23 -0
- package/esm2015/app/shared/loader/loader.module.js +29 -0
- package/fesm2015/colijnit-homedecorator.js +1136 -495
- package/fesm2015/colijnit-homedecorator.js.map +1 -1
- package/package.json +4 -4
|
@@ -82,6 +82,7 @@ export declare enum IconEnum {
|
|
|
82
82
|
TiltPhone = "tilt-phone",
|
|
83
83
|
TrashCanLight = "trash_can_light",
|
|
84
84
|
TriangleDown = "triangle_down",
|
|
85
|
+
TriangleExclamation = "triangle_exclamation",
|
|
85
86
|
TriangleUp = "triangle_up",
|
|
86
87
|
UploadLight = "upload_light",
|
|
87
88
|
WandMagicSparkles = "wand_magic_sparkles",
|
|
@@ -33,7 +33,6 @@ export declare class HomedecoratorSettings {
|
|
|
33
33
|
options: HomedecoratorSettingsOptions;
|
|
34
34
|
catalogParameters: GetArticlesForCatalogRequest;
|
|
35
35
|
renderParameters: RenderParameters;
|
|
36
|
-
newRenderParameters: RenderParameters;
|
|
37
36
|
arParameters: ArParameters;
|
|
38
37
|
faqUrl: string;
|
|
39
38
|
feedbackUrl: string;
|
|
@@ -43,7 +42,7 @@ export declare class HomedecoratorSettings {
|
|
|
43
42
|
sceneBackground: string;
|
|
44
43
|
sceneBackgroundColor: string;
|
|
45
44
|
standaloneSceneBackgroundColor: string;
|
|
46
|
-
|
|
45
|
+
blendFilesRender: boolean;
|
|
47
46
|
renderApiClientId: string;
|
|
48
47
|
uploadEndpoint: string;
|
|
49
48
|
renderEndpoint: string;
|
|
@@ -55,4 +54,5 @@ export declare class HomedecoratorSettings {
|
|
|
55
54
|
standAloneRoomplanner: boolean;
|
|
56
55
|
projectSettings: HomedecoratorSettings;
|
|
57
56
|
showFloorProductTab: boolean;
|
|
57
|
+
showAddToCart: boolean;
|
|
58
58
|
}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { HttpClient } from '@angular/common/http';
|
|
2
|
-
import { PerspectiveCamera } from 'three';
|
|
2
|
+
import { PerspectiveCamera, Vector3 } from 'three';
|
|
3
3
|
import { HomedecoratorSettingsService } from './homedecorator-settings.service';
|
|
4
4
|
import { MessageBusService } from './message-bus.service';
|
|
5
5
|
import { MatDialog } from '@angular/material/dialog';
|
|
6
6
|
import { HomedecoratorConnectorService } from './homedecorator-connector.service';
|
|
7
|
+
import { ConfigurationService } from './configuration.service';
|
|
7
8
|
import * as i0 from "@angular/core";
|
|
8
9
|
export declare class OutputSettings {
|
|
9
10
|
width: number;
|
|
@@ -15,6 +16,26 @@ export declare class OutputSettings {
|
|
|
15
16
|
duration: number;
|
|
16
17
|
bounces: number;
|
|
17
18
|
}
|
|
19
|
+
export declare class SceneSettings {
|
|
20
|
+
activeCameraId: number;
|
|
21
|
+
sceneAssetId: string;
|
|
22
|
+
lightGroupId: number;
|
|
23
|
+
hdriAssetId: number;
|
|
24
|
+
hdriRotation: Vector3;
|
|
25
|
+
hdriIntensity: number;
|
|
26
|
+
default: boolean;
|
|
27
|
+
id: number;
|
|
28
|
+
}
|
|
29
|
+
export declare class RenderSettings {
|
|
30
|
+
renderSettingsAssetId: string;
|
|
31
|
+
width: number;
|
|
32
|
+
height: number;
|
|
33
|
+
outputType: OutputType;
|
|
34
|
+
renderType: RenderType;
|
|
35
|
+
transparency: boolean;
|
|
36
|
+
quality: number;
|
|
37
|
+
exposure: number;
|
|
38
|
+
}
|
|
18
39
|
export declare class Camera {
|
|
19
40
|
id: number;
|
|
20
41
|
assetId: string;
|
|
@@ -28,6 +49,12 @@ export declare class CameraDOF {
|
|
|
28
49
|
blades: number;
|
|
29
50
|
rotation: number;
|
|
30
51
|
}
|
|
52
|
+
export declare class RGBA {
|
|
53
|
+
r: number;
|
|
54
|
+
g: number;
|
|
55
|
+
b: number;
|
|
56
|
+
a: number;
|
|
57
|
+
}
|
|
31
58
|
declare enum OutputType {
|
|
32
59
|
Jpeg = 0,
|
|
33
60
|
Png = 1,
|
|
@@ -44,21 +71,28 @@ export declare class ApiServiceModule {
|
|
|
44
71
|
private _http;
|
|
45
72
|
private _settingsService;
|
|
46
73
|
private _dialog;
|
|
47
|
-
|
|
74
|
+
private _configurationService;
|
|
75
|
+
constructor(iOneControllerService: HomedecoratorConnectorService, messageService: MessageBusService, _http: HttpClient, _settingsService: HomedecoratorSettingsService, _dialog: MatDialog, _configurationService: ConfigurationService);
|
|
48
76
|
uploadToApiGLB(formData: FormData, filename: string, camera: PerspectiveCamera, standalone: boolean, renderParameters: any, renderPreview: boolean): Promise<void>;
|
|
49
77
|
requestRender(filename: string, camera: PerspectiveCamera, standalone: boolean, renderParameters: any, renderPreview: boolean): Promise<any>;
|
|
78
|
+
getCameraProperties(camera: PerspectiveCamera): any;
|
|
79
|
+
getRenderFromJson(requestData: any): Promise<void>;
|
|
80
|
+
private _sendJsonRequest;
|
|
50
81
|
private _sendRequest;
|
|
51
82
|
private _setOptions;
|
|
52
83
|
private _createRenderRequestBody;
|
|
53
84
|
private _createProductRenderRequestBody;
|
|
54
|
-
private
|
|
55
|
-
private
|
|
85
|
+
private _setRenderSettings;
|
|
86
|
+
private _setProductRenderSettings;
|
|
87
|
+
private _setSceneSettings;
|
|
88
|
+
private _setProductSceneSettings;
|
|
56
89
|
private _calculateCameraPositionRotation;
|
|
57
90
|
private _setCameraRotation;
|
|
58
91
|
private _cameraSettings;
|
|
59
92
|
private _cameraProductSettings;
|
|
60
93
|
private _getSceneBasedLights;
|
|
61
94
|
private _shortenValue;
|
|
95
|
+
private _degreesToVector3;
|
|
62
96
|
static ɵfac: i0.ɵɵFactoryDeclaration<ApiServiceModule, never>;
|
|
63
97
|
static ɵprov: i0.ɵɵInjectableDeclaration<ApiServiceModule>;
|
|
64
98
|
}
|
|
@@ -44,6 +44,9 @@ export declare class HomedecoratorConnectorAdapterService {
|
|
|
44
44
|
readonly questionReceived: Subject<Question>;
|
|
45
45
|
readonly showLoader: Subject<boolean>;
|
|
46
46
|
readonly connectionReset: Subject<void>;
|
|
47
|
+
mainUrl: string;
|
|
48
|
+
mainSchema: string;
|
|
49
|
+
mainVersion: string;
|
|
47
50
|
private _publicationCodeForUserRole;
|
|
48
51
|
get connector(): Configurator;
|
|
49
52
|
get articleApi(): Articles;
|
|
@@ -28,7 +28,7 @@ export declare class UtilsService implements OnDestroy {
|
|
|
28
28
|
private _usdzExporter;
|
|
29
29
|
private _gltfExporter;
|
|
30
30
|
private _sceneRenderName;
|
|
31
|
-
private
|
|
31
|
+
private _sceneCachedCulling;
|
|
32
32
|
constructor(apiServiceModule: ApiServiceModule, messageService: MessageBusService, _settingsService: HomedecoratorSettingsService, _jsonUtilsService: JsonUtilsService, _progressService: ProgressService, _itemsService: ItemService, _sceneService: SceneService, _dialog: MatDialog, _cameraService: CameraService);
|
|
33
33
|
ngOnDestroy(): void;
|
|
34
34
|
readFileAsText(file: File): Promise<string>;
|
|
@@ -15,6 +15,8 @@ export declare class WallMeasurementsService implements OnDestroy {
|
|
|
15
15
|
private _subs;
|
|
16
16
|
constructor(_floorplanService: FloorplanService, _viewModeService: ViewModeService, _sceneService: SceneService, _configurationService: ConfigurationService, _fontService: FontService);
|
|
17
17
|
ngOnDestroy(): void;
|
|
18
|
+
prepMeasurementsForRender(): void;
|
|
19
|
+
restoreMeasurementsAfterRender(): void;
|
|
18
20
|
private _showMeasurements;
|
|
19
21
|
private _removeMeasurements;
|
|
20
22
|
private _makeMeasurements;
|
|
@@ -57,6 +57,10 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
|
|
|
57
57
|
heightAdjustable: boolean;
|
|
58
58
|
placementOptions: CoDomainValue[];
|
|
59
59
|
selectedPlacement: number;
|
|
60
|
+
canvReference: HTMLElement;
|
|
61
|
+
hasErrors: boolean;
|
|
62
|
+
listOfErrors: any[];
|
|
63
|
+
showLoader: boolean;
|
|
60
64
|
private _measurements;
|
|
61
65
|
protected readonly icon: typeof IconEnum;
|
|
62
66
|
ngOnInit(): void;
|
|
@@ -89,13 +93,13 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
|
|
|
89
93
|
private _addFromGeometry;
|
|
90
94
|
private _prepModelForScene;
|
|
91
95
|
private _getBoundingBox;
|
|
96
|
+
private _applyTransforms;
|
|
92
97
|
private _setMeasurements;
|
|
93
98
|
private _create3DText;
|
|
94
99
|
private _blobToArrayBuffer;
|
|
95
100
|
private _createLightFromProperties;
|
|
96
101
|
private _setObjectProperties;
|
|
97
|
-
private
|
|
98
|
-
private _replaceProceduralTextures;
|
|
102
|
+
private _validateObjectStructure;
|
|
99
103
|
static ɵfac: i0.ɵɵFactoryDeclaration<ModelPreviewComponent, never>;
|
|
100
104
|
static ɵcmp: i0.ɵɵComponentDeclaration<ModelPreviewComponent, "rp-model-preview", never, {}, {}, never, never>;
|
|
101
105
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { ElementRef
|
|
1
|
+
import { ElementRef } from '@angular/core';
|
|
2
2
|
import { HomedecoratorSettingsService } from '../../../core/service/homedecorator-settings.service';
|
|
3
3
|
import { MessageBusService } from '../../../core/service/message-bus.service';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
|
-
export declare class ModelUploaderComponent
|
|
5
|
+
export declare class ModelUploaderComponent {
|
|
6
6
|
settingsService: HomedecoratorSettingsService;
|
|
7
7
|
private _messageService;
|
|
8
8
|
fileUploadInput: ElementRef;
|
|
@@ -13,8 +13,6 @@ export declare class ModelUploaderComponent implements OnInit, OnDestroy {
|
|
|
13
13
|
private _maxFileSize;
|
|
14
14
|
private _allowedFiles;
|
|
15
15
|
constructor(settingsService: HomedecoratorSettingsService, _messageService: MessageBusService);
|
|
16
|
-
ngOnInit(): void;
|
|
17
|
-
ngOnDestroy(): void;
|
|
18
16
|
onChange(event: any): void;
|
|
19
17
|
upload(fileExtension: string): Promise<void>;
|
|
20
18
|
fileToArrayBuffer(file: File): Promise<ArrayBuffer>;
|
|
@@ -14,8 +14,9 @@ import * as i12 from "@angular/material/form-field";
|
|
|
14
14
|
import * as i13 from "@angular/material/core";
|
|
15
15
|
import * as i14 from "@angular/material/select";
|
|
16
16
|
import * as i15 from "@angular/forms";
|
|
17
|
+
import * as i16 from "../../shared/loader/loader.module";
|
|
17
18
|
export declare class ModelUploaderModule {
|
|
18
19
|
static ɵfac: i0.ɵɵFactoryDeclaration<ModelUploaderModule, never>;
|
|
19
|
-
static ɵmod: i0.ɵɵNgModuleDeclaration<ModelUploaderModule, [typeof i1.ModelUploaderComponent, typeof i2.ModelPreviewComponent], [typeof i3.CommonModule, typeof i4.CoreModule, typeof i5.MatIconModule, typeof i6.MatButtonModule, typeof i7.ButtonModule, typeof i8.ImageModule, typeof i9.CatalogExternalSourcesModule, typeof i9.CatalogExternalSourceModule, typeof i10.MatRadioModule, typeof i11.MatSlideToggleModule, typeof i12.MatFormFieldModule, typeof i13.MatOptionModule, typeof i14.MatSelectModule, typeof i7.IconModule, typeof i15.FormsModule], [typeof i1.ModelUploaderComponent]>;
|
|
20
|
+
static ɵmod: i0.ɵɵNgModuleDeclaration<ModelUploaderModule, [typeof i1.ModelUploaderComponent, typeof i2.ModelPreviewComponent], [typeof i3.CommonModule, typeof i4.CoreModule, typeof i5.MatIconModule, typeof i6.MatButtonModule, typeof i7.ButtonModule, typeof i8.ImageModule, typeof i9.CatalogExternalSourcesModule, typeof i9.CatalogExternalSourceModule, typeof i10.MatRadioModule, typeof i11.MatSlideToggleModule, typeof i12.MatFormFieldModule, typeof i13.MatOptionModule, typeof i14.MatSelectModule, typeof i7.IconModule, typeof i15.FormsModule, typeof i16.LoaderModule], [typeof i1.ModelUploaderComponent]>;
|
|
20
21
|
static ɵinj: i0.ɵɵInjectorDeclaration<ModelUploaderModule>;
|
|
21
22
|
}
|
|
@@ -14,6 +14,8 @@ import { NewRenderService } from '../service/new-render.service';
|
|
|
14
14
|
import { UtilsService } from '../../../core/service/utils.service';
|
|
15
15
|
import { IconEnum } from '../../../core/enum/icon.enum';
|
|
16
16
|
import { HomedecoratorIconCacheService } from '../../../core/service/homedecorator-icon-cache.service';
|
|
17
|
+
import { RoomService } from '../../room-planner/components/floorplanner/service/room.service';
|
|
18
|
+
import { WallMeasurementsService } from '../../core3d/service/wall-measurements.service';
|
|
17
19
|
import * as i0 from "@angular/core";
|
|
18
20
|
export declare class RenderControlsComponent {
|
|
19
21
|
renderService: RenderService;
|
|
@@ -28,10 +30,16 @@ export declare class RenderControlsComponent {
|
|
|
28
30
|
private _settingsService;
|
|
29
31
|
private _newRenderService;
|
|
30
32
|
private _utilsService;
|
|
33
|
+
private _roomService;
|
|
34
|
+
private _wallMeasurementsService;
|
|
31
35
|
readonly icons: typeof IconEnum;
|
|
32
36
|
blenderPreviewRender: string;
|
|
37
|
+
hdriIntensity: number;
|
|
38
|
+
hdriRotation: number;
|
|
39
|
+
lightingExposure: number;
|
|
40
|
+
showRenderSettings: boolean;
|
|
33
41
|
private _subs;
|
|
34
|
-
constructor(renderService: RenderService, messageService: MessageBusService, viewModeService: ViewModeService, settingsService: HomedecoratorSettingsService, iconService: HomedecoratorIconCacheService, _dialog: MatDialog, _sceneService: SceneService, _cameraService: CameraService, _configurationService: ConfigurationService, _settingsService: HomedecoratorSettingsService, _newRenderService: NewRenderService, _utilsService: UtilsService);
|
|
42
|
+
constructor(renderService: RenderService, messageService: MessageBusService, viewModeService: ViewModeService, settingsService: HomedecoratorSettingsService, iconService: HomedecoratorIconCacheService, _dialog: MatDialog, _sceneService: SceneService, _cameraService: CameraService, _configurationService: ConfigurationService, _settingsService: HomedecoratorSettingsService, _newRenderService: NewRenderService, _utilsService: UtilsService, _roomService: RoomService, _wallMeasurementsService: WallMeasurementsService);
|
|
35
43
|
get disablePictureButton(): boolean;
|
|
36
44
|
readonly viewModes: typeof ViewMode;
|
|
37
45
|
readonly renderStatus: typeof RenderStatus;
|
|
@@ -40,17 +48,19 @@ export declare class RenderControlsComponent {
|
|
|
40
48
|
errorText: string;
|
|
41
49
|
imageRenderSource: any;
|
|
42
50
|
inPictureMode: boolean;
|
|
51
|
+
showCullingErrorDialog: boolean;
|
|
43
52
|
readonly renderModes: typeof RenderModes;
|
|
44
53
|
showRenderForm(event: MouseEvent): void;
|
|
45
|
-
checkCameraPosition(event: MouseEvent): void;
|
|
46
54
|
startRenderingRoom(): Promise<void>;
|
|
47
55
|
createBlenderRender(): void;
|
|
48
56
|
resetBlenderRenderScene(): void;
|
|
49
57
|
moveCameraWithinBounds(): void;
|
|
50
58
|
getPreviewRender(): void;
|
|
51
59
|
showPreview(image: string): void;
|
|
52
|
-
|
|
60
|
+
toggleRenderSettings(): void;
|
|
61
|
+
validateRenderPosition(): void;
|
|
53
62
|
private _getObjectsByName;
|
|
63
|
+
private _allowCulling;
|
|
54
64
|
static ɵfac: i0.ɵɵFactoryDeclaration<RenderControlsComponent, never>;
|
|
55
65
|
static ɵcmp: i0.ɵɵComponentDeclaration<RenderControlsComponent, "rp-render-controls", never, {}, {}, never, never>;
|
|
56
66
|
}
|
|
@@ -15,12 +15,26 @@ $border-color: #dda73f;
|
|
|
15
15
|
padding: 10px 25px 25px;
|
|
16
16
|
border-radius: 5px;
|
|
17
17
|
box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
|
|
18
|
+
max-width: 325px;
|
|
18
19
|
|
|
19
20
|
.render-popup-header {
|
|
20
21
|
display: flex;
|
|
21
22
|
justify-content: space-between;
|
|
22
23
|
font-family: inherit;
|
|
23
24
|
|
|
25
|
+
h3 {
|
|
26
|
+
display: flex;
|
|
27
|
+
justify-content: space-between;
|
|
28
|
+
::ng-deep .renderErrorIcon {
|
|
29
|
+
width: 20px;
|
|
30
|
+
height: 20px;
|
|
31
|
+
margin-left: 20px;
|
|
32
|
+
svg, svg polygon {
|
|
33
|
+
fill: #DC143C;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
24
38
|
.close-popup-container {
|
|
25
39
|
cursor: pointer;
|
|
26
40
|
border: none;
|
|
@@ -78,6 +92,8 @@ $border-color: #dda73f;
|
|
|
78
92
|
min-width: 275px;
|
|
79
93
|
margin: 5px 0;
|
|
80
94
|
position: relative;
|
|
95
|
+
width: 275px;
|
|
96
|
+
height: 150px;
|
|
81
97
|
|
|
82
98
|
.render-popup-preview-placeholder {
|
|
83
99
|
background-color: #fff;
|
|
@@ -102,6 +118,7 @@ $border-color: #dda73f;
|
|
|
102
118
|
width: 30px;
|
|
103
119
|
background-color: #dda73f;
|
|
104
120
|
color: #fff;
|
|
121
|
+
margin: 0;
|
|
105
122
|
|
|
106
123
|
::ng-deep co-icon {
|
|
107
124
|
svg {
|
|
@@ -117,13 +134,31 @@ $border-color: #dda73f;
|
|
|
117
134
|
margin: 5px 0;
|
|
118
135
|
width: 100%;
|
|
119
136
|
|
|
137
|
+
.toggleable {
|
|
138
|
+
cursor: pointer;
|
|
139
|
+
display: flex;
|
|
140
|
+
justify-content: right;
|
|
141
|
+
align-content: center;
|
|
142
|
+
p{
|
|
143
|
+
padding: 0;
|
|
144
|
+
margin: 0;
|
|
145
|
+
font-size: 12px;
|
|
146
|
+
line-height: 30px;
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
.icon-rotate {
|
|
150
|
+
transform: rotate(180deg);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
|
|
120
154
|
.mat-form-field {
|
|
121
155
|
width: 100%;
|
|
122
|
-
|
|
156
|
+
font-size: 14px;
|
|
123
157
|
::ng-deep .mat-form-field-flex {
|
|
124
158
|
background-color: #fff;
|
|
125
159
|
color: #000;
|
|
126
160
|
padding: 3px 6px;
|
|
161
|
+
border: 1px solid #ddd;
|
|
127
162
|
}
|
|
128
163
|
|
|
129
164
|
::ng-deep .mat-form-field-underline {
|
|
@@ -134,6 +169,44 @@ $border-color: #dda73f;
|
|
|
134
169
|
padding-bottom: 0;
|
|
135
170
|
}
|
|
136
171
|
}
|
|
172
|
+
|
|
173
|
+
.setting-part-container {
|
|
174
|
+
display: flex;
|
|
175
|
+
justify-content: space-between;
|
|
176
|
+
align-items: center;
|
|
177
|
+
margin-bottom: 5px;
|
|
178
|
+
.third-width {
|
|
179
|
+
width: 32%
|
|
180
|
+
}
|
|
181
|
+
.setting-part-buttons {
|
|
182
|
+
|
|
183
|
+
.amount-button {
|
|
184
|
+
float: none;
|
|
185
|
+
box-sizing: border-box;
|
|
186
|
+
padding: 2px;
|
|
187
|
+
background: none;
|
|
188
|
+
cursor: pointer;
|
|
189
|
+
border: none;
|
|
190
|
+
width: 25px;
|
|
191
|
+
height: 25px;
|
|
192
|
+
margin: 0 5px;
|
|
193
|
+
co-icon {
|
|
194
|
+
display: block;
|
|
195
|
+
width: 25px;
|
|
196
|
+
height: 25px;
|
|
197
|
+
::ng-deep svg {
|
|
198
|
+
fill: #5b6875;
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
.setting-part-slider {
|
|
204
|
+
.mat-slider-horizontal {
|
|
205
|
+
min-width: 110px;
|
|
206
|
+
height: 28px;
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
}
|
|
137
210
|
}
|
|
138
211
|
}
|
|
139
212
|
|
|
@@ -14,8 +14,9 @@ import * as i12 from "@angular/material/grid-list";
|
|
|
14
14
|
import * as i13 from "@angular/material/progress-spinner";
|
|
15
15
|
import * as i14 from "@angular/forms";
|
|
16
16
|
import * as i15 from "@colijnit/corecomponents";
|
|
17
|
+
import * as i16 from "@angular/material/slider";
|
|
17
18
|
export declare class RenderModule {
|
|
18
19
|
static ɵfac: i0.ɵɵFactoryDeclaration<RenderModule, never>;
|
|
19
|
-
static ɵmod: i0.ɵɵNgModuleDeclaration<RenderModule, [typeof i1.RenderDialogComponent, typeof i2.RenderControlsComponent], [typeof i3.CoreModule, typeof i4.CommonModule, typeof i5.MatButtonModule, typeof i6.MatDialogModule, typeof i7.MatTooltipModule, typeof i8.MatInputModule, typeof i9.MatIconModule, typeof i10.MatSelectModule, typeof i11.MatSlideToggleModule, typeof i12.MatGridListModule, typeof i13.MatProgressSpinnerModule, typeof i14.FormsModule, typeof i15.IconModule], [typeof i1.RenderDialogComponent, typeof i2.RenderControlsComponent]>;
|
|
20
|
+
static ɵmod: i0.ɵɵNgModuleDeclaration<RenderModule, [typeof i1.RenderDialogComponent, typeof i2.RenderControlsComponent], [typeof i3.CoreModule, typeof i4.CommonModule, typeof i5.MatButtonModule, typeof i6.MatDialogModule, typeof i7.MatTooltipModule, typeof i8.MatInputModule, typeof i9.MatIconModule, typeof i10.MatSelectModule, typeof i11.MatSlideToggleModule, typeof i12.MatGridListModule, typeof i13.MatProgressSpinnerModule, typeof i14.FormsModule, typeof i15.IconModule, typeof i16.MatSliderModule], [typeof i1.RenderDialogComponent, typeof i2.RenderControlsComponent]>;
|
|
20
21
|
static ɵinj: i0.ɵɵInjectorDeclaration<RenderModule>;
|
|
21
22
|
}
|
|
@@ -15,6 +15,8 @@ import { RoomService } from '../../room-planner/components/floorplanner/service/
|
|
|
15
15
|
import { FloorService } from '../../core3d/service/floor.service';
|
|
16
16
|
import { LoadFurnitureService } from '../../threedselector/threedselector/service/load-furniture.service';
|
|
17
17
|
import { UtilsService } from '../../../core/service/utils.service';
|
|
18
|
+
import { ApiServiceModule } from '../../../core/service/3dm-api';
|
|
19
|
+
import { PresetsService } from '../../../core/service/presets.service';
|
|
18
20
|
import * as i0 from "@angular/core";
|
|
19
21
|
export declare class NewRenderService implements OnDestroy {
|
|
20
22
|
messageService: MessageBusService;
|
|
@@ -32,6 +34,8 @@ export declare class NewRenderService implements OnDestroy {
|
|
|
32
34
|
private _floorService;
|
|
33
35
|
private _loadFurnitureService;
|
|
34
36
|
private _utilsService;
|
|
37
|
+
private _presetService;
|
|
38
|
+
private _apiServiceModule;
|
|
35
39
|
renderImageChanged: BehaviorSubject<string>;
|
|
36
40
|
renderUpdateImageChanged: BehaviorSubject<{
|
|
37
41
|
image: string;
|
|
@@ -43,7 +47,7 @@ export declare class NewRenderService implements OnDestroy {
|
|
|
43
47
|
currentQueueRenderItem: RenderQueueItem;
|
|
44
48
|
renderedRoomImages: string[];
|
|
45
49
|
private _subs;
|
|
46
|
-
constructor(messageService: MessageBusService, _settingsService: HomedecoratorSettingsService, _buildFurnitureService: BuildFurnitureService, _cameraService: CameraService, _sceneService: SceneService, _ione: HomedecoratorConnectorService, _ioneConnectorAdapter: HomedecoratorConnectorAdapterService, _threedSelectorService: ThreedselectorService, _toastService: ToastService, _messageBusService: MessageBusService, _googleTagManager: GoogleTagManagerService, _roomService: RoomService, _floorService: FloorService, _loadFurnitureService: LoadFurnitureService, _utilsService: UtilsService);
|
|
50
|
+
constructor(messageService: MessageBusService, _settingsService: HomedecoratorSettingsService, _buildFurnitureService: BuildFurnitureService, _cameraService: CameraService, _sceneService: SceneService, _ione: HomedecoratorConnectorService, _ioneConnectorAdapter: HomedecoratorConnectorAdapterService, _threedSelectorService: ThreedselectorService, _toastService: ToastService, _messageBusService: MessageBusService, _googleTagManager: GoogleTagManagerService, _roomService: RoomService, _floorService: FloorService, _loadFurnitureService: LoadFurnitureService, _utilsService: UtilsService, _presetService: PresetsService, _apiServiceModule: ApiServiceModule);
|
|
47
51
|
ngOnDestroy(): void;
|
|
48
52
|
procesRenderFile(file: any): void;
|
|
49
53
|
forceRenderImage(): void;
|
|
@@ -51,12 +55,14 @@ export declare class NewRenderService implements OnDestroy {
|
|
|
51
55
|
renderRoom(size: any): Promise<void>;
|
|
52
56
|
private _exportToGlb;
|
|
53
57
|
private _getNewRenderImage;
|
|
54
|
-
private
|
|
58
|
+
private _createRenderFromJson;
|
|
59
|
+
private _getDataForJsonRender;
|
|
55
60
|
private _handleAjaxRender;
|
|
56
61
|
private _handleWebSocketRender;
|
|
57
62
|
private _handleWebSocketRoomRender;
|
|
58
63
|
private _showPreviewImage;
|
|
59
64
|
private _getDataForRender;
|
|
65
|
+
private _getSceneRenderSettings;
|
|
60
66
|
private _getDataForRoomRender;
|
|
61
67
|
private _arrayBufferToBase64;
|
|
62
68
|
static ɵfac: i0.ɵɵFactoryDeclaration<NewRenderService, never>;
|
|
@@ -58,7 +58,7 @@ export declare class RenderService implements OnDestroy {
|
|
|
58
58
|
selectedImageSize: number;
|
|
59
59
|
selectedEnvironment: number;
|
|
60
60
|
selectedRenderScene: string;
|
|
61
|
-
|
|
61
|
+
blendFilesRender: boolean;
|
|
62
62
|
positions: number;
|
|
63
63
|
save: boolean;
|
|
64
64
|
renderRoomImageChanged: BehaviorSubject<string>;
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import * as i0 from "@angular/core";
|
|
2
|
+
export declare class LoaderComponent {
|
|
3
|
+
show: boolean;
|
|
4
|
+
static ɵfac: i0.ɵɵFactoryDeclaration<LoaderComponent, never>;
|
|
5
|
+
static ɵcmp: i0.ɵɵComponentDeclaration<LoaderComponent, "rp-loader", never, { "show": "show"; }, {}, never, never>;
|
|
6
|
+
}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import * as i0 from "@angular/core";
|
|
2
|
+
import * as i1 from "./loader.component";
|
|
3
|
+
import * as i2 from "../../core/core.module";
|
|
4
|
+
export declare class LoaderModule {
|
|
5
|
+
static ɵfac: i0.ɵɵFactoryDeclaration<LoaderModule, never>;
|
|
6
|
+
static ɵmod: i0.ɵɵNgModuleDeclaration<LoaderModule, [typeof i1.LoaderComponent], [typeof i2.CoreModule], [typeof i1.LoaderComponent]>;
|
|
7
|
+
static ɵinj: i0.ɵɵInjectorDeclaration<LoaderModule>;
|
|
8
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Pro 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc.--><path d="M248.4 84.3c1.6-2.7 4.5-4.3 7.6-4.3s6 1.6 7.6 4.3L461.9 410c1.4 2.3 2.1 4.9 2.1 7.5c0 8-6.5 14.5-14.5 14.5l-387 0c-8 0-14.5-6.5-14.5-14.5c0-2.7 .7-5.3 2.1-7.5L248.4 84.3zm-41-25L9.1 385c-6 9.8-9.1 21-9.1 32.5C0 452 28 480 62.5 480l387 0c34.5 0 62.5-28 62.5-62.5c0-11.5-3.2-22.7-9.1-32.5L304.6 59.3C294.3 42.4 275.9 32 256 32s-38.3 10.4-48.6 27.3zM288 368a32 32 0 1 0 -64 0 32 32 0 1 0 64 0zm-8-184c0-13.3-10.7-24-24-24s-24 10.7-24 24l0 96c0 13.3 10.7 24 24 24s24-10.7 24-24l0-96z"/></svg>
|