@combeenation/3d-viewer 5.2.0-alpha4 → 6.0.0
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/api/classes/dottedPath.js +1 -1
- package/dist/lib-cjs/api/classes/dottedPath.js.map +1 -1
- package/dist/lib-cjs/api/classes/element.js +3 -2
- package/dist/lib-cjs/api/classes/element.js.map +1 -1
- package/dist/lib-cjs/api/classes/parameter.d.ts +6 -3
- package/dist/lib-cjs/api/classes/parameter.js +8 -5
- package/dist/lib-cjs/api/classes/parameter.js.map +1 -1
- package/dist/lib-cjs/api/classes/placementAnimation.js +2 -1
- package/dist/lib-cjs/api/classes/placementAnimation.js.map +1 -1
- package/dist/lib-cjs/api/classes/variant.d.ts +1 -1
- package/dist/lib-cjs/api/classes/variant.js +7 -7
- package/dist/lib-cjs/api/classes/variant.js.map +1 -1
- package/dist/lib-cjs/api/classes/variantInstance.d.ts +0 -1
- package/dist/lib-cjs/api/classes/variantInstance.js +27 -23
- package/dist/lib-cjs/api/classes/variantInstance.js.map +1 -1
- package/dist/lib-cjs/api/classes/variantParameterizable.d.ts +2 -2
- package/dist/lib-cjs/api/classes/variantParameterizable.js +2 -2
- package/dist/lib-cjs/api/classes/viewer.d.ts +4 -2
- package/dist/lib-cjs/api/classes/viewer.js +6 -5
- package/dist/lib-cjs/api/classes/viewer.js.map +1 -1
- package/dist/lib-cjs/api/classes/viewerLight.js +14 -9
- package/dist/lib-cjs/api/classes/viewerLight.js.map +1 -1
- package/dist/lib-cjs/api/internal/sceneSetup.js +5 -4
- package/dist/lib-cjs/api/internal/sceneSetup.js.map +1 -1
- package/dist/lib-cjs/api/manager/animationManager.js +3 -3
- package/dist/lib-cjs/api/manager/animationManager.js.map +1 -1
- package/dist/lib-cjs/api/manager/gltfExportManager.d.ts +2 -2
- package/dist/lib-cjs/api/manager/gltfExportManager.js +5 -4
- package/dist/lib-cjs/api/manager/gltfExportManager.js.map +1 -1
- package/dist/lib-cjs/api/util/babylonHelper.js +20 -26
- package/dist/lib-cjs/api/util/babylonHelper.js.map +1 -1
- package/dist/lib-cjs/api/util/globalTypes.d.ts +11 -7
- package/dist/lib-cjs/api/util/resourceHelper.js +5 -3
- package/dist/lib-cjs/api/util/resourceHelper.js.map +1 -1
- package/dist/lib-cjs/api/util/sceneLoaderHelper.d.ts +2 -2
- package/dist/lib-cjs/api/util/sceneLoaderHelper.js +5 -7
- package/dist/lib-cjs/api/util/sceneLoaderHelper.js.map +1 -1
- package/dist/lib-cjs/api/util/stringHelper.d.ts +1 -1
- package/dist/lib-cjs/api/util/stringHelper.js +4 -2
- package/dist/lib-cjs/api/util/stringHelper.js.map +1 -1
- package/dist/lib-cjs/buildinfo.json +1 -1
- package/dist/lib-cjs/commonjs.tsconfig.tsbuildinfo +1 -0
- package/dist/lib-es6/api/classes/dottedPath.js +1 -1
- package/dist/lib-es6/api/classes/dottedPath.js.map +1 -1
- package/dist/lib-es6/api/classes/element.js +5 -4
- package/dist/lib-es6/api/classes/element.js.map +1 -1
- package/dist/lib-es6/api/classes/parameter.d.ts +6 -3
- package/dist/lib-es6/api/classes/parameter.js +8 -5
- package/dist/lib-es6/api/classes/parameter.js.map +1 -1
- package/dist/lib-es6/api/classes/placementAnimation.js +2 -1
- package/dist/lib-es6/api/classes/placementAnimation.js.map +1 -1
- package/dist/lib-es6/api/classes/variant.d.ts +1 -1
- package/dist/lib-es6/api/classes/variant.js +9 -9
- package/dist/lib-es6/api/classes/variant.js.map +1 -1
- package/dist/lib-es6/api/classes/variantInstance.d.ts +0 -1
- package/dist/lib-es6/api/classes/variantInstance.js +27 -23
- package/dist/lib-es6/api/classes/variantInstance.js.map +1 -1
- package/dist/lib-es6/api/classes/variantParameterizable.d.ts +2 -2
- package/dist/lib-es6/api/classes/variantParameterizable.js +2 -2
- package/dist/lib-es6/api/classes/viewer.d.ts +4 -2
- package/dist/lib-es6/api/classes/viewer.js +6 -5
- package/dist/lib-es6/api/classes/viewer.js.map +1 -1
- package/dist/lib-es6/api/classes/viewerLight.js +14 -9
- package/dist/lib-es6/api/classes/viewerLight.js.map +1 -1
- package/dist/lib-es6/api/internal/sceneSetup.js +5 -4
- package/dist/lib-es6/api/internal/sceneSetup.js.map +1 -1
- package/dist/lib-es6/api/manager/animationManager.js +3 -3
- package/dist/lib-es6/api/manager/animationManager.js.map +1 -1
- package/dist/lib-es6/api/manager/gltfExportManager.d.ts +2 -2
- package/dist/lib-es6/api/manager/gltfExportManager.js +5 -4
- package/dist/lib-es6/api/manager/gltfExportManager.js.map +1 -1
- package/dist/lib-es6/api/manager/sceneManager.js +1 -1
- package/dist/lib-es6/api/manager/sceneManager.js.map +1 -1
- package/dist/lib-es6/api/util/babylonHelper.js +20 -26
- package/dist/lib-es6/api/util/babylonHelper.js.map +1 -1
- package/dist/lib-es6/api/util/globalTypes.d.ts +11 -7
- package/dist/lib-es6/api/util/resourceHelper.js +5 -3
- package/dist/lib-es6/api/util/resourceHelper.js.map +1 -1
- package/dist/lib-es6/api/util/sceneLoaderHelper.d.ts +2 -2
- package/dist/lib-es6/api/util/sceneLoaderHelper.js +4 -6
- package/dist/lib-es6/api/util/sceneLoaderHelper.js.map +1 -1
- package/dist/lib-es6/api/util/stringHelper.d.ts +1 -1
- package/dist/lib-es6/api/util/stringHelper.js +4 -2
- package/dist/lib-es6/api/util/stringHelper.js.map +1 -1
- package/dist/lib-es6/buildinfo.json +1 -1
- package/dist/lib-es6/es6.tsconfig.tsbuildinfo +1 -0
- package/package.json +33 -30
- package/src/api/classes/dottedPath.ts +1 -1
- package/src/api/classes/element.ts +3 -2
- package/src/api/classes/parameter.ts +8 -5
- package/src/api/classes/placementAnimation.ts +2 -1
- package/src/api/classes/variant.ts +9 -9
- package/src/api/classes/variantInstance.ts +24 -24
- package/src/api/classes/variantParameterizable.ts +2 -2
- package/src/api/classes/viewer.ts +8 -7
- package/src/api/classes/viewerLight.ts +14 -9
- package/src/api/internal/debugViewer.ts +1 -1
- package/src/api/internal/sceneSetup.ts +6 -5
- package/src/api/manager/animationManager.ts +3 -3
- package/src/api/manager/gltfExportManager.ts +5 -4
- package/src/api/util/babylonHelper.ts +18 -36
- package/src/api/util/globalTypes.ts +11 -7
- package/src/api/util/resourceHelper.ts +5 -3
- package/src/api/util/sceneLoaderHelper.ts +3 -7
- package/src/api/util/stringHelper.ts +4 -4
- package/dist/lib-full/lens-rendering.js +0 -2
- package/dist/lib-full/lens-rendering.js.map +0 -1
- package/dist/lib-full/main.js +0 -3
- package/dist/lib-full/main.js.LICENSE.txt +0 -9
- package/dist/lib-full/main.js.map +0 -1
|
@@ -168,7 +168,9 @@ declare type SceneGlobals = {
|
|
|
168
168
|
'aa'?: 'fxaa';
|
|
169
169
|
'tone-mapping'?: boolean;
|
|
170
170
|
/**
|
|
171
|
-
* @bloom is widely known as glow. There you can define it’s size (Specifies the size of the bloom blur kernel,
|
|
171
|
+
* @bloom is widely known as glow. There you can define it’s size (Specifies the size of the bloom blur kernel,
|
|
172
|
+
* relative to the final output size) and threshold (The luminance threshold to find bright areas of the image to
|
|
173
|
+
* bloom).
|
|
172
174
|
* Further Information under [BloomEffect](https://doc.babylonjs.com/typedoc/classes/babylon.bloomeffect).
|
|
173
175
|
*
|
|
174
176
|
* @dof short for "depth-of-field" defines the focus in the view. Parameters in settings are listed in [Depth of Field and Other Lens Effects link](https://doc.babylonjs.com/divingDeeper/postProcesses/dofLenseEffects).
|
|
@@ -205,8 +207,8 @@ declare type ScreenshotSettings = {
|
|
|
205
207
|
*
|
|
206
208
|
* **Info regarding JPEG:** \
|
|
207
209
|
* Use mimeType `image/jpeg` (**not** `image/jpg`) when creating jpeg's. \
|
|
208
|
-
* Also ensure that {@link Scene.clearColor | viewer.scene.clearColor} has an alpha value of `1` as jpeg's don't
|
|
209
|
-
* transparency. Otherwise background will always be black for jpeg's.
|
|
210
|
+
* Also ensure that {@link Scene.clearColor | viewer.scene.clearColor} has an alpha value of `1` as jpeg's don't
|
|
211
|
+
* support transparency. Otherwise background will always be black for jpeg's.
|
|
210
212
|
*/
|
|
211
213
|
mimeType?: string;
|
|
212
214
|
/** Default `1` */
|
|
@@ -282,8 +284,10 @@ declare type CameraDefinition = {
|
|
|
282
284
|
* `arc` is a default camera position where the 3D-model is the center and the camera rotates around the 3D-model.
|
|
283
285
|
* More Information about `arc` in [ArcRotateCamera](https://doc.babylonjs.com/typedoc/classes/babylon.arcrotatecamera).
|
|
284
286
|
*
|
|
285
|
-
* NOTE: While "baked" camera definitions from a GLB or babylon file can currently not be instatiated within the
|
|
286
|
-
*
|
|
287
|
+
* NOTE: While "baked" camera definitions from a GLB or babylon file can currently not be instatiated within the
|
|
288
|
+
* `Specification`, it's still possible to use them in the viewer.\
|
|
289
|
+
* For the moment all camera definitions inside these files are automatically added to the scene and can be actived
|
|
290
|
+
* using the {@link Viewer.switchCamera} function.\
|
|
287
291
|
* The `newCamera` input has to match the name of the camera node inside the GLB/babylon file.
|
|
288
292
|
*/
|
|
289
293
|
type: 'arc';
|
|
@@ -340,8 +344,8 @@ declare type AnimationDefinitions = {
|
|
|
340
344
|
*
|
|
341
345
|
* The `GSAPTWeenVars` are extended by the `shortestWay` property.\
|
|
342
346
|
* This property defines if the camera should move to the target position within the shortest possible distance.\
|
|
343
|
-
* If `shortestWay` is `false`, the camera moves the whole difference between the current camera position and the target
|
|
344
|
-
* and that could be > 360, which can appear very unconvenient to the operator.\
|
|
347
|
+
* If `shortestWay` is `false`, the camera moves the whole difference between the current camera position and the target
|
|
348
|
+
* position and that could be > 360, which can appear very unconvenient to the operator.\
|
|
345
349
|
* The default value of this flag is `true`.
|
|
346
350
|
*
|
|
347
351
|
* Example usage in {@link SceneJson | SceneJson.animations}:
|
|
@@ -24,7 +24,7 @@ exports.sleep = sleep;
|
|
|
24
24
|
const load = function (path) {
|
|
25
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
26
26
|
event_1.emitter.emit(event_1.Event.LOADING_START, path);
|
|
27
|
-
|
|
27
|
+
const data = yield fetch(path);
|
|
28
28
|
event_1.emitter.emit(event_1.Event.LOADING_END, path);
|
|
29
29
|
return data;
|
|
30
30
|
});
|
|
@@ -72,8 +72,10 @@ exports.loadJavascript = loadJavascript;
|
|
|
72
72
|
const debounce = function (func, wait, immediate = false) {
|
|
73
73
|
let timeout;
|
|
74
74
|
return function () {
|
|
75
|
-
// @ts-ignore
|
|
75
|
+
// @ts-ignore this function is not very "ESLint friendly", also see ESLint disable comment 2 lines below
|
|
76
|
+
// => take some time to refactor this function when there is time
|
|
76
77
|
const context = this;
|
|
78
|
+
// eslint-disable-next-line prefer-rest-params
|
|
77
79
|
const args = arguments;
|
|
78
80
|
const later = function () {
|
|
79
81
|
timeout = null;
|
|
@@ -141,7 +143,7 @@ exports.createImageFromSvg = createImageFromSvg;
|
|
|
141
143
|
*/
|
|
142
144
|
const createImageFromImgSrc = function (imgSrc) {
|
|
143
145
|
return __awaiter(this, void 0, void 0, function* () {
|
|
144
|
-
|
|
146
|
+
const img = new Image();
|
|
145
147
|
yield new Promise(resolve => {
|
|
146
148
|
img.onload = () => {
|
|
147
149
|
setTimeout(resolve, 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resourceHelper.js","sourceRoot":"","sources":["../../../../src/api/util/resourceHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAkD;AAElD;;GAEG;AACH,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"resourceHelper.js","sourceRoot":"","sources":["../../../../src/api/util/resourceHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ declare const getCustomCbnBabylonLoaderPlugin: (previousLoaderPlugin: ISceneLoad
|
|
|
18
18
|
* @param concerningMesh Mesh to look for missing materials on, and create/apply to (when found).
|
|
19
19
|
* @returns observer
|
|
20
20
|
*/
|
|
21
|
-
declare const getMaterialPostLoadObserver: (targetMeshOrInstance: AbstractMesh, concerningMesh: Mesh) => (
|
|
21
|
+
declare const getMaterialPostLoadObserver: (targetMeshOrInstance: AbstractMesh, concerningMesh: Mesh) => (eventData: any, eventState: any) => void;
|
|
22
22
|
/**
|
|
23
23
|
* Adds an "onEnabledStateChanged" observer to the given mesh and all its parents:
|
|
24
24
|
* The added observer (`getMaterialPostLoadObserver`) handles creation of missing materials once the given node is
|
|
@@ -31,5 +31,5 @@ declare const addMissingMaterialObserver: (node: BjsNode) => void;
|
|
|
31
31
|
* @param scene BabylonJs scene
|
|
32
32
|
* @returns PBRMaterial | null
|
|
33
33
|
*/
|
|
34
|
-
export declare const
|
|
34
|
+
export declare const createMaterialFromCbnAssets: (materialId: string, scene: Scene) => Material | null;
|
|
35
35
|
export { getCustomCbnBabylonLoaderPlugin, getMaterialPostLoadObserver, missingMaterialMetadataName, addMissingMaterialObserver, };
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.addMissingMaterialObserver = exports.missingMaterialMetadataName = exports.getMaterialPostLoadObserver = exports.getCustomCbnBabylonLoaderPlugin = exports.
|
|
6
|
+
exports.addMissingMaterialObserver = exports.missingMaterialMetadataName = exports.getMaterialPostLoadObserver = exports.getCustomCbnBabylonLoaderPlugin = exports.createMaterialFromCbnAssets = void 0;
|
|
7
7
|
const babylonHelper_1 = require("./babylonHelper");
|
|
8
8
|
const material_1 = require("@babylonjs/core/Materials/material");
|
|
9
9
|
const instancedMesh_1 = require("@babylonjs/core/Meshes/instancedMesh");
|
|
@@ -45,7 +45,7 @@ exports.getCustomCbnBabylonLoaderPlugin = getCustomCbnBabylonLoaderPlugin;
|
|
|
45
45
|
* @returns observer
|
|
46
46
|
*/
|
|
47
47
|
const getMaterialPostLoadObserver = function (targetMeshOrInstance, concerningMesh) {
|
|
48
|
-
return (
|
|
48
|
+
return (eventData, eventState) => {
|
|
49
49
|
const hasBeenEnabled = concerningMesh.isEnabled(true);
|
|
50
50
|
const materialMissing = (0, has_1.default)(concerningMesh.metadata, missingMaterialMetadataName);
|
|
51
51
|
if (!hasBeenEnabled || !materialMissing)
|
|
@@ -55,7 +55,7 @@ const getMaterialPostLoadObserver = function (targetMeshOrInstance, concerningMe
|
|
|
55
55
|
// try to find material on the scene
|
|
56
56
|
const existingMat = concerningMesh.getScene().getMaterialById(missingMatId);
|
|
57
57
|
// assign either existing material or freshly created one
|
|
58
|
-
concerningMesh.material = existingMat || (0, exports.
|
|
58
|
+
concerningMesh.material = existingMat || (0, exports.createMaterialFromCbnAssets)(missingMatId, concerningMesh.getScene());
|
|
59
59
|
// since the material is there now, we do not need the related metadata tag anymore
|
|
60
60
|
delete concerningMesh.metadata[missingMaterialMetadataName];
|
|
61
61
|
};
|
|
@@ -78,8 +78,6 @@ const addMissingMaterialMetadata = function (dataParsed, container) {
|
|
|
78
78
|
const materialOnOriginalMesh = currMeshOriginal.materialId;
|
|
79
79
|
if (!materialOnOriginalMesh || materialOnImportedMesh === materialOnOriginalMesh)
|
|
80
80
|
continue;
|
|
81
|
-
// TODO: Just for easier debugging. Remove before publishment...
|
|
82
|
-
console.info(`Adding "${missingMaterialMetadataName}" info on mesh "${currMeshOriginal.name}" with material "${currMeshOriginal.materialId}"`);
|
|
83
81
|
// if we're here, the imported mesh has different material than original one
|
|
84
82
|
(_b = window.Cbn) === null || _b === void 0 ? void 0 : _b.Assets.assertMaterialExists(materialOnOriginalMesh);
|
|
85
83
|
(0, babylonHelper_1.injectNodeMetadata)(currMeshImported, { [missingMaterialMetadataName]: materialOnOriginalMesh }, false);
|
|
@@ -129,7 +127,7 @@ exports.addMissingMaterialObserver = addMissingMaterialObserver;
|
|
|
129
127
|
* @param scene BabylonJs scene
|
|
130
128
|
* @returns PBRMaterial | null
|
|
131
129
|
*/
|
|
132
|
-
const
|
|
130
|
+
const createMaterialFromCbnAssets = function (materialId, scene) {
|
|
133
131
|
var _a;
|
|
134
132
|
const materialDefinition = (_a = window.Cbn) === null || _a === void 0 ? void 0 : _a.Assets.getMaterial(materialId);
|
|
135
133
|
// The generic `Material.Parse` actually returns a more specific material like `BABYLON.StandardMaterial`,
|
|
@@ -138,5 +136,5 @@ const getMaterialFromCbnAssets = function (materialId, scene) {
|
|
|
138
136
|
const material = materialDefinition && material_1.Material.Parse(materialDefinition, scene, '');
|
|
139
137
|
return material || null;
|
|
140
138
|
};
|
|
141
|
-
exports.
|
|
139
|
+
exports.createMaterialFromCbnAssets = createMaterialFromCbnAssets;
|
|
142
140
|
//# sourceMappingURL=sceneLoaderHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sceneLoaderHelper.js","sourceRoot":"","sources":["../../../../src/api/util/sceneLoaderHelper.ts"],"names":[],"mappings":";;;;;;AAAA,mDAAqD;AAErD,iEAA8D;AAC9D,wEAAqE;AAMrE,wDAAgC;AAEhC,MAAM,2BAA2B,GAAG,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"sceneLoaderHelper.js","sourceRoot":"","sources":["../../../../src/api/util/sceneLoaderHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,10 @@ exports.camelToSnakeCase = exports.uuidv4 = void 0;
|
|
|
5
5
|
* Creates a random uuidv4.
|
|
6
6
|
*/
|
|
7
7
|
const uuidv4 = function () {
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
return ([1e7].toString() + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c => {
|
|
9
|
+
const cNum = parseInt(c);
|
|
10
|
+
return (cNum ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (cNum / 4)))).toString(16);
|
|
11
|
+
});
|
|
10
12
|
};
|
|
11
13
|
exports.uuidv4 = uuidv4;
|
|
12
14
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stringHelper.js","sourceRoot":"","sources":["../../../../src/api/util/stringHelper.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAM,MAAM,GAAG;IACb,
|
|
1
|
+
{"version":3,"file":"stringHelper.js","sourceRoot":"","sources":["../../../../src/api/util/stringHelper.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAM,MAAM,GAAG;IACb,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE;QAC3E,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACzB,OAAO,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACnG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAcO,wBAAM;AAZf;;GAEG;AACH,MAAM,gBAAgB,GAAG,UAAU,GAAW;IAC5C,OAAO,GAAG;SACP,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;SAC1B,IAAI,EAAE;SACN,KAAK,CAAC,GAAG,CAAC;SACV,IAAI,CAAC,GAAG,CAAC;SACT,WAAW,EAAE,CAAC;AACnB,CAAC,CAAC;AAEe,4CAAgB"}
|