@colijnit/homedecorator 257.1.5 → 257.1.6

package/app/core/model/homedecorator-settings.d.ts

@@ -33,7 +33,6 @@ export declare class HomedecoratorSettings {
     options: HomedecoratorSettingsOptions;
     catalogParameters: GetArticlesForCatalogRequest;
     renderParameters: RenderParameters;
-    newRenderParameters: RenderParameters;
     arParameters: ArParameters;
     faqUrl: string;
     feedbackUrl: string;
@@ -43,7 +42,7 @@ export declare class HomedecoratorSettings {
     sceneBackground: string;
     sceneBackgroundColor: string;
     standaloneSceneBackgroundColor: string;
-    blenderRenderService: boolean;
+    blendFilesRender: boolean;
     renderApiClientId: string;
     uploadEndpoint: string;
     renderEndpoint: string;
@@ -55,4 +54,5 @@ export declare class HomedecoratorSettings {
     standAloneRoomplanner: boolean;
     projectSettings: HomedecoratorSettings;
     showFloorProductTab: boolean;
+    showAddToCart: boolean;
 }

package/app/core/service/3dm-api.d.ts

@@ -75,6 +75,9 @@ export declare class ApiServiceModule {
     constructor(iOneControllerService: HomedecoratorConnectorService, messageService: MessageBusService, _http: HttpClient, _settingsService: HomedecoratorSettingsService, _dialog: MatDialog, _configurationService: ConfigurationService);
     uploadToApiGLB(formData: FormData, filename: string, camera: PerspectiveCamera, standalone: boolean, renderParameters: any, renderPreview: boolean): Promise<void>;
     requestRender(filename: string, camera: PerspectiveCamera, standalone: boolean, renderParameters: any, renderPreview: boolean): Promise<any>;
+    getCameraProperties(camera: PerspectiveCamera): any;
+    getRenderFromJson(requestData: any): Promise<void>;
+    private _sendJsonRequest;
     private _sendRequest;
     private _setOptions;
     private _createRenderRequestBody;

package/app/core/service/homedecorator-connector-adapter.service.d.ts

@@ -29,6 +29,7 @@ import { ObjectConfiguration } from '@colijnit/ioneconnector/build/model/object-
 import { ArticleExtended } from '@colijnit/articleapi/build/model/article-extended.bo';
 import { Metadata } from '../../plugins/core3d/items/metadata';
 import { HomedecoratorSettings } from '../model/homedecorator-settings';
+import { CatalogExternalSourcesService } from '@colijnit/catalog';
 import * as i0 from "@angular/core";
 export declare class ExternalConnector {
     loginResponse: LoginResponse;
@@ -41,9 +42,13 @@ export interface Connector {
 }
 export declare class HomedecoratorConnectorAdapterService {
     private _appEventService;
+    private _catalogExternalSourcesService;
     readonly questionReceived: Subject<Question>;
     readonly showLoader: Subject<boolean>;
     readonly connectionReset: Subject<void>;
+    mainUrl: string;
+    mainSchema: string;
+    mainVersion: string;
     private _publicationCodeForUserRole;
     get connector(): Configurator;
     get articleApi(): Articles;
@@ -59,7 +64,7 @@ export declare class HomedecoratorConnectorAdapterService {
     private _articleApi;
     private _mainApi;
     private _boFactory;
-    constructor(_appEventService: HomedecoratorAppEventService);
+    constructor(_appEventService: HomedecoratorAppEventService, _catalogExternalSourcesService: CatalogExternalSourcesService);
     initConnectionFromMetadata(metadata: Metadata, settings: HomedecoratorSettings): Promise<void>;
     initConnector(options: Options, externalSource?: string, forceReload?: boolean, externalSourceId?: number): Promise<void>;
     logOut(): Promise<void>;

package/app/core/service/utils.service.d.ts

@@ -28,7 +28,7 @@ export declare class UtilsService implements OnDestroy {
     private _usdzExporter;
     private _gltfExporter;
     private _sceneRenderName;
-    private _sceneRenderContents;
+    private _sceneCachedCulling;
     constructor(apiServiceModule: ApiServiceModule, messageService: MessageBusService, _settingsService: HomedecoratorSettingsService, _jsonUtilsService: JsonUtilsService, _progressService: ProgressService, _itemsService: ItemService, _sceneService: SceneService, _dialog: MatDialog, _cameraService: CameraService);
     ngOnDestroy(): void;
     readFileAsText(file: File): Promise<string>;

package/app/plugins/core3d/service/wall-measurements.service.d.ts

@@ -15,6 +15,8 @@ export declare class WallMeasurementsService implements OnDestroy {
     private _subs;
     constructor(_floorplanService: FloorplanService, _viewModeService: ViewModeService, _sceneService: SceneService, _configurationService: ConfigurationService, _fontService: FontService);
     ngOnDestroy(): void;
+    prepMeasurementsForRender(): void;
+    restoreMeasurementsAfterRender(): void;
     private _showMeasurements;
     private _removeMeasurements;
     private _makeMeasurements;

package/app/plugins/model-uploader/model-previewer/model-preview.component.d.ts

@@ -60,6 +60,7 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
     canvReference: HTMLElement;
     hasErrors: boolean;
     listOfErrors: any[];
+    showLoader: boolean;
     private _measurements;
     protected readonly icon: typeof IconEnum;
     ngOnInit(): void;
@@ -92,12 +93,14 @@ export declare class ModelPreviewComponent implements OnInit, OnDestroy {
     private _addFromGeometry;
     private _prepModelForScene;
     private _getBoundingBox;
+    private _applyTransforms;
     private _setMeasurements;
     private _create3DText;
     private _blobToArrayBuffer;
     private _createLightFromProperties;
     private _setObjectProperties;
     private _validateObjectStructure;
+    private _validateMaterial;
     static ɵfac: i0.ɵɵFactoryDeclaration<ModelPreviewComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<ModelPreviewComponent, "rp-model-preview", never, {}, {}, never, never>;
 }

package/app/plugins/model-uploader/model-uploader.module.d.ts

@@ -14,8 +14,9 @@ import * as i12 from "@angular/material/form-field";
 import * as i13 from "@angular/material/core";
 import * as i14 from "@angular/material/select";
 import * as i15 from "@angular/forms";
+import * as i16 from "../../shared/loader/loader.module";
 export declare class ModelUploaderModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<ModelUploaderModule, never>;
-    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]>;
+    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]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<ModelUploaderModule>;
 }

package/app/plugins/render/render-controls/render-controls.component.d.ts

@@ -14,6 +14,8 @@ import { NewRenderService } from '../service/new-render.service';
 import { UtilsService } from '../../../core/service/utils.service';
 import { IconEnum } from '../../../core/enum/icon.enum';
 import { HomedecoratorIconCacheService } from '../../../core/service/homedecorator-icon-cache.service';
+import { RoomService } from '../../room-planner/components/floorplanner/service/room.service';
+import { WallMeasurementsService } from '../../core3d/service/wall-measurements.service';
 import * as i0 from "@angular/core";
 export declare class RenderControlsComponent {
     renderService: RenderService;
@@ -28,6 +30,8 @@ export declare class RenderControlsComponent {
     private _settingsService;
     private _newRenderService;
     private _utilsService;
+    private _roomService;
+    private _wallMeasurementsService;
     readonly icons: typeof IconEnum;
     blenderPreviewRender: string;
     hdriIntensity: number;
@@ -35,7 +39,7 @@ export declare class RenderControlsComponent {
     lightingExposure: number;
     showRenderSettings: boolean;
     private _subs;
-    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);
+    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);
     get disablePictureButton(): boolean;
     readonly viewModes: typeof ViewMode;
     readonly renderStatus: typeof RenderStatus;
@@ -44,6 +48,7 @@ export declare class RenderControlsComponent {
     errorText: string;
     imageRenderSource: any;
     inPictureMode: boolean;
+    showCullingErrorDialog: boolean;
     readonly renderModes: typeof RenderModes;
     showRenderForm(event: MouseEvent): void;
     startRenderingRoom(): Promise<void>;
@@ -55,6 +60,7 @@ export declare class RenderControlsComponent {
     toggleRenderSettings(): void;
     validateRenderPosition(): void;
     private _getObjectsByName;
+    private _allowCulling;
     static ɵfac: i0.ɵɵFactoryDeclaration<RenderControlsComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<RenderControlsComponent, "rp-render-controls", never, {}, {}, never, never>;
 }

package/app/plugins/render/service/new-render.service.d.ts

@@ -15,6 +15,8 @@ import { RoomService } from '../../room-planner/components/floorplanner/service/
 import { FloorService } from '../../core3d/service/floor.service';
 import { LoadFurnitureService } from '../../threedselector/threedselector/service/load-furniture.service';
 import { UtilsService } from '../../../core/service/utils.service';
+import { ApiServiceModule } from '../../../core/service/3dm-api';
+import { PresetsService } from '../../../core/service/presets.service';
 import * as i0 from "@angular/core";
 export declare class NewRenderService implements OnDestroy {
     messageService: MessageBusService;
@@ -32,6 +34,8 @@ export declare class NewRenderService implements OnDestroy {
     private _floorService;
     private _loadFurnitureService;
     private _utilsService;
+    private _presetService;
+    private _apiServiceModule;
     renderImageChanged: BehaviorSubject<string>;
     renderUpdateImageChanged: BehaviorSubject<{
         image: string;
@@ -43,7 +47,7 @@ export declare class NewRenderService implements OnDestroy {
     currentQueueRenderItem: RenderQueueItem;
     renderedRoomImages: string[];
     private _subs;
-    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);
+    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);
     ngOnDestroy(): void;
     procesRenderFile(file: any): void;
     forceRenderImage(): void;
@@ -51,12 +55,14 @@ export declare class NewRenderService implements OnDestroy {
     renderRoom(size: any): Promise<void>;
     private _exportToGlb;
     private _getNewRenderImage;
-    private _handleAjaxBlenderRender;
+    private _createRenderFromJson;
+    private _getDataForJsonRender;
     private _handleAjaxRender;
     private _handleWebSocketRender;
     private _handleWebSocketRoomRender;
     private _showPreviewImage;
     private _getDataForRender;
+    private _getSceneRenderSettings;
     private _getDataForRoomRender;
     private _arrayBufferToBase64;
     static ɵfac: i0.ɵɵFactoryDeclaration<NewRenderService, never>;

package/app/plugins/render/service/render.service.d.ts

@@ -58,7 +58,7 @@ export declare class RenderService implements OnDestroy {
     selectedImageSize: number;
     selectedEnvironment: number;
     selectedRenderScene: string;
-    blenderRenderService: boolean;
+    blendFilesRender: boolean;
     positions: number;
     save: boolean;
     renderRoomImageChanged: BehaviorSubject<string>;

package/app/shared/loader/loader.component.d.ts

@@ -0,0 +1,6 @@
+import * as i0 from "@angular/core";
+export declare class LoaderComponent {
+    show: boolean;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LoaderComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LoaderComponent, "rp-loader", never, { "show": "show"; }, {}, never, never>;
+}

package/app/shared/loader/loader.module.d.ts

@@ -0,0 +1,8 @@
+import * as i0 from "@angular/core";
+import * as i1 from "./loader.component";
+import * as i2 from "../../core/core.module";
+export declare class LoaderModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<LoaderModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<LoaderModule, [typeof i1.LoaderComponent], [typeof i2.CoreModule], [typeof i1.LoaderComponent]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<LoaderModule>;
+}