@combeenation/3d-viewer 21.0.1-beta1 → 21.1.0-beta1
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/dist/lib-cjs/buildinfo.json +1 -1
- package/dist/lib-cjs/commonjs.tsconfig.tsbuildinfo +1 -1
- package/dist/lib-cjs/internal/cbn-custom-babylon-loader-plugin.js +2 -4
- package/dist/lib-cjs/internal/cbn-custom-babylon-loader-plugin.js.map +1 -1
- package/dist/lib-cjs/internal/cbn-viewer-bridge.d.ts +1 -1
- package/dist/lib-cjs/internal/cbn-viewer-bridge.js +2 -5
- package/dist/lib-cjs/internal/cbn-viewer-bridge.js.map +1 -1
- package/dist/lib-cjs/internal/parameter/paintable-parameter-helper.d.ts +2 -2
- package/dist/lib-cjs/internal/parameter/paintable-parameter-helper.js +3 -2
- package/dist/lib-cjs/internal/parameter/paintable-parameter-helper.js.map +1 -1
- package/dist/lib-cjs/internal/parameter/parameter-helper.d.ts +2 -2
- package/dist/lib-cjs/internal/parameter/parameter-helper.js +9 -28
- package/dist/lib-cjs/internal/parameter/parameter-helper.js.map +1 -1
- package/dist/lib-cjs/internal/parameter/texture-parameter-helper.d.ts +2 -2
- package/dist/lib-cjs/internal/parameter/texture-parameter-helper.js +5 -5
- package/dist/lib-cjs/internal/parameter/texture-parameter-helper.js.map +1 -1
- package/dist/lib-cjs/internal/svg-helper.d.ts +5 -0
- package/dist/lib-cjs/internal/svg-helper.js +13 -2
- package/dist/lib-cjs/internal/svg-helper.js.map +1 -1
- package/dist/lib-cjs/manager/camera-manager.js +6 -6
- package/dist/lib-cjs/manager/camera-manager.js.map +1 -1
- package/dist/lib-cjs/manager/debug-manager.js +2 -3
- package/dist/lib-cjs/manager/debug-manager.js.map +1 -1
- package/dist/lib-cjs/manager/material-manager.js +2 -3
- package/dist/lib-cjs/manager/material-manager.js.map +1 -1
- package/dist/lib-cjs/manager/parameter-manager.d.ts +6 -4
- package/dist/lib-cjs/manager/parameter-manager.js +10 -9
- package/dist/lib-cjs/manager/parameter-manager.js.map +1 -1
- package/dist/lib-cjs/manager/scene-manager.js +8 -5
- package/dist/lib-cjs/manager/scene-manager.js.map +1 -1
- package/dist/lib-cjs/utils/viewer-utils.d.ts +24 -1
- package/dist/lib-cjs/utils/viewer-utils.js +63 -0
- package/dist/lib-cjs/utils/viewer-utils.js.map +1 -1
- package/dist/lib-cjs/viewer.js +1 -0
- package/dist/lib-cjs/viewer.js.map +1 -1
- package/package.json +1 -1
- package/src/internal/cbn-custom-babylon-loader-plugin.ts +3 -5
- package/src/internal/cbn-viewer-bridge.ts +1 -3
- package/src/internal/parameter/paintable-parameter-helper.ts +4 -3
- package/src/internal/parameter/parameter-helper.ts +15 -49
- package/src/internal/parameter/texture-parameter-helper.ts +7 -12
- package/src/internal/svg-helper.ts +13 -1
- package/src/manager/camera-manager.ts +3 -3
- package/src/manager/debug-manager.ts +3 -4
- package/src/manager/material-manager.ts +3 -4
- package/src/manager/parameter-manager.ts +12 -12
- package/src/manager/scene-manager.ts +9 -5
- package/src/utils/viewer-utils.ts +75 -0
- package/src/viewer.ts +2 -0
- package/dist/lib-cjs/internal/animation-helper.d.ts +0 -2
- package/dist/lib-cjs/internal/animation-helper.js +0 -16
- package/dist/lib-cjs/internal/animation-helper.js.map +0 -1
- package/src/internal/animation-helper.ts +0 -18
|
@@ -129,8 +129,7 @@ function _addMissingMaterialMetadata(dataParsed, container) {
|
|
|
129
129
|
const materialOnImportedMesh = (_a = importedMesh.material) === null || _a === void 0 ? void 0 : _a.id;
|
|
130
130
|
const materialOnOriginalMesh = parsedMesh === null || parsedMesh === void 0 ? void 0 : parsedMesh.materialId;
|
|
131
131
|
if (materialOnOriginalMesh && materialOnImportedMesh !== materialOnOriginalMesh) {
|
|
132
|
-
|
|
133
|
-
(_c = (_b = cbnWindowBridge === null || cbnWindowBridge === void 0 ? void 0 : cbnWindowBridge.Assets) === null || _b === void 0 ? void 0 : _b.assertMaterialExists) === null || _c === void 0 ? void 0 : _c.call(_b, materialOnOriginalMesh);
|
|
132
|
+
(_c = (_b = cbn_viewer_bridge_1.CbnViewerBridge === null || cbn_viewer_bridge_1.CbnViewerBridge === void 0 ? void 0 : cbn_viewer_bridge_1.CbnViewerBridge.Assets) === null || _b === void 0 ? void 0 : _b.assertMaterialExists) === null || _c === void 0 ? void 0 : _c.call(_b, materialOnOriginalMesh);
|
|
134
133
|
(0, metadata_helper_1.setInternalMetadataValue)(importedMesh, 'deferredMaterial', materialOnOriginalMesh);
|
|
135
134
|
}
|
|
136
135
|
});
|
|
@@ -191,8 +190,7 @@ function _createDecals(dataParsed, container) {
|
|
|
191
190
|
const decalMesh = index_1.DecalUtils.createDecalMesh(decalMeshConfig, container, false);
|
|
192
191
|
// optionally set material and tags directly
|
|
193
192
|
if (materialId) {
|
|
194
|
-
|
|
195
|
-
(_b = (_a = cbnWindowBridge === null || cbnWindowBridge === void 0 ? void 0 : cbnWindowBridge.Assets) === null || _a === void 0 ? void 0 : _a.assertMaterialExists) === null || _b === void 0 ? void 0 : _b.call(_a, materialId);
|
|
193
|
+
(_b = (_a = cbn_viewer_bridge_1.CbnViewerBridge === null || cbn_viewer_bridge_1.CbnViewerBridge === void 0 ? void 0 : cbn_viewer_bridge_1.CbnViewerBridge.Assets) === null || _a === void 0 ? void 0 : _a.assertMaterialExists) === null || _b === void 0 ? void 0 : _b.call(_a, materialId);
|
|
196
194
|
(0, metadata_helper_1.setInternalMetadataValue)(decalMesh, 'deferredMaterial', materialId);
|
|
197
195
|
}
|
|
198
196
|
if (tags) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cbn-custom-babylon-loader-plugin.js","sourceRoot":"","sources":["../../../src/internal/cbn-custom-babylon-loader-plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oCAWkB;AAClB,
|
|
1
|
+
{"version":3,"file":"cbn-custom-babylon-loader-plugin.js","sourceRoot":"","sources":["../../../src/internal/cbn-custom-babylon-loader-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
|
|
5
|
-
return window.Cbn;
|
|
6
|
-
}
|
|
7
|
-
exports.getCbnViewerBridge = getCbnViewerBridge;
|
|
3
|
+
exports.CbnViewerBridge = void 0;
|
|
4
|
+
exports.CbnViewerBridge = window.Cbn;
|
|
8
5
|
//# sourceMappingURL=cbn-viewer-bridge.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cbn-viewer-bridge.js","sourceRoot":"","sources":["../../../src/internal/cbn-viewer-bridge.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"cbn-viewer-bridge.js","sourceRoot":"","sources":["../../../src/internal/cbn-viewer-bridge.ts"],"names":[],"mappings":";;;AA8Ba,QAAA,eAAe,GAAI,MAA6C,CAAC,GAAG,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ParameterValue, Viewer } from '../..';
|
|
2
2
|
declare type PaintableValue = {
|
|
3
3
|
src: string;
|
|
4
4
|
options?: PaintableOptions;
|
|
@@ -13,7 +13,7 @@ declare type PaintableOptions = {
|
|
|
13
13
|
* Creates observer for "paintable" parameter.
|
|
14
14
|
* Basically creates a dynamic texture from the source image and assigns it as albedo (or diffuse) texture.
|
|
15
15
|
*/
|
|
16
|
-
export declare function createPaintableParameter(
|
|
16
|
+
export declare function createPaintableParameter(viewer: Viewer): void;
|
|
17
17
|
/**
|
|
18
18
|
* Parser for paintable value.
|
|
19
19
|
* ATM this is only used internally, but it could theoretically be used to create ones own paintable implementation.
|
|
@@ -32,7 +32,8 @@ const lodash_es_1 = require("lodash-es");
|
|
|
32
32
|
* Creates observer for "paintable" parameter.
|
|
33
33
|
* Basically creates a dynamic texture from the source image and assigns it as albedo (or diffuse) texture.
|
|
34
34
|
*/
|
|
35
|
-
function createPaintableParameter(
|
|
35
|
+
function createPaintableParameter(viewer) {
|
|
36
|
+
const parameterManager = viewer.parameterManager;
|
|
36
37
|
parameterManager.setParameterObserver(__1.LegacyParameter.Paintable, ({ newValue, materials }) => __awaiter(this, void 0, void 0, function* () {
|
|
37
38
|
const paintable = parsePaintable(newValue);
|
|
38
39
|
// check if value is svg or image source, do the conversion accordingly
|
|
@@ -60,7 +61,7 @@ function createPaintableParameter(parameterManager, scene) {
|
|
|
60
61
|
}
|
|
61
62
|
// apply image source on desired material(s)
|
|
62
63
|
for (const material of materials) {
|
|
63
|
-
_drawPaintableOnMaterial(material, imageSource, scene, paintable.options);
|
|
64
|
+
_drawPaintableOnMaterial(material, imageSource, viewer.scene, paintable.options);
|
|
64
65
|
}
|
|
65
66
|
}));
|
|
66
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paintable-parameter-helper.js","sourceRoot":"","sources":["../../../../src/internal/parameter/paintable-parameter-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAYe;AACf,8CAA4C;AAC5C,oDAA2B;AAC3B,yCAAqC;AAcrC;;;GAGG;AACH,SAAgB,wBAAwB,CAAC,
|
|
1
|
+
{"version":3,"file":"paintable-parameter-helper.js","sourceRoot":"","sources":["../../../../src/internal/parameter/paintable-parameter-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare function createBuiltInParameter(
|
|
1
|
+
import { Viewer } from '../..';
|
|
2
|
+
export declare function createBuiltInParameter(viewer: Viewer): void;
|
|
@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.createBuiltInParameter = void 0;
|
|
13
13
|
const __1 = require("../..");
|
|
14
|
-
const animation_helper_1 = require("../animation-helper");
|
|
15
14
|
const metadata_helper_1 = require("../metadata-helper");
|
|
16
|
-
function createBuiltInParameter(
|
|
15
|
+
function createBuiltInParameter(viewer) {
|
|
16
|
+
const parameterManager = viewer.parameterManager;
|
|
17
17
|
parameterManager.setParameterObserver(__1.BuiltInParameter.Visible, ({ nodes, newValue }) => __awaiter(this, void 0, void 0, function* () {
|
|
18
18
|
const visible = __1.ParameterManager.parseBoolean(newValue);
|
|
19
19
|
const observerProms = nodes.map((node) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -33,7 +33,7 @@ function createBuiltInParameter(parameterManager, materialManager) {
|
|
|
33
33
|
// => skip the material application in this case, as if it would be done twice
|
|
34
34
|
const anMaterialToBeSet = (0, metadata_helper_1.getInternalMetadataValue)(an, 'materialToBeSet');
|
|
35
35
|
if (anVisibleNested && anRequestedMaterial && !anMaterialToBeSet) {
|
|
36
|
-
yield materialManager.setMaterialOnMesh(anRequestedMaterial,
|
|
36
|
+
yield viewer.materialManager.setMaterialOnMesh(anRequestedMaterial,
|
|
37
37
|
// this cast is fine, as deferred material can only be set on meshes
|
|
38
38
|
an);
|
|
39
39
|
}
|
|
@@ -61,7 +61,7 @@ function createBuiltInParameter(parameterManager, materialManager) {
|
|
|
61
61
|
// => skip the material application in this case, as if it would be done twice
|
|
62
62
|
const anMaterialToBeSet = (0, metadata_helper_1.getInternalMetadataValue)(node, 'materialToBeSet');
|
|
63
63
|
if (!anMaterialToBeSet) {
|
|
64
|
-
yield materialManager.setMaterialOnMesh(material, node);
|
|
64
|
+
yield viewer.materialManager.setMaterialOnMesh(material, node);
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
else {
|
|
@@ -74,7 +74,7 @@ function createBuiltInParameter(parameterManager, materialManager) {
|
|
|
74
74
|
const position = __1.ParameterManager.parseVector(newValue);
|
|
75
75
|
for (const node of nodes) {
|
|
76
76
|
if (options === null || options === void 0 ? void 0 : options.animationTimeMs) {
|
|
77
|
-
|
|
77
|
+
yield viewer.utils.animateProperty(node, 'position', position, `${__1.ParameterManager.PARAMETER_ANIMATION_NAME}.${__1.BuiltInParameter.Position}.${node.name}`, options.animationTimeMs);
|
|
78
78
|
}
|
|
79
79
|
else {
|
|
80
80
|
node.position = position;
|
|
@@ -90,7 +90,7 @@ function createBuiltInParameter(parameterManager, materialManager) {
|
|
|
90
90
|
// otherwise the animation would just jump to the end value, as there is no start value to interpolate
|
|
91
91
|
node.rotation = node.rotationQuaternion.toEulerAngles();
|
|
92
92
|
}
|
|
93
|
-
|
|
93
|
+
yield viewer.utils.animateProperty(node, 'rotation', rotation, `${__1.ParameterManager.PARAMETER_ANIMATION_NAME}.${__1.BuiltInParameter.Rotation}.${node.name}`, options.animationTimeMs);
|
|
94
94
|
}
|
|
95
95
|
else {
|
|
96
96
|
node.rotation = rotation;
|
|
@@ -101,7 +101,7 @@ function createBuiltInParameter(parameterManager, materialManager) {
|
|
|
101
101
|
const scaling = __1.ParameterManager.parseVector(newValue);
|
|
102
102
|
for (const node of nodes) {
|
|
103
103
|
if (options === null || options === void 0 ? void 0 : options.animationTimeMs) {
|
|
104
|
-
|
|
104
|
+
yield viewer.utils.animateProperty(node, 'scaling', scaling, `${__1.ParameterManager.PARAMETER_ANIMATION_NAME}.${__1.BuiltInParameter.Scaling}.${node.name}`, options.animationTimeMs);
|
|
105
105
|
}
|
|
106
106
|
else {
|
|
107
107
|
node.scaling = scaling;
|
|
@@ -115,7 +115,7 @@ function createBuiltInParameter(parameterManager, materialManager) {
|
|
|
115
115
|
switch (materialCls) {
|
|
116
116
|
case 'PBRMaterial':
|
|
117
117
|
if (options === null || options === void 0 ? void 0 : options.animationTimeMs) {
|
|
118
|
-
|
|
118
|
+
yield viewer.utils.animateProperty(material, 'albedoColor', color.toLinearSpace(), `${__1.ParameterManager.PARAMETER_ANIMATION_NAME}.${__1.BuiltInParameter.Color}.${material.id}`, options.animationTimeMs);
|
|
119
119
|
}
|
|
120
120
|
else {
|
|
121
121
|
material.albedoColor = color.toLinearSpace();
|
|
@@ -175,7 +175,7 @@ function createBuiltInParameter(parameterManager, materialManager) {
|
|
|
175
175
|
const target = node instanceof __1.AbstractMesh && ((_a = node.morphTargetManager) === null || _a === void 0 ? void 0 : _a.getTargetByName(morphTargetValue.name));
|
|
176
176
|
if (target) {
|
|
177
177
|
if (options === null || options === void 0 ? void 0 : options.animationTimeMs) {
|
|
178
|
-
|
|
178
|
+
yield viewer.utils.animateProperty(target, 'influence', morphTargetValue.value, `${__1.ParameterManager.PARAMETER_ANIMATION_NAME}.${__1.BuiltInParameter.Influence}.${node.name}.${target.name}`, options.animationTimeMs);
|
|
179
179
|
}
|
|
180
180
|
else {
|
|
181
181
|
target.influence = morphTargetValue.value;
|
|
@@ -192,23 +192,4 @@ function createBuiltInParameter(parameterManager, materialManager) {
|
|
|
192
192
|
}));
|
|
193
193
|
}
|
|
194
194
|
exports.createBuiltInParameter = createBuiltInParameter;
|
|
195
|
-
function _animateParameter(target, property, value, animationNameSuffix, animationTimeMs) {
|
|
196
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
197
|
-
const framesPerSec = 100;
|
|
198
|
-
// extend if further `AnimatableProperties` with different types are added
|
|
199
|
-
const dataType = value instanceof __1.Vector3
|
|
200
|
-
? __1.Animation.ANIMATIONTYPE_VECTOR3
|
|
201
|
-
: value instanceof __1.Color3
|
|
202
|
-
? __1.Animation.ANIMATIONTYPE_COLOR3
|
|
203
|
-
: __1.Animation.ANIMATIONTYPE_FLOAT;
|
|
204
|
-
const animationGroup = new __1.AnimationGroup(`${__1.ParameterManager.PARAMETER_ANIMATION_NAME}.${animationNameSuffix}`);
|
|
205
|
-
const animation = new __1.Animation(property, property, framesPerSec, dataType);
|
|
206
|
-
animation.setKeys([
|
|
207
|
-
{ frame: 0, value: target[property] },
|
|
208
|
-
{ frame: framesPerSec, value: value },
|
|
209
|
-
]);
|
|
210
|
-
animationGroup.addTargetedAnimation(animation, target);
|
|
211
|
-
yield (0, animation_helper_1.playAnimationGroupOnce)(animationGroup, framesPerSec, Math.max(animationTimeMs, 0));
|
|
212
|
-
});
|
|
213
|
-
}
|
|
214
195
|
//# sourceMappingURL=parameter-helper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameter-helper.js","sourceRoot":"","sources":["../../../../src/internal/parameter/parameter-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"parameter-helper.js","sourceRoot":"","sources":["../../../../src/internal/parameter/parameter-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6BASe;AACf,wDAAwF;AAExF,SAAgB,sBAAsB,CAAC,MAAc;IACnD,MAAM,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACjD,gBAAgB,CAAC,oBAAoB,CAAC,oBAAgB,CAAC,OAAO,EAAE,CAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC5F,MAAM,OAAO,GAAG,oBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAExD,MAAM,aAAa,GAAG,KAAK,CAAC,GAAG,CAAC,CAAM,IAAI,EAAC,EAAE;YAC3C,MAAM,aAAa,GAAG,gBAAgB,CAAC,uCAAuC,CAAC,IAAI,CAAC,CAAC;YACrF,IAAI,aAAa,EAAE;gBACjB,4GAA4G;gBAC5G,oBAAoB;gBACpB,8CAA8C;gBAC9C,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC7D,MAAM,gBAAgB,GAAG,cAAc,CAAC,GAAG,CAAC,CAAM,EAAE,EAAC,EAAE;oBACrD,MAAM,eAAe,GAAG,gBAAgB,CAAC,uCAAuC,CAAC,EAAE,CAAC,CAAC;oBACrF,MAAM,kBAAkB,GAAG,IAAA,0CAAwB,EAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;oBAC5E,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,uBAAuB,CAAC,EAAE,EAAE,oBAAgB,CAAC,QAAQ,CAEtF,CAAC;oBACd,6FAA6F;oBAC7F,MAAM,mBAAmB,GAAG,oBAAoB,aAApB,oBAAoB,cAApB,oBAAoB,GAAI,kBAAkB,CAAC;oBACvE,wEAAwE;oBACxE,8EAA8E;oBAC9E,MAAM,iBAAiB,GAAG,IAAA,0CAAwB,EAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;oBAC1E,IAAI,eAAe,IAAI,mBAAmB,IAAI,CAAC,iBAAiB,EAAE;wBAChE,MAAM,MAAM,CAAC,eAAe,CAAC,iBAAiB,CAC5C,mBAAmB;wBACnB,oEAAoE;wBACpE,EAAkB,CACnB,CAAC;qBACH;gBACH,CAAC,CAAA,CAAC,CAAC;gBACH,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;aACrC;YAED,2BAA2B;YAC3B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC,CAAA,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC,CAAA,CAAC,CAAC;IACH,gBAAgB,CAAC,oBAAoB,CAAC,oBAAgB,CAAC,QAAQ,EAAE,CAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC7F,MAAM,QAAQ,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAExD,MAAM,aAAa,GAAG,KAAK,CAAC,GAAG,CAAC,CAAM,IAAI,EAAC,EAAE;YAC3C,IAAI,CAAC,CAAC,IAAI,YAAY,gBAAY,CAAC,EAAE;gBACnC,MAAM,IAAI,eAAW,CAAC;oBACpB,EAAE,EAAE,kBAAc,CAAC,uBAAuB;oBAC1C,OAAO,EAAE,8CAA8C,IAAI,CAAC,IAAI,iBAAiB;iBAClF,CAAC,CAAC;aACJ;YAED,oFAAoF;YACpF,MAAM,OAAO,GAAG,gBAAgB,CAAC,uCAAuC,CAAC,IAAI,CAAC,CAAC;YAC/E,IAAI,OAAO,EAAE;gBACX,wEAAwE;gBACxE,8EAA8E;gBAC9E,MAAM,iBAAiB,GAAG,IAAA,0CAAwB,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;gBAC5E,IAAI,CAAC,iBAAiB,EAAE;oBACtB,MAAM,MAAM,CAAC,eAAe,CAAC,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;iBAChE;aACF;iBAAM;gBACL,IAAA,0CAAwB,EAAC,IAAI,EAAE,kBAAkB,EAAE,QAAQ,CAAC,CAAC;aAC9D;QACH,CAAC,CAAA,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC,CAAA,CAAC,CAAC;IACH,gBAAgB,CAAC,oBAAoB,CAAC,oBAAgB,CAAC,QAAQ,EAAE,CAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;QACtG,MAAM,QAAQ,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAExD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,EAAE;gBAC5B,MAAM,MAAM,CAAC,KAAK,CAAC,eAAe,CAChC,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,GAAG,oBAAgB,CAAC,wBAAwB,IAAI,oBAAgB,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE,EACxF,OAAO,CAAC,eAAe,CACxB,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;aAC1B;SACF;IACH,CAAC,CAAA,CAAC,CAAC;IACH,gBAAgB,CAAC,oBAAoB,CAAC,oBAAgB,CAAC,QAAQ,EAAE,CAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;QACtG,MAAM,QAAQ,GAAG,oBAAgB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAE1D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,EAAE;gBAC5B,IAAI,IAAI,CAAC,kBAAkB,EAAE;oBAC3B,oEAAoE;oBACpE,sGAAsG;oBACtG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC;iBACzD;gBACD,MAAM,MAAM,CAAC,KAAK,CAAC,eAAe,CAChC,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,GAAG,oBAAgB,CAAC,wBAAwB,IAAI,oBAAgB,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE,EACxF,OAAO,CAAC,eAAe,CACxB,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;aAC1B;SACF;IACH,CAAC,CAAA,CAAC,CAAC;IACH,gBAAgB,CAAC,oBAAoB,CAAC,oBAAgB,CAAC,OAAO,EAAE,CAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;QACrG,MAAM,OAAO,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAEvD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,EAAE;gBAC5B,MAAM,MAAM,CAAC,KAAK,CAAC,eAAe,CAChC,IAAI,EACJ,SAAS,EACT,OAAO,EACP,GAAG,oBAAgB,CAAC,wBAAwB,IAAI,oBAAgB,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,EACvF,OAAO,CAAC,eAAe,CACxB,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;aACxB;SACF;IACH,CAAC,CAAA,CAAC,CAAC;IACH,gBAAgB,CAAC,oBAAoB,CAAC,oBAAgB,CAAC,KAAK,EAAE,CAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;QACvG,MAAM,KAAK,GAAG,oBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAEpD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC5C,QAAQ,WAAW,EAAE;gBACnB,KAAK,aAAa;oBAChB,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,EAAE;wBAC5B,MAAM,MAAM,CAAC,KAAK,CAAC,eAAe,CAChC,QAAuB,EACvB,aAAa,EACb,KAAK,CAAC,aAAa,EAAE,EACrB,GAAG,oBAAgB,CAAC,wBAAwB,IAAI,oBAAgB,CAAC,KAAK,IAAI,QAAQ,CAAC,EAAE,EAAE,EACvF,OAAO,CAAC,eAAe,CACxB,CAAC;qBACH;yBAAM;wBACJ,QAAwB,CAAC,WAAW,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;qBAC/D;oBACD,MAAM;gBACR,KAAK,kBAAkB;oBACpB,QAA6B,CAAC,YAAY,GAAG,KAAK,CAAC;oBACpD,MAAM;gBACR;oBACE,MAAM,IAAI,eAAW,CAAC;wBACpB,EAAE,EAAE,kBAAc,CAAC,uBAAuB;wBAC1C,OAAO,EAAE,2CAA2C,WAAW,mBAAmB;qBACnF,CAAC,CAAC;aACN;SACF;IACH,CAAC,CAAA,CAAC,CAAC;IACH,gBAAgB,CAAC,oBAAoB,CAAC,oBAAgB,CAAC,SAAS,EAAE,CAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;QAClG,MAAM,SAAS,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAEzD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC5C,QAAQ,WAAW,EAAE;gBACnB,KAAK,aAAa;oBACf,QAAwB,CAAC,SAAS,GAAG,SAAS,CAAC;oBAChD,MAAM;gBACR,KAAK,kBAAkB;oBACpB,QAA6B,CAAC,SAAS,GAAG,SAAS,CAAC;oBACrD,MAAM;gBACR;oBACE,MAAM,IAAI,eAAW,CAAC;wBACpB,EAAE,EAAE,kBAAc,CAAC,uBAAuB;wBAC1C,OAAO,EAAE,8CAA8C,WAAW,mBAAmB;qBACtF,CAAC,CAAC;aACN;SACF;IACH,CAAC,CAAA,CAAC,CAAC;IACH,gBAAgB,CAAC,oBAAoB,CAAC,oBAAgB,CAAC,QAAQ,EAAE,CAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;QACjG,MAAM,QAAQ,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAExD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC5C,QAAQ,WAAW,EAAE;gBACnB,KAAK,aAAa;oBACf,QAAwB,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBAC9C,MAAM;gBACR;oBACE,MAAM,IAAI,eAAW,CAAC;wBACpB,EAAE,EAAE,kBAAc,CAAC,uBAAuB;wBAC1C,OAAO,EAAE,8CAA8C,WAAW,mBAAmB;qBACtF,CAAC,CAAC;aACN;SACF;IACH,CAAC,CAAA,CAAC,CAAC;IACH,gBAAgB,CAAC,oBAAoB,CAAC,oBAAgB,CAAC,SAAS,EAAE,CAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;;QACvG,MAAM,iBAAiB,GAAG,oBAAgB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAEvE,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;YAChD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,MAAM,MAAM,GAAG,IAAI,YAAY,gBAAY,KAAI,MAAA,IAAI,CAAC,kBAAkB,0CAAE,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA,CAAC;gBAE/G,IAAI,MAAM,EAAE;oBACV,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,EAAE;wBAC5B,MAAM,MAAM,CAAC,KAAK,CAAC,eAAe,CAChC,MAAM,EACN,WAAW,EACX,gBAAgB,CAAC,KAAK,EACtB,GAAG,oBAAgB,CAAC,wBAAwB,IAAI,oBAAgB,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,EACxG,OAAO,CAAC,eAAe,CACxB,CAAC;qBACH;yBAAM;wBACL,MAAM,CAAC,SAAS,GAAG,gBAAgB,CAAC,KAAK,CAAC;qBAC3C;iBACF;qBAAM;oBACL,MAAM,IAAI,eAAW,CAAC;wBACpB,EAAE,EAAE,kBAAc,CAAC,uBAAuB;wBAC1C,OAAO,EAAE,yCAAyC,IAAI,CAAC,IAAI,oBAAoB,gBAAgB,CAAC,IAAI,EAAE;qBACvG,CAAC,CAAC;iBACJ;aACF;SACF;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC;AAxND,wDAwNC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Viewer } from '../..';
|
|
2
2
|
/**
|
|
3
3
|
* Texture parameters are a combination of the channel (e.g. albedo, bump, AO) and the "sub" parameter (e.g. uScale).
|
|
4
4
|
* Each parameter is available in each texture, that's why these textures parameter are defined as dotted path
|
|
@@ -33,4 +33,4 @@ export declare const ParameterTextureChannels: {
|
|
|
33
33
|
detailmapTexture: string;
|
|
34
34
|
};
|
|
35
35
|
export declare type ParameterTextureChannelsKeys = keyof typeof ParameterTextureChannels;
|
|
36
|
-
export declare function createBuiltInTextureParameter(
|
|
36
|
+
export declare function createBuiltInTextureParameter(viewer: Viewer): void;
|
|
@@ -48,7 +48,8 @@ exports.ParameterTextureChannels = {
|
|
|
48
48
|
lightmapTexture: 'lightmapTexture',
|
|
49
49
|
detailmapTexture: 'detailmapTexture',
|
|
50
50
|
};
|
|
51
|
-
function createBuiltInTextureParameter(
|
|
51
|
+
function createBuiltInTextureParameter(viewer) {
|
|
52
|
+
const parameterManager = viewer.parameterManager;
|
|
52
53
|
// create parameter observer for each channel
|
|
53
54
|
Object.values(exports.ParameterTextureChannels).forEach(channel => {
|
|
54
55
|
parameterManager.setParameterObserver(`${channel}.${exports.BuiltInTextureParameter.image}`, ({ newValue, materials }) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -62,8 +63,7 @@ function createBuiltInTextureParameter(parameterManager, materialManager, scene)
|
|
|
62
63
|
// However the rescaling functionality of "Dynamic Textures" is not required and therefore it can be
|
|
63
64
|
// implemented as a plain "Texture"
|
|
64
65
|
const svgWithAssetsEmbedded = yield (0, svg_helper_1.embedAssets)(image);
|
|
65
|
-
|
|
66
|
-
url = 'data:image/svg+xml;base64,' + btoa(svgWithAssetsEmbedded);
|
|
66
|
+
url = (0, svg_helper_1.createSvgDataUri)(svgWithAssetsEmbedded);
|
|
67
67
|
}
|
|
68
68
|
else if (image.includes('<svg') && image.includes('</svg>')) {
|
|
69
69
|
// seems like the user tried to use a SVG string, as <svg> tags are used
|
|
@@ -94,12 +94,12 @@ function createBuiltInTextureParameter(parameterManager, materialManager, scene)
|
|
|
94
94
|
else if (url) {
|
|
95
95
|
// no texture, or wrong type => create texture from scratch
|
|
96
96
|
// first we check if some settings were provided in the material definition
|
|
97
|
-
const addMatSettings = yield materialManager.getMaterialDefinition(pbrMaterial.id);
|
|
97
|
+
const addMatSettings = yield viewer.materialManager.getMaterialDefinition(pbrMaterial.id);
|
|
98
98
|
const textureSettings = addMatSettings ? _getTextureObjFromParameterChannel(addMatSettings, channel) : {};
|
|
99
99
|
// overwrite the name with the url, as this is what the texture parser expects
|
|
100
100
|
textureSettings.name = url;
|
|
101
101
|
// use parser instead of constructor to keep the original texture settings
|
|
102
|
-
const newTexture = __1.Texture.Parse(textureSettings, scene, '');
|
|
102
|
+
const newTexture = __1.Texture.Parse(textureSettings, viewer.scene, '');
|
|
103
103
|
if (!newTexture) {
|
|
104
104
|
throw new __1.ViewerError({
|
|
105
105
|
id: __1.ViewerErrorIds.InvalidParameterValue,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"texture-parameter-helper.js","sourceRoot":"","sources":["../../../../src/internal/parameter/texture-parameter-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"texture-parameter-helper.js","sourceRoot":"","sources":["../../../../src/internal/parameter/texture-parameter-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6BAWe;AACf,8CAA8D;AAC9D,oDAA2B;AAE3B;;;;;;;;GAQG;AAEU,QAAA,uBAAuB,GAAG;IACrC,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;CACf,CAAC;AAGW,QAAA,wBAAwB,GAAG;IACtC,aAAa,EAAE,eAAe;IAC9B,wBAAwB,EAAE,0BAA0B;IACpD,WAAW,EAAE,aAAa;IAC1B,eAAe,EAAE,iBAAiB;IAClC,cAAc,EAAE,gBAAgB;IAChC,cAAc,EAAE,gBAAgB;IAChC,eAAe,EAAE,iBAAiB;IAClC,gBAAgB,EAAE,kBAAkB;CACrC,CAAC;AAGF,SAAgB,6BAA6B,CAAC,MAAc;IAC1D,MAAM,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACjD,6CAA6C;IAC5C,MAAM,CAAC,MAAM,CAAC,gCAAwB,CAAoC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAC5F,gBAAgB,CAAC,oBAAoB,CACnC,GAAG,OAAO,IAAI,+BAAuB,CAAC,KAAK,EAAE,EAC7C,CAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;YAChC,MAAM,KAAK,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACrD,IAAI,GAAG,GAAG,KAAK,CAAC;YAEhB,MAAM,UAAU,GAAG,IAAA,gBAAK,EAAC,KAAK,CAAC,CAAC;YAChC,IAAI,UAAU,EAAE;gBACd,oGAAoG;gBACpG,yFAAyF;gBACzF,mFAAmF;gBACnF,oGAAoG;gBACpG,mCAAmC;gBACnC,MAAM,qBAAqB,GAAG,MAAM,IAAA,wBAAW,EAAC,KAAK,CAAC,CAAC;gBACvD,GAAG,GAAG,IAAA,6BAAgB,EAAC,qBAAqB,CAAC,CAAC;aAC/C;iBAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAC7D,wEAAwE;gBACxE,sDAAsD;gBACtD,MAAM,IAAI,eAAW,CAAC;oBACpB,EAAE,EAAE,kBAAc,CAAC,qBAAqB;oBACxC,OAAO,EAAE,kGAAkG,KAAK,EAAE;iBACnH,CAAC,CAAC;aACJ;YAED,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,WAAW,GAAG,4BAA4B,CAAC,QAAQ,EAAE,OAAO,EAAE,+BAAuB,CAAC,KAAK,CAAC,CAAC;gBACnG,MAAM,OAAO,GAAG,+BAA+B,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBAEtE,IAAI,OAAO,EAAE;oBACX,IAAI,GAAG,EAAE;wBACP,uGAAuG;wBACvG,UAAU;wBACV,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;wBACtC,mDAAmD;wBACnD,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;wBAErF,8BAA8B,CAAC,aAAa,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;qBACrE;yBAAM;wBACL,kCAAkC,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;qBAC1D;oBAED,sBAAsB;oBACtB,OAAO,CAAC,OAAO,EAAE,CAAC;iBACnB;qBAAM,IAAI,GAAG,EAAE;oBACd,2DAA2D;oBAC3D,2EAA2E;oBAC3E,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,qBAAqB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;oBAC1F,MAAM,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC,kCAAkC,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAE1G,8EAA8E;oBAC7E,eAAuB,CAAC,IAAI,GAAG,GAAG,CAAC;oBACpC,0EAA0E;oBAC1E,MAAM,UAAU,GAAG,WAAO,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,CAAY,CAAC;oBAE/E,IAAI,CAAC,UAAU,EAAE;wBACf,MAAM,IAAI,eAAW,CAAC;4BACpB,EAAE,EAAE,kBAAc,CAAC,qBAAqB;4BACxC,OAAO,EAAE,qBAAqB,GAAG,uBAAuB;yBACzD,CAAC,CAAC;qBACJ;oBAED,2BAA2B;oBAC3B,MAAM,cAAc,GAAG,MAAM,kBAAc,CAAC,0BAA0B,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;oBACrF,IAAI,cAAc,EAAE;wBAClB,OAAO,CAAC,IAAI,CACV,0BAA0B,cAAc,qDAAqD,GAAG,GAAG,CACpG,CAAC;qBACH;oBACD,8BAA8B,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;oBAEjE,0EAA0E;oBAC1E,MAAM,gBAAgB,CAAC,6BAA6B,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;iBAC5E;aACF;QACH,CAAC,CAAA,CACF,CAAC;QACF,gBAAgB,CAAC,oBAAoB,CACnC,GAAG,OAAO,IAAI,+BAAuB,CAAC,OAAO,EAAE,EAC/C,CAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;YAChC,MAAM,OAAO,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAEvD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,WAAW,GAAG,4BAA4B,CAAC,QAAQ,EAAE,OAAO,EAAE,+BAAuB,CAAC,OAAO,CAAC,CAAC;gBAErG,oBAAoB,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAChE;QACH,CAAC,CAAA,CACF,CAAC;QACF,gBAAgB,CAAC,oBAAoB,CACnC,GAAG,OAAO,IAAI,+BAAuB,CAAC,OAAO,EAAE,EAC/C,CAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;YAChC,MAAM,OAAO,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAEvD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,WAAW,GAAG,4BAA4B,CAAC,QAAQ,EAAE,OAAO,EAAE,+BAAuB,CAAC,OAAO,CAAC,CAAC;gBAErG,oBAAoB,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAChE;QACH,CAAC,CAAA,CACF,CAAC;QACF,gBAAgB,CAAC,oBAAoB,CACnC,GAAG,OAAO,IAAI,+BAAuB,CAAC,MAAM,EAAE,EAC9C,CAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;YAChC,MAAM,MAAM,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAEtD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,WAAW,GAAG,4BAA4B,CAAC,QAAQ,EAAE,OAAO,EAAE,+BAAuB,CAAC,MAAM,CAAC,CAAC;gBAEpG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAC9D;QACH,CAAC,CAAA,CACF,CAAC;QACF,gBAAgB,CAAC,oBAAoB,CACnC,GAAG,OAAO,IAAI,+BAAuB,CAAC,MAAM,EAAE,EAC9C,CAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;YAChC,MAAM,MAAM,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAEtD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,WAAW,GAAG,4BAA4B,CAAC,QAAQ,EAAE,OAAO,EAAE,+BAAuB,CAAC,MAAM,CAAC,CAAC;gBAEpG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAC9D;QACH,CAAC,CAAA,CACF,CAAC;QACF,gBAAgB,CAAC,oBAAoB,CACnC,GAAG,OAAO,IAAI,+BAAuB,CAAC,IAAI,EAAE,EAC5C,CAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;YAChC,MAAM,IAAI,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAEpD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,WAAW,GAAG,4BAA4B,CAAC,QAAQ,EAAE,OAAO,EAAE,+BAAuB,CAAC,IAAI,CAAC,CAAC;gBAElG,oBAAoB,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAC1D;QACH,CAAC,CAAA,CACF,CAAC;QACF,gBAAgB,CAAC,oBAAoB,CACnC,GAAG,OAAO,IAAI,+BAAuB,CAAC,IAAI,EAAE,EAC5C,CAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;YAChC,MAAM,IAAI,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAEpD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,WAAW,GAAG,4BAA4B,CAAC,QAAQ,EAAE,OAAO,EAAE,+BAAuB,CAAC,IAAI,CAAC,CAAC;gBAElG,oBAAoB,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAC1D;QACH,CAAC,CAAA,CACF,CAAC;QACF,gBAAgB,CAAC,oBAAoB,CACnC,GAAG,OAAO,IAAI,+BAAuB,CAAC,IAAI,EAAE,EAC5C,CAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;YAChC,MAAM,IAAI,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAEpD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,WAAW,GAAG,4BAA4B,CAAC,QAAQ,EAAE,OAAO,EAAE,+BAAuB,CAAC,IAAI,CAAC,CAAC;gBAElG,oBAAoB,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAC1D;QACH,CAAC,CAAA,CACF,CAAC;QACF,gBAAgB,CAAC,oBAAoB,CACnC,GAAG,OAAO,IAAI,+BAAuB,CAAC,MAAM,EAAE,EAC9C,CAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;YAChC,MAAM,MAAM,GAAG,oBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,WAAW,GAAG,4BAA4B,CAAC,QAAQ,EAAE,OAAO,EAAE,+BAAuB,CAAC,MAAM,CAAC,CAAC;gBAEpG,6GAA6G;gBAC7G,0CAA0C;gBAC1C,MAAM,OAAO,GAAG,+BAA+B,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBACtE,IAAI,OAAO,EAAE;oBACX,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,WAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,WAAO,CAAC,gBAAgB,CAAC;iBAC/E;aACF;QACH,CAAC,CAAA,CACF,CAAC;QACF,gBAAgB,CAAC,oBAAoB,CACnC,GAAG,OAAO,IAAI,+BAAuB,CAAC,MAAM,EAAE,EAC9C,CAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;YAChC,MAAM,MAAM,GAAG,oBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,WAAW,GAAG,4BAA4B,CAAC,QAAQ,EAAE,OAAO,EAAE,+BAAuB,CAAC,MAAM,CAAC,CAAC;gBAEpG,MAAM,OAAO,GAAG,+BAA+B,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBACtE,IAAI,OAAO,EAAE;oBACX,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,WAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,WAAO,CAAC,gBAAgB,CAAC;iBAC/E;aACF;QACH,CAAC,CAAA,CACF,CAAC;QACF,gBAAgB,CAAC,oBAAoB,CACnC,GAAG,OAAO,IAAI,+BAAuB,CAAC,KAAK,EAAE,EAC7C,CAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;YAChC,MAAM,KAAK,GAAG,oBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAErD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,WAAW,GAAG,4BAA4B,CAAC,QAAQ,EAAE,OAAO,EAAE,+BAAuB,CAAC,KAAK,CAAC,CAAC;gBAEnG,MAAM,OAAO,GAAG,+BAA+B,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBACtE,IAAI,OAAO,EAAE;oBACX,OAAO,CAAC,gBAAgB,GAAG,KAAK,CAAC;iBAClC;aACF;QACH,CAAC,CAAA,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,+GAA+G;IAC/G,gBAAgB,CAAC,oBAAoB,CAAC,oBAAgB,CAAC,YAAY,EAAE,CAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;QACrG,MAAM,YAAY,GAAG,oBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAE7D,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC5C,IAAI,WAAW,KAAK,aAAa,EAAE;gBACjC,MAAM,IAAI,eAAW,CAAC;oBACpB,EAAE,EAAE,kBAAc,CAAC,uBAAuB;oBAC1C,OAAO,EAAE,gDAAgD,WAAW,mBAAmB;iBACxF,CAAC,CAAC;aACJ;YAED,MAAM,WAAW,GAAG,QAAuB,CAAC;YAC5C,WAAW,CAAC,SAAS,CAAC,SAAS,GAAG,YAAY,CAAC;SAChD;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC;AAtOD,sEAsOC;AAED;;;;;;GAMG;AACH,SAAS,4BAA4B,CAAC,QAAkB,EAAE,OAAe,EAAE,SAAiB;IAC1F,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;IAC5C,IAAI,WAAW,KAAK,aAAa,EAAE;QACjC,MAAM,IAAI,eAAW,CAAC;YACpB,EAAE,EAAE,kBAAc,CAAC,uBAAuB;YAC1C,OAAO,EAAE,WAAW,OAAO,IAAI,SAAS,8BAA8B,WAAW,mBAAmB;SACrG,CAAC,CAAC;KACJ;IAED,OAAO,QAAuB,CAAC;AACjC,CAAC;AAED;;GAEG;AACH,SAAS,oBAAoB,CAC3B,OAAoG,EACpG,KAAa,EACb,WAAwB,EACxB,OAAqC;IAErC,MAAM,OAAO,GAAG,+BAA+B,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAEtE,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;KAC1B;SAAM;QACL,2DAA2D;QAC3D,wEAAwE;KACzE;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,+BAA+B,CACtC,WAAwB,EACxB,OAAqC;IAErC,IAAI,WAA+B,CAAC;IAEpC,IAAI,OAAO,KAAK,0BAA0B,EAAE;QAC1C,WAAW,GAAG,WAAW,CAAC,eAAe,CAAC;KAC3C;SAAM,IAAI,OAAO,KAAK,kBAAkB,EAAE;QACzC,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC;KAC7C;SAAM;QACL,uEAAuE;QACvE,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;KACpC;IAED,8BAA8B;IAC9B,OAAO,WAAW,YAAY,WAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;AAClE,CAAC;AAED;;GAEG;AACH,SAAS,8BAA8B,CACrC,OAAgB,EAChB,WAAwB,EACxB,OAAqC;IAErC,IAAI,OAAO,KAAK,0BAA0B,EAAE;QAC1C,WAAW,CAAC,eAAe,GAAG,OAAO,CAAC;KACvC;SAAM,IAAI,OAAO,KAAK,kBAAkB,EAAE;QACzC,WAAW,CAAC,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;KACzC;SAAM;QACL,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;KAChC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,kCAAkC,CAAC,WAAwB,EAAE,OAAqC;IACzG,IAAI,OAAO,KAAK,0BAA0B,EAAE;QAC1C,WAAW,CAAC,eAAe,GAAG,IAAI,CAAC;KACpC;SAAM,IAAI,OAAO,KAAK,kBAAkB,EAAE;QACzC,WAAW,CAAC,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;KACtC;SAAM;QACL,WAAW,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;KAC7B;AACH,CAAC;AAED;;GAEG;AACH,SAAS,kCAAkC,CAAC,WAAmB,EAAE,OAAqC;;IACpG,IAAI,UAA8B,CAAC;IAEnC,IAAI,OAAO,KAAK,0BAA0B,EAAE;QAC1C,UAAU,GAAI,WAAmB,CAAC,eAAe,CAAC;KACnD;SAAM,IAAI,OAAO,KAAK,kBAAkB,EAAE;QACzC,UAAU,GAAG,MAAC,WAAmB,CAAC,SAAS,0CAAE,OAAO,CAAC;KACtD;SAAM;QACL,UAAU,GAAI,WAAmB,CAAC,OAAO,CAAC,CAAC;KAC5C;IAED,OAAO,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC;AAC1B,CAAC"}
|
|
@@ -2,3 +2,8 @@
|
|
|
2
2
|
* Replaces all supported image & font URLs in the given SVG with their base64 representation.
|
|
3
3
|
*/
|
|
4
4
|
export declare function embedAssets(svgSrc: string): Promise<string>;
|
|
5
|
+
/**
|
|
6
|
+
* Converts an SVG string into a base64-encoded data URI that can be used as a texture URL.
|
|
7
|
+
* Uses `TextEncoder` to correctly handle non-ASCII characters (e.g. umlauts) before base64-encoding.
|
|
8
|
+
*/
|
|
9
|
+
export declare function createSvgDataUri(svgSrc: string): string;
|
|
@@ -9,13 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.embedAssets = void 0;
|
|
12
|
+
exports.createSvgDataUri = exports.embedAssets = void 0;
|
|
13
13
|
/**
|
|
14
14
|
* Replaces all supported image & font URLs in the given SVG with their base64 representation.
|
|
15
15
|
*/
|
|
16
16
|
function embedAssets(svgSrc) {
|
|
17
17
|
return __awaiter(this, void 0, void 0, function* () {
|
|
18
|
-
const _imageExtensions = ['png', 'gif', 'jpg', 'jpeg', 'svg', 'bmp'];
|
|
18
|
+
const _imageExtensions = ['png', 'gif', 'jpg', 'jpeg', 'svg', 'bmp', 'webp'];
|
|
19
19
|
const _fontExtensions = ['woff2', 'woff', 'ttf', 'otf'];
|
|
20
20
|
const _assetExtensions = [..._imageExtensions, ..._fontExtensions];
|
|
21
21
|
// Regex copied from https://stackoverflow.com/a/8943487/1273551, not "stress tested"...
|
|
@@ -35,6 +35,17 @@ function embedAssets(svgSrc) {
|
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
37
|
exports.embedAssets = embedAssets;
|
|
38
|
+
/**
|
|
39
|
+
* Converts an SVG string into a base64-encoded data URI that can be used as a texture URL.
|
|
40
|
+
* Uses `TextEncoder` to correctly handle non-ASCII characters (e.g. umlauts) before base64-encoding.
|
|
41
|
+
*/
|
|
42
|
+
function createSvgDataUri(svgSrc) {
|
|
43
|
+
const utf8Bytes = new TextEncoder().encode(svgSrc);
|
|
44
|
+
const binary = Array.from(utf8Bytes, b => String.fromCharCode(b)).join('');
|
|
45
|
+
const dataUri = 'data:image/svg+xml;base64,' + btoa(binary);
|
|
46
|
+
return dataUri;
|
|
47
|
+
}
|
|
48
|
+
exports.createSvgDataUri = createSvgDataUri;
|
|
38
49
|
/**
|
|
39
50
|
* Fetch asset (image or font) and convert it to base64 string representation.
|
|
40
51
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg-helper.js","sourceRoot":"","sources":["../../../src/internal/svg-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;GAEG;AACH,SAAsB,WAAW,CAAC,MAAc;;QAC9C,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"svg-helper.js","sourceRoot":"","sources":["../../../src/internal/svg-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CameraManager = void 0;
|
|
13
13
|
const index_1 = require("../index");
|
|
14
|
-
const animation_helper_1 = require("../internal/animation-helper");
|
|
15
14
|
const export_helper_1 = require("../internal/export-helper");
|
|
16
15
|
const node_helper_1 = require("../internal/node-helper");
|
|
17
16
|
const screenshot_helper_1 = require("../internal/screenshot-helper");
|
|
@@ -94,10 +93,11 @@ class CameraManager {
|
|
|
94
93
|
}
|
|
95
94
|
if (durationMs === 0) {
|
|
96
95
|
// instant movement without animation
|
|
97
|
-
activeCamera.
|
|
98
|
-
activeCamera.
|
|
99
|
-
activeCamera.
|
|
100
|
-
activeCamera.
|
|
96
|
+
activeCamera.target = (_a = position.target) !== null && _a !== void 0 ? _a : activeCamera.target;
|
|
97
|
+
activeCamera.alpha = (_b = position.alpha) !== null && _b !== void 0 ? _b : activeCamera.alpha;
|
|
98
|
+
activeCamera.beta = (_c = position.beta) !== null && _c !== void 0 ? _c : activeCamera.beta;
|
|
99
|
+
activeCamera.radius = (_d = position.radius) !== null && _d !== void 0 ? _d : activeCamera.radius;
|
|
100
|
+
return;
|
|
101
101
|
}
|
|
102
102
|
const framesPerSec = 100;
|
|
103
103
|
const animationGroup = new index_1.AnimationGroup(CameraManager.CAMERA_ANIMATION_NAME, this.viewer.scene);
|
|
@@ -121,7 +121,7 @@ class CameraManager {
|
|
|
121
121
|
if (position.radius !== undefined) {
|
|
122
122
|
CameraManager._addCameraAnimationToGroup('radius', activeCamera.radius, position.radius, framesPerSec, index_1.Animation.ANIMATIONTYPE_FLOAT, animationGroup, activeCamera);
|
|
123
123
|
}
|
|
124
|
-
yield
|
|
124
|
+
yield this.viewer.utils.playAnimationGroupOnce(animationGroup, framesPerSec, durationMs);
|
|
125
125
|
});
|
|
126
126
|
}
|
|
127
127
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"camera-manager.js","sourceRoot":"","sources":["../../../src/manager/camera-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAYkB;AAClB,
|
|
1
|
+
{"version":3,"file":"camera-manager.js","sourceRoot":"","sources":["../../../src/manager/camera-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,12 +71,11 @@ class DebugManager {
|
|
|
71
71
|
showInspector(options) {
|
|
72
72
|
var _a, _b, _c, _d;
|
|
73
73
|
return __awaiter(this, void 0, void 0, function* () {
|
|
74
|
-
const cbnWindowBridge = (0, cbn_viewer_bridge_1.getCbnViewerBridge)();
|
|
75
74
|
if (process.env.NODE_ENV === 'development') {
|
|
76
75
|
const inspModule = yield Promise.resolve().then(() => __importStar(require(/* webpackChunkName: "inspector"*/ '@babylonjs/inspector')));
|
|
77
76
|
const parentEl = (_a = this._parentDomElementForInspector) !== null && _a !== void 0 ? _a :
|
|
78
77
|
// fallback to legacy `window.Cbn` call to support "old" cfgrs (pre Editor V2)
|
|
79
|
-
(_d = (_c = (_b =
|
|
78
|
+
(_d = (_c = (_b = cbn_viewer_bridge_1.CbnViewerBridge === null || cbn_viewer_bridge_1.CbnViewerBridge === void 0 ? void 0 : cbn_viewer_bridge_1.CbnViewerBridge.utils) === null || _b === void 0 ? void 0 : _b.Viewer3dHelper) === null || _c === void 0 ? void 0 : _c.getCfgrParentDomElementForInspector) === null || _d === void 0 ? void 0 : _d.call(_c);
|
|
80
79
|
if (!options && parentEl) {
|
|
81
80
|
// special case for usage in Combeenation configurator:
|
|
82
81
|
// if no options are set the inspector will be rendered into the parent element of the configurator
|
|
@@ -94,7 +93,7 @@ class DebugManager {
|
|
|
94
93
|
}
|
|
95
94
|
else {
|
|
96
95
|
// inspector not available, set according warning message in console
|
|
97
|
-
if (
|
|
96
|
+
if (cbn_viewer_bridge_1.CbnViewerBridge) {
|
|
98
97
|
console.warn(`Inspector not loaded.
|
|
99
98
|
The inspector can only be used in development builds (e.g. during development with watch mode, in the configurator preview, ...)
|
|
100
99
|
but not in production (e.g. production build of Custom JS, published configurator, ...).`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-manager.js","sourceRoot":"","sources":["../../../src/manager/debug-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAgBkB;AAClB,
|
|
1
|
+
{"version":3,"file":"debug-manager.js","sourceRoot":"","sources":["../../../src/manager/debug-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -184,11 +184,10 @@ class MaterialManager {
|
|
|
184
184
|
this._materialDefinitions[materialId] = definition;
|
|
185
185
|
return definition;
|
|
186
186
|
}
|
|
187
|
-
|
|
188
|
-
if (!definition && ((_a = cbnWindowBridge === null || cbnWindowBridge === void 0 ? void 0 : cbnWindowBridge.Assets) === null || _a === void 0 ? void 0 : _a.getMaterial)) {
|
|
187
|
+
if (!definition && ((_a = cbn_viewer_bridge_1.CbnViewerBridge === null || cbn_viewer_bridge_1.CbnViewerBridge === void 0 ? void 0 : cbn_viewer_bridge_1.CbnViewerBridge.Assets) === null || _a === void 0 ? void 0 : _a.getMaterial)) {
|
|
189
188
|
// fallback to legacy `Cbn.Assets.getMaterial` call to support "old" cfgrs (pre Editor V2)
|
|
190
189
|
// don't store the result in material defintions, as this code is just here for backwards compatibility`
|
|
191
|
-
definition =
|
|
190
|
+
definition = cbn_viewer_bridge_1.CbnViewerBridge.Assets.getMaterial(materialId);
|
|
192
191
|
}
|
|
193
192
|
if (!definition) {
|
|
194
193
|
console.warn(`Material definition for "${materialId}" couldn't be found. Material might not be registered or Material Asset from Combeenation server does not exist or is not connected to the configurator.`);
|