@colijnit/homedecorator 255.1.17 → 255.1.19
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/model/homedecorator-settings.d.ts +1 -0
- package/app/plugins/core3d/hud/measurements.d.ts +1 -1
- package/bundles/colijnit-homedecorator.umd.js +12 -7
- package/bundles/colijnit-homedecorator.umd.js.map +1 -1
- package/colijnit-homedecorator-255.1.17.tgz +0 -0
- package/colijnit-homedecorator-255.1.19.tgz +0 -0
- package/esm2015/app/core/model/homedecorator-settings.js +1 -1
- package/esm2015/app/core/service/homedecorator-settings.service.js +4 -1
- package/esm2015/app/plugins/core3d/hud/furniture-measurements.js +2 -2
- package/esm2015/app/plugins/core3d/hud/measurements.js +5 -3
- package/esm2015/app/plugins/core3d/hud/on-wall-measurements.js +3 -3
- package/esm2015/app/plugins/core3d/items/wall-objects.js +1 -1
- package/esm2015/app/plugins/product-catalog/product-catalog/product-catalog.component.js +3 -3
- package/fesm2015/colijnit-homedecorator.js +12 -7
- package/fesm2015/colijnit-homedecorator.js.map +1 -1
- package/package.json +1 -1
|
@@ -51,6 +51,7 @@ export declare class HomedecoratorSettings {
|
|
|
51
51
|
user3DModelUploadEnabled: boolean;
|
|
52
52
|
showConversionButtons: boolean;
|
|
53
53
|
showUploadDiagram: boolean;
|
|
54
|
+
standAloneRoomplanner: boolean;
|
|
54
55
|
projectSettings: HomedecoratorSettings;
|
|
55
56
|
showFloorProductTab: boolean;
|
|
56
57
|
}
|
|
@@ -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;
|
|
@@ -2060,6 +2060,9 @@
|
|
|
2060
2060
|
// set fallback, just to be sure.
|
|
2061
2061
|
this.settings.productRenderSceneAssetId = 'scene_studio_eevee';
|
|
2062
2062
|
}
|
|
2063
|
+
if (obj.hasOwnProperty('standAloneRoomplanner')) {
|
|
2064
|
+
this.settings.standAloneRoomplanner = obj['standAloneRoomplanner'];
|
|
2065
|
+
}
|
|
2063
2066
|
};
|
|
2064
2067
|
HomedecoratorSettingsService.prototype.initializeSettings = function () {
|
|
2065
2068
|
return __awaiter$1n(this, void 0, void 0, function () {
|
|
@@ -20483,7 +20486,7 @@
|
|
|
20483
20486
|
this._labelMeshCache.set(index, textMesh);
|
|
20484
20487
|
}
|
|
20485
20488
|
};
|
|
20486
|
-
Measurements.prototype.makeLabeledArrow = function (origin, rotatedDirection, length, labelDistance, index) {
|
|
20489
|
+
Measurements.prototype.makeLabeledArrow = function (origin, rotatedDirection, length, labelDistance, index, placement) {
|
|
20487
20490
|
if (length > arrowHeadLength) {
|
|
20488
20491
|
var arrow = new THREE__namespace.ArrowHelper(rotatedDirection, origin, length, measurementColor, arrowHeadLength, arrowHeadLength);
|
|
20489
20492
|
var dashedMaterial_1 = new THREE.LineDashedMaterial({ color: measurementColor, scale: 20, dashSize: 1, gapSize: 0.5 });
|
|
@@ -20522,7 +20525,9 @@
|
|
|
20522
20525
|
var position = origin.clone().add(dir);
|
|
20523
20526
|
this._labelMeshCache.get(index).position.copy(position);
|
|
20524
20527
|
}
|
|
20525
|
-
|
|
20528
|
+
if (placement === 'furniture') {
|
|
20529
|
+
this._labelMeshCache.get(index).position.y = 0.1;
|
|
20530
|
+
}
|
|
20526
20531
|
return [arrow, this._labelMeshCache.get(index)];
|
|
20527
20532
|
}
|
|
20528
20533
|
else {
|
|
@@ -20580,7 +20585,7 @@
|
|
|
20580
20585
|
var origin = _this.rotatedBoundingBoxBottomPoint(_this.item, startPoint).setY(height);
|
|
20581
20586
|
var intersection = _this.raycastPlanes(intersectionPlanes, origin, vector);
|
|
20582
20587
|
if (intersection) {
|
|
20583
|
-
return _this.makeLabeledArrow(origin, vector, intersection.distance, { abs: intersection.distance / 2 }, index);
|
|
20588
|
+
return _this.makeLabeledArrow(origin, vector, intersection.distance, { abs: intersection.distance / 2 }, index, 'furniture');
|
|
20584
20589
|
}
|
|
20585
20590
|
});
|
|
20586
20591
|
var meshes = (_a = Array.prototype).concat.apply(_a, __spreadArray([], __read(meshPairs))).filter(function (mesh) { return mesh; });
|
|
@@ -20625,10 +20630,10 @@
|
|
|
20625
20630
|
if (intersectionFloorplan) {
|
|
20626
20631
|
var intersectionWallItems = this.raycastPlanes(wallItemsMeshes, originCenter, rotatedDirection);
|
|
20627
20632
|
if (!intersectionWallItems || intersectionWallItems.distance > intersectionFloorplan.distance) {
|
|
20628
|
-
return this.makeLabeledArrow(originEdge, rotatedDirection, intersectionFloorplan.distance, { rel: { direction: direction, value: relLabelDistance } }, closure.index);
|
|
20633
|
+
return this.makeLabeledArrow(originEdge, rotatedDirection, intersectionFloorplan.distance, { rel: { direction: direction, value: relLabelDistance } }, closure.index, 'wall');
|
|
20629
20634
|
}
|
|
20630
20635
|
else {
|
|
20631
|
-
return this.makeLabeledArrow(originEdge, rotatedDirection, intersectionWallItems.distance, { rel: { direction: direction, value: relLabelDistance } }, closure.index);
|
|
20636
|
+
return this.makeLabeledArrow(originEdge, rotatedDirection, intersectionWallItems.distance, { rel: { direction: direction, value: relLabelDistance } }, closure.index, 'wall');
|
|
20632
20637
|
}
|
|
20633
20638
|
}
|
|
20634
20639
|
};
|
|
@@ -46851,12 +46856,12 @@
|
|
|
46851
46856
|
ProductCatalogComponent.ɵcmp = i0__namespace.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.17", type: ProductCatalogComponent, selector: "rp-product-catalog", host: { properties: { "class.shown": "this.shown", "class.no-offset": "this.phoneSizeScreen" } }, providers: [
|
|
46852
46857
|
{ provide: i16$1.BaseModuleService, useExisting: CatalogModuleService },
|
|
46853
46858
|
{ provide: i16$1.BaseModuleScreenConfigService, useExisting: CatalogScreenConfigurationService }
|
|
46854
|
-
], ngImport: i0__namespace, template: "\n <div class=\"product-catalog-wrapper\">\n <div class=\"catalog-button-wrapper\" *ngIf=\"showOwnCollection || showExternalCatalog\">\n <div class=\"back-button\" (click)=\"handleBackClick($event)\">\n <mat-icon class=\"homedecorator-material-icons\">arrow_back</mat-icon>\n <span class=\"back-button-span\">Terug</span>\n </div>\n <div class=\"button-spacer\"></div>\n <div class=\"refresh-button\" (click)=\"handleRefreshClick($event)\">\n <mat-icon class=\"homedecorator-material-icons\">refresh</mat-icon>\n <span class=\"refresh-button-span\">Verversen</span>\n </div>\n<!-- <div class=\"button-spacer\"></div>-->\n<!-- <div class=\"refresh-button\" (click)=\"iframeTest()\">-->\n<!-- <mat-icon class=\"homedecorator-material-icons\">refresh</mat-icon>-->\n<!-- <span class=\"refresh-button-span\">iframeTest</span>-->\n<!-- </div>-->\n\n </div>\n <ng-container *ngIf=\"showOwnCollection\">\n <rp-product-own-collection\n [settings]=\"settingsService.settings\"\n (articleClick)=\"handleArticleClick($event)\"\n ></rp-product-own-collection>\n </ng-container>\n\n <ng-container *ngIf=\"homeDecoHub && !showOwnCollection && !showExternalCatalog\">\n <rp-model-uploader>\n\n </rp-model-uploader>\n </ng-container>\n\n\n <ng-container *ngIf=\"!showOwnCollection && loaded\">\n <div\n class=\"own-collection-button-wrapper\"\n (click)=\"handleShowOwnCollectionClick($event)\"\n *ngIf=\"(!showExternalCatalog && settingsService.settings.options.showOwnCatalogButton) && !isHomedec\"\n >\n <div class=\"own-collection-description\" [textContent]=\"'OWN_COLLECTION' | localize\"></div>\n <co-image [source]=\"'assets/images/logo.svg'\"></co-image>\n </div>\n <co-catalog-external-sources *ngIf=\"!showExternalCatalog\"\n [isStandalone]=\"
|
|
46859
|
+
], ngImport: i0__namespace, template: "\n <div class=\"product-catalog-wrapper\">\n <div class=\"catalog-button-wrapper\" *ngIf=\"showOwnCollection || showExternalCatalog\">\n <div class=\"back-button\" (click)=\"handleBackClick($event)\">\n <mat-icon class=\"homedecorator-material-icons\">arrow_back</mat-icon>\n <span class=\"back-button-span\">Terug</span>\n </div>\n <div class=\"button-spacer\"></div>\n <div class=\"refresh-button\" (click)=\"handleRefreshClick($event)\">\n <mat-icon class=\"homedecorator-material-icons\">refresh</mat-icon>\n <span class=\"refresh-button-span\">Verversen</span>\n </div>\n<!-- <div class=\"button-spacer\"></div>-->\n<!-- <div class=\"refresh-button\" (click)=\"iframeTest()\">-->\n<!-- <mat-icon class=\"homedecorator-material-icons\">refresh</mat-icon>-->\n<!-- <span class=\"refresh-button-span\">iframeTest</span>-->\n<!-- </div>-->\n\n </div>\n <ng-container *ngIf=\"showOwnCollection\">\n <rp-product-own-collection\n [settings]=\"settingsService.settings\"\n (articleClick)=\"handleArticleClick($event)\"\n ></rp-product-own-collection>\n </ng-container>\n\n <ng-container *ngIf=\"homeDecoHub && !showOwnCollection && !showExternalCatalog\">\n <rp-model-uploader>\n\n </rp-model-uploader>\n </ng-container>\n\n\n <ng-container *ngIf=\"!showOwnCollection && loaded\">\n <div\n class=\"own-collection-button-wrapper\"\n (click)=\"handleShowOwnCollectionClick($event)\"\n *ngIf=\"(!showExternalCatalog && settingsService.settings.options.showOwnCatalogButton) && !isHomedec\"\n >\n <div class=\"own-collection-description\" [textContent]=\"'OWN_COLLECTION' | localize\"></div>\n <co-image [source]=\"'assets/images/logo.svg'\"></co-image>\n </div>\n <co-catalog-external-sources *ngIf=\"!showExternalCatalog\"\n [isStandalone]=\"settingsService.settings.standAloneRoomplanner\"\n (externalSourceClick)=\"handleExternalSourceClick($event)\"></co-catalog-external-sources>\n <co-catalog-external-source *ngIf=\"showExternalCatalog\"\n [options]=\"{searchOnStart: true}\"\n [externalCatalogStartupInfo]=\"catalogInfo\"\n [catalogDefinition]=\"catalogDefinition\"\n [title]=\"'CATALOG' | localize | append: ' ' | append: externalCatalogName\"\n [subTitle]=\"'Zoeken naar artikelen'\"\n [searchPlaceholder]=\"'Zoek naar artikelen'\"\n [name]=\"externalCatalogName\"\n [showFilter]=\"false\"\n (articleClick)=\"handleArticleClick($event, catalogInfo)\"\n [class.hide-filter]=\"settingsService.settings.options.showOnlyHomeDecoFilter\"\n (iFrameFeedbackReceived)=\"handleIFrameFeedback($event)\"\n ></co-catalog-external-source>\n </ng-container>\n <button mat-icon-button class=\"hide-catalog\" (click)=\"hideCatalog()\">\n <mat-icon class=\"homedecorator-material-icons\" aria-hidden=\"true\">close</mat-icon>\n </button>\n </div>\n ", isInline: true, styles: [":host{display:none;z-index:99;overflow:hidden}:host .layer{pointer-events:all!important;overflow-y:hidden;display:flex;flex-direction:column}:host .product-catalog-wrapper{display:flex;flex-direction:column;height:100%;padding:60px 30px 30px;width:100%;box-sizing:border-box}:host .product-catalog-wrapper .catalog-button-wrapper{font-size:16px;margin-bottom:20px}:host .product-catalog-wrapper .co-catalog-external-source{display:flex;flex-basis:100%}:host .own-collection-button-wrapper{cursor:pointer}:host .own-collection-button-wrapper .own-collection-description{font-size:12px;font-weight:bold;text-shadow:none;text-transform:capitalize;margin:10px 0}:host .own-collection-button-wrapper .co-image{padding:25px;background:#3760a1;border-radius:10px}:host.shown{display:inline-block;position:relative;top:0;left:50px;width:calc(100% - 50px);height:calc(100vh - 0px);background-color:#fff}:host.no-offset{left:0;width:100%;z-index:100}:host .ione-catalog{display:block;overflow:hidden}:host .ione-catalog ::ng-deep app-catalog{overflow:hidden}:host .catalog-button-wrapper .back-button,:host .catalog-button-wrapper .refresh-button{cursor:pointer;display:inline-block;font-weight:bold}:host .catalog-button-wrapper .back-button .refresh-button-span,:host .catalog-button-wrapper .back-button .back-button-span,:host .catalog-button-wrapper .refresh-button .refresh-button-span,:host .catalog-button-wrapper .refresh-button .back-button-span{vertical-align:top;line-height:25px;margin:10px 5px 0}:host .catalog-button-wrapper .button-spacer{display:inline-block;margin:0 10px}:host .product-catalog-wrapper{overflow:auto}:host .hide-catalog{position:absolute;top:50px;right:15px;z-index:100}.co-catalog-external-sources .external-source-item .co-image img{object-fit:cover}::ng-deep .co-catalog-navigation{position:relative}::ng-deep .co-catalog-navigation .navigation-overlay-wrapper{position:absolute!important;left:-40px!important;padding:20px 40px;grid-column-gap:60px}::ng-deep co-pagination-bar .pagination{box-sizing:border-box}\n"], components: [{ type: i5__namespace.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { type: ProductOwnCollectionComponent, selector: "rp-product-own-collection", inputs: ["settings"], outputs: ["articleClick", "arButtonClick"] }, { type: ModelUploaderComponent, selector: "rp-model-uploader" }, { type: i16__namespace$1.ImageComponent, selector: "co-image", inputs: ["source", "placeHolder"] }, { type: i7__namespace$3.ɵu, selector: "co-catalog-external-sources", inputs: ["isStandalone"], outputs: ["externalSourceClick"] }, { type: i7__namespace$3.ɵbh, selector: "co-catalog-external-source", inputs: ["showFilter", "tempFilter", "showNavigation", "externalCatalogStartupInfo", "catalogDefinition", "user", "title", "subTitle", "searchPlaceholder", "options", "name"], outputs: ["articleClick", "addArticleClick", "iFrameFeedbackReceived"] }, { type: i3__namespace$1.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button], button[mat-fab], button[mat-mini-fab], button[mat-stroked-button], button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }], directives: [{ type: i12__namespace.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }], pipes: { "localize": LocalizePipe, "append": AppendPipe } });
|
|
46855
46860
|
i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: ProductCatalogComponent, decorators: [{
|
|
46856
46861
|
type: i0.Component,
|
|
46857
46862
|
args: [{
|
|
46858
46863
|
selector: 'rp-product-catalog',
|
|
46859
|
-
template: "\n <div class=\"product-catalog-wrapper\">\n <div class=\"catalog-button-wrapper\" *ngIf=\"showOwnCollection || showExternalCatalog\">\n <div class=\"back-button\" (click)=\"handleBackClick($event)\">\n <mat-icon class=\"homedecorator-material-icons\">arrow_back</mat-icon>\n <span class=\"back-button-span\">Terug</span>\n </div>\n <div class=\"button-spacer\"></div>\n <div class=\"refresh-button\" (click)=\"handleRefreshClick($event)\">\n <mat-icon class=\"homedecorator-material-icons\">refresh</mat-icon>\n <span class=\"refresh-button-span\">Verversen</span>\n </div>\n<!-- <div class=\"button-spacer\"></div>-->\n<!-- <div class=\"refresh-button\" (click)=\"iframeTest()\">-->\n<!-- <mat-icon class=\"homedecorator-material-icons\">refresh</mat-icon>-->\n<!-- <span class=\"refresh-button-span\">iframeTest</span>-->\n<!-- </div>-->\n\n </div>\n <ng-container *ngIf=\"showOwnCollection\">\n <rp-product-own-collection\n [settings]=\"settingsService.settings\"\n (articleClick)=\"handleArticleClick($event)\"\n ></rp-product-own-collection>\n </ng-container>\n\n <ng-container *ngIf=\"homeDecoHub && !showOwnCollection && !showExternalCatalog\">\n <rp-model-uploader>\n\n </rp-model-uploader>\n </ng-container>\n\n\n <ng-container *ngIf=\"!showOwnCollection && loaded\">\n <div\n class=\"own-collection-button-wrapper\"\n (click)=\"handleShowOwnCollectionClick($event)\"\n *ngIf=\"(!showExternalCatalog && settingsService.settings.options.showOwnCatalogButton) && !isHomedec\"\n >\n <div class=\"own-collection-description\" [textContent]=\"'OWN_COLLECTION' | localize\"></div>\n <co-image [source]=\"'assets/images/logo.svg'\"></co-image>\n </div>\n <co-catalog-external-sources *ngIf=\"!showExternalCatalog\"\n [isStandalone]=\"
|
|
46864
|
+
template: "\n <div class=\"product-catalog-wrapper\">\n <div class=\"catalog-button-wrapper\" *ngIf=\"showOwnCollection || showExternalCatalog\">\n <div class=\"back-button\" (click)=\"handleBackClick($event)\">\n <mat-icon class=\"homedecorator-material-icons\">arrow_back</mat-icon>\n <span class=\"back-button-span\">Terug</span>\n </div>\n <div class=\"button-spacer\"></div>\n <div class=\"refresh-button\" (click)=\"handleRefreshClick($event)\">\n <mat-icon class=\"homedecorator-material-icons\">refresh</mat-icon>\n <span class=\"refresh-button-span\">Verversen</span>\n </div>\n<!-- <div class=\"button-spacer\"></div>-->\n<!-- <div class=\"refresh-button\" (click)=\"iframeTest()\">-->\n<!-- <mat-icon class=\"homedecorator-material-icons\">refresh</mat-icon>-->\n<!-- <span class=\"refresh-button-span\">iframeTest</span>-->\n<!-- </div>-->\n\n </div>\n <ng-container *ngIf=\"showOwnCollection\">\n <rp-product-own-collection\n [settings]=\"settingsService.settings\"\n (articleClick)=\"handleArticleClick($event)\"\n ></rp-product-own-collection>\n </ng-container>\n\n <ng-container *ngIf=\"homeDecoHub && !showOwnCollection && !showExternalCatalog\">\n <rp-model-uploader>\n\n </rp-model-uploader>\n </ng-container>\n\n\n <ng-container *ngIf=\"!showOwnCollection && loaded\">\n <div\n class=\"own-collection-button-wrapper\"\n (click)=\"handleShowOwnCollectionClick($event)\"\n *ngIf=\"(!showExternalCatalog && settingsService.settings.options.showOwnCatalogButton) && !isHomedec\"\n >\n <div class=\"own-collection-description\" [textContent]=\"'OWN_COLLECTION' | localize\"></div>\n <co-image [source]=\"'assets/images/logo.svg'\"></co-image>\n </div>\n <co-catalog-external-sources *ngIf=\"!showExternalCatalog\"\n [isStandalone]=\"settingsService.settings.standAloneRoomplanner\"\n (externalSourceClick)=\"handleExternalSourceClick($event)\"></co-catalog-external-sources>\n <co-catalog-external-source *ngIf=\"showExternalCatalog\"\n [options]=\"{searchOnStart: true}\"\n [externalCatalogStartupInfo]=\"catalogInfo\"\n [catalogDefinition]=\"catalogDefinition\"\n [title]=\"'CATALOG' | localize | append: ' ' | append: externalCatalogName\"\n [subTitle]=\"'Zoeken naar artikelen'\"\n [searchPlaceholder]=\"'Zoek naar artikelen'\"\n [name]=\"externalCatalogName\"\n [showFilter]=\"false\"\n (articleClick)=\"handleArticleClick($event, catalogInfo)\"\n [class.hide-filter]=\"settingsService.settings.options.showOnlyHomeDecoFilter\"\n (iFrameFeedbackReceived)=\"handleIFrameFeedback($event)\"\n ></co-catalog-external-source>\n </ng-container>\n <button mat-icon-button class=\"hide-catalog\" (click)=\"hideCatalog()\">\n <mat-icon class=\"homedecorator-material-icons\" aria-hidden=\"true\">close</mat-icon>\n </button>\n </div>\n ",
|
|
46860
46865
|
styleUrls: ['./product-catalog.component.scss'],
|
|
46861
46866
|
providers: [
|
|
46862
46867
|
{ provide: i16$1.BaseModuleService, useExisting: CatalogModuleService },
|