babylonjs-loaders 6.10.0 → 6.11.1
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/babylon.glTF1FileLoader.js +239 -239
- package/babylon.glTF1FileLoader.js.map +1 -1
- package/babylon.glTF1FileLoader.min.js.map +1 -1
- package/babylon.glTF2FileLoader.js +598 -598
- package/babylon.glTF2FileLoader.js.map +1 -1
- package/babylon.glTF2FileLoader.min.js.map +1 -1
- package/babylon.glTFFileLoader.js +768 -768
- package/babylon.glTFFileLoader.js.map +1 -1
- package/babylon.glTFFileLoader.min.js.map +1 -1
- package/babylon.objFileLoader.js +79 -79
- package/babylon.objFileLoader.js.map +1 -1
- package/babylon.objFileLoader.min.js.map +1 -1
- package/babylon.stlFileLoader.js +35 -35
- package/babylon.stlFileLoader.js.map +1 -1
- package/babylon.stlFileLoader.min.js.map +1 -1
- package/babylonjs.loaders.d.ts +16 -16
- package/babylonjs.loaders.js +899 -899
- package/babylonjs.loaders.js.map +1 -1
- package/babylonjs.loaders.min.js.map +1 -1
- package/babylonjs.loaders.module.d.ts +64 -64
- package/config.json +1 -1
- package/package.json +4 -4
- package/src/glTF1FileLoader.ts +1 -1
- package/src/glTF2FileLoader.ts +1 -1
- package/src/glTFFileLoader.ts +1 -1
- package/src/index.ts +1 -1
- package/src/objFileLoader.ts +1 -1
- package/src/stlFileLoader.ts +1 -1
- package/tsconfig.build.json +8 -3
- package/tsconfig.json +2 -1
- package/webpack.config.js +4 -0
|
@@ -7,15 +7,15 @@
|
|
|
7
7
|
exports["babylonjs-loaders"] = factory(require("babylonjs"));
|
|
8
8
|
else
|
|
9
9
|
root["LOADERS"] = factory(root["BABYLON"]);
|
|
10
|
-
})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), (
|
|
10
|
+
})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), (__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_observable__) => {
|
|
11
11
|
return /******/ (() => { // webpackBootstrap
|
|
12
12
|
/******/ "use strict";
|
|
13
13
|
/******/ var __webpack_modules__ = ({
|
|
14
14
|
|
|
15
|
-
/***/ "../../../
|
|
16
|
-
|
|
17
|
-
!*** ../../../
|
|
18
|
-
|
|
15
|
+
/***/ "../../../dev/loaders/src/glTF/1.0/glTFBinaryExtension.ts":
|
|
16
|
+
/*!****************************************************************!*\
|
|
17
|
+
!*** ../../../dev/loaders/src/glTF/1.0/glTFBinaryExtension.ts ***!
|
|
18
|
+
\****************************************************************/
|
|
19
19
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
20
20
|
|
|
21
21
|
__webpack_require__.r(__webpack_exports__);
|
|
@@ -23,9 +23,9 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
23
23
|
/* harmony export */ GLTFBinaryExtension: () => (/* binding */ GLTFBinaryExtension)
|
|
24
24
|
/* harmony export */ });
|
|
25
25
|
/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! tslib */ "../../../../node_modules/tslib/tslib.es6.mjs");
|
|
26
|
-
/* harmony import */ var _glTFLoader__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./glTFLoader */ "../../../
|
|
27
|
-
/* harmony import */ var _glTFLoaderUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./glTFLoaderUtils */ "../../../
|
|
28
|
-
/* harmony import */ var _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./glTFLoaderInterfaces */ "../../../
|
|
26
|
+
/* harmony import */ var _glTFLoader__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./glTFLoader */ "../../../dev/loaders/src/glTF/1.0/glTFLoader.ts");
|
|
27
|
+
/* harmony import */ var _glTFLoaderUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./glTFLoaderUtils */ "../../../dev/loaders/src/glTF/1.0/glTFLoaderUtils.ts");
|
|
28
|
+
/* harmony import */ var _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./glTFLoaderInterfaces */ "../../../dev/loaders/src/glTF/1.0/glTFLoaderInterfaces.ts");
|
|
29
29
|
|
|
30
30
|
|
|
31
31
|
|
|
@@ -93,10 +93,10 @@ _glTFLoader__WEBPACK_IMPORTED_MODULE_0__.GLTFLoader.RegisterExtension(new GLTFBi
|
|
|
93
93
|
|
|
94
94
|
/***/ }),
|
|
95
95
|
|
|
96
|
-
/***/ "../../../
|
|
97
|
-
|
|
98
|
-
!*** ../../../
|
|
99
|
-
|
|
96
|
+
/***/ "../../../dev/loaders/src/glTF/1.0/glTFLoader.ts":
|
|
97
|
+
/*!*******************************************************!*\
|
|
98
|
+
!*** ../../../dev/loaders/src/glTF/1.0/glTFLoader.ts ***!
|
|
99
|
+
\*******************************************************/
|
|
100
100
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
101
101
|
|
|
102
102
|
__webpack_require__.r(__webpack_exports__);
|
|
@@ -105,11 +105,11 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
105
105
|
/* harmony export */ GLTFLoaderBase: () => (/* binding */ GLTFLoaderBase),
|
|
106
106
|
/* harmony export */ GLTFLoaderExtension: () => (/* binding */ GLTFLoaderExtension)
|
|
107
107
|
/* harmony export */ });
|
|
108
|
-
/* harmony import */ var _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./glTFLoaderInterfaces */ "../../../
|
|
109
|
-
/* harmony import */ var
|
|
110
|
-
/* harmony import */ var
|
|
111
|
-
/* harmony import */ var _glTFLoaderUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./glTFLoaderUtils */ "../../../
|
|
112
|
-
/* harmony import */ var _glTFFileLoader__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../glTFFileLoader */ "../../../
|
|
108
|
+
/* harmony import */ var _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./glTFLoaderInterfaces */ "../../../dev/loaders/src/glTF/1.0/glTFLoaderInterfaces.ts");
|
|
109
|
+
/* harmony import */ var babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Engines/constants */ "babylonjs/Misc/observable");
|
|
110
|
+
/* harmony import */ var babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__);
|
|
111
|
+
/* harmony import */ var _glTFLoaderUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./glTFLoaderUtils */ "../../../dev/loaders/src/glTF/1.0/glTFLoaderUtils.ts");
|
|
112
|
+
/* harmony import */ var _glTFFileLoader__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../glTFFileLoader */ "../../../dev/loaders/src/glTF/glTFFileLoader.ts");
|
|
113
113
|
|
|
114
114
|
|
|
115
115
|
|
|
@@ -290,10 +290,10 @@ var loadAnimations = function (gltfRuntime) {
|
|
|
290
290
|
targetNode = gltfRuntime.scene.getNodeByName(targetId);
|
|
291
291
|
}
|
|
292
292
|
if (targetNode === null) {
|
|
293
|
-
|
|
293
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Warn("Creating animation named " + anim + ". But cannot find node named " + targetId + " to attach to");
|
|
294
294
|
continue;
|
|
295
295
|
}
|
|
296
|
-
var isBone = targetNode instanceof
|
|
296
|
+
var isBone = targetNode instanceof babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Bone;
|
|
297
297
|
// Get target path (position, rotation or scaling)
|
|
298
298
|
var targetPath = channel.target.path;
|
|
299
299
|
var targetPathIndex = glTFAnimationPaths.indexOf(targetPath);
|
|
@@ -301,14 +301,14 @@ var loadAnimations = function (gltfRuntime) {
|
|
|
301
301
|
targetPath = babylonAnimationPaths[targetPathIndex];
|
|
302
302
|
}
|
|
303
303
|
// Determine animation type
|
|
304
|
-
var animationType =
|
|
304
|
+
var animationType = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Animation.ANIMATIONTYPE_MATRIX;
|
|
305
305
|
if (!isBone) {
|
|
306
306
|
if (targetPath === "rotationQuaternion") {
|
|
307
|
-
animationType =
|
|
308
|
-
targetNode.rotationQuaternion = new
|
|
307
|
+
animationType = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Animation.ANIMATIONTYPE_QUATERNION;
|
|
308
|
+
targetNode.rotationQuaternion = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Quaternion();
|
|
309
309
|
}
|
|
310
310
|
else {
|
|
311
|
-
animationType =
|
|
311
|
+
animationType = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Animation.ANIMATIONTYPE_VECTOR3;
|
|
312
312
|
}
|
|
313
313
|
}
|
|
314
314
|
// Create animation and key frames
|
|
@@ -322,7 +322,7 @@ var loadAnimations = function (gltfRuntime) {
|
|
|
322
322
|
}
|
|
323
323
|
if (!modifyKey) {
|
|
324
324
|
gltfRuntime.scene._blockEntityCollection = !!gltfRuntime.assetContainer;
|
|
325
|
-
babylonAnimation = new
|
|
325
|
+
babylonAnimation = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Animation(anim, isBone ? "_matrix" : targetPath, 1, animationType, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Animation.ANIMATIONLOOPMODE_CYCLE);
|
|
326
326
|
gltfRuntime.scene._blockEntityCollection = false;
|
|
327
327
|
}
|
|
328
328
|
// For each frame
|
|
@@ -330,19 +330,19 @@ var loadAnimations = function (gltfRuntime) {
|
|
|
330
330
|
var value = null;
|
|
331
331
|
if (targetPath === "rotationQuaternion") {
|
|
332
332
|
// VEC4
|
|
333
|
-
value =
|
|
333
|
+
value = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Quaternion.FromArray([bufferOutput[arrayOffset], bufferOutput[arrayOffset + 1], bufferOutput[arrayOffset + 2], bufferOutput[arrayOffset + 3]]);
|
|
334
334
|
arrayOffset += 4;
|
|
335
335
|
}
|
|
336
336
|
else {
|
|
337
337
|
// Position and scaling are VEC3
|
|
338
|
-
value =
|
|
338
|
+
value = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.FromArray([bufferOutput[arrayOffset], bufferOutput[arrayOffset + 1], bufferOutput[arrayOffset + 2]]);
|
|
339
339
|
arrayOffset += 3;
|
|
340
340
|
}
|
|
341
341
|
if (isBone) {
|
|
342
342
|
var bone = targetNode;
|
|
343
|
-
var translation =
|
|
344
|
-
var rotationQuaternion = new
|
|
345
|
-
var scaling =
|
|
343
|
+
var translation = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.Zero();
|
|
344
|
+
var rotationQuaternion = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Quaternion();
|
|
345
|
+
var scaling = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.Zero();
|
|
346
346
|
// Warning on decompose
|
|
347
347
|
var mat = bone.getBaseMatrix();
|
|
348
348
|
if (modifyKey && lastAnimation) {
|
|
@@ -358,7 +358,7 @@ var loadAnimations = function (gltfRuntime) {
|
|
|
358
358
|
else {
|
|
359
359
|
scaling = value;
|
|
360
360
|
}
|
|
361
|
-
value =
|
|
361
|
+
value = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Matrix.Compose(scaling, rotationQuaternion, translation);
|
|
362
362
|
}
|
|
363
363
|
if (!modifyKey) {
|
|
364
364
|
keys.push({
|
|
@@ -388,13 +388,13 @@ var loadAnimations = function (gltfRuntime) {
|
|
|
388
388
|
var configureBoneTransformation = function (node) {
|
|
389
389
|
var mat = null;
|
|
390
390
|
if (node.translation || node.rotation || node.scale) {
|
|
391
|
-
var scale =
|
|
392
|
-
var rotation =
|
|
393
|
-
var position =
|
|
394
|
-
mat =
|
|
391
|
+
var scale = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.FromArray(node.scale || [1, 1, 1]);
|
|
392
|
+
var rotation = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Quaternion.FromArray(node.rotation || [0, 0, 0, 1]);
|
|
393
|
+
var position = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.FromArray(node.translation || [0, 0, 0]);
|
|
394
|
+
mat = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Matrix.Compose(scale, rotation, position);
|
|
395
395
|
}
|
|
396
396
|
else {
|
|
397
|
-
mat =
|
|
397
|
+
mat = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Matrix.FromArray(node.matrix);
|
|
398
398
|
}
|
|
399
399
|
return mat;
|
|
400
400
|
};
|
|
@@ -427,7 +427,7 @@ var getParentBone = function (gltfRuntime, skins, jointName, newSkeleton) {
|
|
|
427
427
|
}
|
|
428
428
|
if (child.jointName === jointName) {
|
|
429
429
|
var mat = configureBoneTransformation(node);
|
|
430
|
-
var bone = new
|
|
430
|
+
var bone = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Bone(node.name || "", newSkeleton, getParentBone(gltfRuntime, skins, node.jointName, newSkeleton), mat);
|
|
431
431
|
bone.id = nde;
|
|
432
432
|
return bone;
|
|
433
433
|
}
|
|
@@ -507,7 +507,7 @@ var getNodesToRoot = function (gltfRuntime, newSkeleton, skins, nodesToRoot) {
|
|
|
507
507
|
}
|
|
508
508
|
// Create node to root bone
|
|
509
509
|
var mat = configureBoneTransformation(node);
|
|
510
|
-
var bone = new
|
|
510
|
+
var bone = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Bone(node.name || "", newSkeleton, null, mat);
|
|
511
511
|
bone.id = id;
|
|
512
512
|
nodesToRoot.push({ bone: bone, node: node, id: id });
|
|
513
513
|
}
|
|
@@ -539,7 +539,7 @@ var getNodesToRoot = function (gltfRuntime, newSkeleton, skins, nodesToRoot) {
|
|
|
539
539
|
*/
|
|
540
540
|
var importSkeleton = function (gltfRuntime, skins, mesh, newSkeleton) {
|
|
541
541
|
if (!newSkeleton) {
|
|
542
|
-
newSkeleton = new
|
|
542
|
+
newSkeleton = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Skeleton(skins.name || "", "", gltfRuntime.scene);
|
|
543
543
|
}
|
|
544
544
|
if (!skins.babylonSkeleton) {
|
|
545
545
|
return newSkeleton;
|
|
@@ -557,7 +557,7 @@ var importSkeleton = function (gltfRuntime, skins, mesh, newSkeleton) {
|
|
|
557
557
|
}
|
|
558
558
|
var node = jointNode.node;
|
|
559
559
|
if (!node) {
|
|
560
|
-
|
|
560
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Warn("Joint named " + skins.jointNames[i] + " does not exist");
|
|
561
561
|
continue;
|
|
562
562
|
}
|
|
563
563
|
var id = jointNode.id;
|
|
@@ -577,7 +577,7 @@ var importSkeleton = function (gltfRuntime, skins, mesh, newSkeleton) {
|
|
|
577
577
|
}
|
|
578
578
|
var joint = jointNode_1.node;
|
|
579
579
|
if (!joint) {
|
|
580
|
-
|
|
580
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Warn("Joint named " + skins.jointNames[j] + " does not exist when looking for parent");
|
|
581
581
|
continue;
|
|
582
582
|
}
|
|
583
583
|
var children = joint.children;
|
|
@@ -606,7 +606,7 @@ var importSkeleton = function (gltfRuntime, skins, mesh, newSkeleton) {
|
|
|
606
606
|
}
|
|
607
607
|
}
|
|
608
608
|
}
|
|
609
|
-
var bone = new
|
|
609
|
+
var bone = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Bone(node.jointName || "", newSkeleton, parentBone, mat);
|
|
610
610
|
bone.id = id;
|
|
611
611
|
}
|
|
612
612
|
// Polish
|
|
@@ -642,7 +642,7 @@ var importSkeleton = function (gltfRuntime, skins, mesh, newSkeleton) {
|
|
|
642
642
|
var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {
|
|
643
643
|
if (!newMesh) {
|
|
644
644
|
gltfRuntime.scene._blockEntityCollection = !!gltfRuntime.assetContainer;
|
|
645
|
-
newMesh = new
|
|
645
|
+
newMesh = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Mesh(node.name || "", gltfRuntime.scene);
|
|
646
646
|
newMesh._parentContainer = gltfRuntime.assetContainer;
|
|
647
647
|
gltfRuntime.scene._blockEntityCollection = false;
|
|
648
648
|
newMesh.id = id;
|
|
@@ -665,7 +665,7 @@ var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {
|
|
|
665
665
|
// Positions, normals and UVs
|
|
666
666
|
for (var i = 0; i < mesh.primitives.length; i++) {
|
|
667
667
|
// Temporary vertex data
|
|
668
|
-
var tempVertexData = new
|
|
668
|
+
var tempVertexData = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.VertexData();
|
|
669
669
|
var primitive = mesh.primitives[i];
|
|
670
670
|
if (primitive.mode !== 4) {
|
|
671
671
|
// continue;
|
|
@@ -699,7 +699,7 @@ var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {
|
|
|
699
699
|
}
|
|
700
700
|
else if (semantic.indexOf("TEXCOORD_") !== -1) {
|
|
701
701
|
var channel = Number(semantic.split("_")[1]);
|
|
702
|
-
var uvKind =
|
|
702
|
+
var uvKind = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.VertexBuffer.UVKind + (channel === 0 ? "" : channel + 1);
|
|
703
703
|
var uvs = new Float32Array(buffer.length);
|
|
704
704
|
uvs.set(buffer);
|
|
705
705
|
normalizeUVs(uvs);
|
|
@@ -752,11 +752,11 @@ var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {
|
|
|
752
752
|
var material;
|
|
753
753
|
gltfRuntime.scene._blockEntityCollection = !!gltfRuntime.assetContainer;
|
|
754
754
|
if (subMaterials.length > 1) {
|
|
755
|
-
material = new
|
|
755
|
+
material = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.MultiMaterial("multimat" + id, gltfRuntime.scene);
|
|
756
756
|
material.subMaterials = subMaterials;
|
|
757
757
|
}
|
|
758
758
|
else {
|
|
759
|
-
material = new
|
|
759
|
+
material = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.StandardMaterial("multimat" + id, gltfRuntime.scene);
|
|
760
760
|
}
|
|
761
761
|
if (subMaterials.length === 1) {
|
|
762
762
|
material = subMaterials[0];
|
|
@@ -766,7 +766,7 @@ var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {
|
|
|
766
766
|
newMesh.material = material;
|
|
767
767
|
}
|
|
768
768
|
// Apply geometry
|
|
769
|
-
new
|
|
769
|
+
new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Geometry(id, gltfRuntime.scene, vertexData, false, newMesh);
|
|
770
770
|
newMesh.computeWorldMatrix(true);
|
|
771
771
|
gltfRuntime.scene._blockEntityCollection = false;
|
|
772
772
|
// Apply submeshes
|
|
@@ -782,7 +782,7 @@ var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {
|
|
|
782
782
|
if (mesh.primitives[i].mode !== 4) {
|
|
783
783
|
//continue;
|
|
784
784
|
}
|
|
785
|
-
|
|
785
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.SubMesh.AddToMesh(index, verticesStarts[index], verticesCounts[index], indexStarts[index], indexCounts[index], newMesh, newMesh, true);
|
|
786
786
|
index++;
|
|
787
787
|
}
|
|
788
788
|
}
|
|
@@ -814,15 +814,15 @@ var configureNode = function (newNode, position, rotation, scaling) {
|
|
|
814
814
|
*/
|
|
815
815
|
var configureNodeFromMatrix = function (newNode, node) {
|
|
816
816
|
if (node.matrix) {
|
|
817
|
-
var position = new
|
|
818
|
-
var rotation = new
|
|
819
|
-
var scaling = new
|
|
820
|
-
var mat =
|
|
817
|
+
var position = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3(0, 0, 0);
|
|
818
|
+
var rotation = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Quaternion();
|
|
819
|
+
var scaling = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3(0, 0, 0);
|
|
820
|
+
var mat = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Matrix.FromArray(node.matrix);
|
|
821
821
|
mat.decompose(scaling, rotation, position);
|
|
822
822
|
configureNode(newNode, position, rotation, scaling);
|
|
823
823
|
}
|
|
824
824
|
else if (node.translation && node.rotation && node.scale) {
|
|
825
|
-
configureNode(newNode,
|
|
825
|
+
configureNode(newNode, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.FromArray(node.translation), babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Quaternion.FromArray(node.rotation), babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.FromArray(node.scale));
|
|
826
826
|
}
|
|
827
827
|
newNode.computeWorldMatrix(true);
|
|
828
828
|
};
|
|
@@ -867,37 +867,37 @@ var importNode = function (gltfRuntime, node, id) {
|
|
|
867
867
|
if (light) {
|
|
868
868
|
if (light.type === "ambient") {
|
|
869
869
|
var ambienLight = light[light.type];
|
|
870
|
-
var hemiLight = new
|
|
870
|
+
var hemiLight = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.HemisphericLight(node.light, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.Zero(), gltfRuntime.scene);
|
|
871
871
|
hemiLight.name = node.name || "";
|
|
872
872
|
if (ambienLight.color) {
|
|
873
|
-
hemiLight.diffuse =
|
|
873
|
+
hemiLight.diffuse = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3.FromArray(ambienLight.color);
|
|
874
874
|
}
|
|
875
875
|
lastNode = hemiLight;
|
|
876
876
|
}
|
|
877
877
|
else if (light.type === "directional") {
|
|
878
878
|
var directionalLight = light[light.type];
|
|
879
|
-
var dirLight = new
|
|
879
|
+
var dirLight = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.DirectionalLight(node.light, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.Zero(), gltfRuntime.scene);
|
|
880
880
|
dirLight.name = node.name || "";
|
|
881
881
|
if (directionalLight.color) {
|
|
882
|
-
dirLight.diffuse =
|
|
882
|
+
dirLight.diffuse = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3.FromArray(directionalLight.color);
|
|
883
883
|
}
|
|
884
884
|
lastNode = dirLight;
|
|
885
885
|
}
|
|
886
886
|
else if (light.type === "point") {
|
|
887
887
|
var pointLight = light[light.type];
|
|
888
|
-
var ptLight = new
|
|
888
|
+
var ptLight = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.PointLight(node.light, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.Zero(), gltfRuntime.scene);
|
|
889
889
|
ptLight.name = node.name || "";
|
|
890
890
|
if (pointLight.color) {
|
|
891
|
-
ptLight.diffuse =
|
|
891
|
+
ptLight.diffuse = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3.FromArray(pointLight.color);
|
|
892
892
|
}
|
|
893
893
|
lastNode = ptLight;
|
|
894
894
|
}
|
|
895
895
|
else if (light.type === "spot") {
|
|
896
896
|
var spotLight = light[light.type];
|
|
897
|
-
var spLight = new
|
|
897
|
+
var spLight = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.SpotLight(node.light, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.Zero(), babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.Zero(), 0, 0, gltfRuntime.scene);
|
|
898
898
|
spLight.name = node.name || "";
|
|
899
899
|
if (spotLight.color) {
|
|
900
|
-
spLight.diffuse =
|
|
900
|
+
spLight.diffuse = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3.FromArray(spotLight.color);
|
|
901
901
|
}
|
|
902
902
|
if (spotLight.fallOfAngle) {
|
|
903
903
|
spLight.angle = spotLight.fallOfAngle;
|
|
@@ -915,16 +915,16 @@ var importNode = function (gltfRuntime, node, id) {
|
|
|
915
915
|
if (camera) {
|
|
916
916
|
gltfRuntime.scene._blockEntityCollection = !!gltfRuntime.assetContainer;
|
|
917
917
|
if (camera.type === "orthographic") {
|
|
918
|
-
var orthoCamera = new
|
|
918
|
+
var orthoCamera = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.FreeCamera(node.camera, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.Zero(), gltfRuntime.scene, false);
|
|
919
919
|
orthoCamera.name = node.name || "";
|
|
920
|
-
orthoCamera.mode =
|
|
920
|
+
orthoCamera.mode = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Camera.ORTHOGRAPHIC_CAMERA;
|
|
921
921
|
orthoCamera.attachControl();
|
|
922
922
|
lastNode = orthoCamera;
|
|
923
923
|
orthoCamera._parentContainer = gltfRuntime.assetContainer;
|
|
924
924
|
}
|
|
925
925
|
else if (camera.type === "perspective") {
|
|
926
926
|
var perspectiveCamera = camera[camera.type];
|
|
927
|
-
var persCamera = new
|
|
927
|
+
var persCamera = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.FreeCamera(node.camera, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.Zero(), gltfRuntime.scene, false);
|
|
928
928
|
persCamera.name = node.name || "";
|
|
929
929
|
persCamera.attachControl();
|
|
930
930
|
if (!perspectiveCamera.aspectRatio) {
|
|
@@ -947,7 +947,7 @@ var importNode = function (gltfRuntime, node, id) {
|
|
|
947
947
|
}
|
|
948
948
|
else if (lastNode === null) {
|
|
949
949
|
gltfRuntime.scene._blockEntityCollection = !!gltfRuntime.assetContainer;
|
|
950
|
-
var dummy = new
|
|
950
|
+
var dummy = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Mesh(node.name || "", gltfRuntime.scene);
|
|
951
951
|
dummy._parentContainer = gltfRuntime.assetContainer;
|
|
952
952
|
gltfRuntime.scene._blockEntityCollection = false;
|
|
953
953
|
node.babylonNode = dummy;
|
|
@@ -955,14 +955,14 @@ var importNode = function (gltfRuntime, node, id) {
|
|
|
955
955
|
}
|
|
956
956
|
}
|
|
957
957
|
if (lastNode !== null) {
|
|
958
|
-
if (node.matrix && lastNode instanceof
|
|
958
|
+
if (node.matrix && lastNode instanceof babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Mesh) {
|
|
959
959
|
configureNodeFromMatrix(lastNode, node);
|
|
960
960
|
}
|
|
961
961
|
else {
|
|
962
962
|
var translation = node.translation || [0, 0, 0];
|
|
963
963
|
var rotation = node.rotation || [0, 0, 0, 1];
|
|
964
964
|
var scale = node.scale || [1, 1, 1];
|
|
965
|
-
configureNode(lastNode,
|
|
965
|
+
configureNode(lastNode, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.FromArray(translation), babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Quaternion.FromArray(rotation), babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.FromArray(scale));
|
|
966
966
|
}
|
|
967
967
|
lastNode.updateCache(true);
|
|
968
968
|
node.babylonNode = lastNode;
|
|
@@ -1294,11 +1294,11 @@ var GLTFLoaderBase = /** @class */ (function () {
|
|
|
1294
1294
|
};
|
|
1295
1295
|
GLTFLoaderBase.LoadBufferAsync = function (gltfRuntime, id, onSuccess, onError, onProgress) {
|
|
1296
1296
|
var buffer = gltfRuntime.buffers[id];
|
|
1297
|
-
if (
|
|
1298
|
-
setTimeout(function () { return onSuccess(new Uint8Array(
|
|
1297
|
+
if (babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.IsBase64(buffer.uri)) {
|
|
1298
|
+
setTimeout(function () { return onSuccess(new Uint8Array(babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.DecodeBase64(buffer.uri))); });
|
|
1299
1299
|
}
|
|
1300
1300
|
else {
|
|
1301
|
-
|
|
1301
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.LoadFile(gltfRuntime.rootUrl + buffer.uri, function (data) { return onSuccess(new Uint8Array(data)); }, onProgress, undefined, true, function (request) {
|
|
1302
1302
|
if (request) {
|
|
1303
1303
|
onError(request.status + " " + request.statusText);
|
|
1304
1304
|
}
|
|
@@ -1316,11 +1316,11 @@ var GLTFLoaderBase = /** @class */ (function () {
|
|
|
1316
1316
|
return;
|
|
1317
1317
|
}
|
|
1318
1318
|
var source = gltfRuntime.images[texture.source];
|
|
1319
|
-
if (
|
|
1320
|
-
setTimeout(function () { return onSuccess(new Uint8Array(
|
|
1319
|
+
if (babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.IsBase64(source.uri)) {
|
|
1320
|
+
setTimeout(function () { return onSuccess(new Uint8Array(babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.DecodeBase64(source.uri))); });
|
|
1321
1321
|
}
|
|
1322
1322
|
else {
|
|
1323
|
-
|
|
1323
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.LoadFile(gltfRuntime.rootUrl + source.uri, function (data) { return onSuccess(new Uint8Array(data)); }, undefined, undefined, true, function (request) {
|
|
1324
1324
|
if (request) {
|
|
1325
1325
|
onError(request.status + " " + request.statusText);
|
|
1326
1326
|
}
|
|
@@ -1338,11 +1338,11 @@ var GLTFLoaderBase = /** @class */ (function () {
|
|
|
1338
1338
|
sampler.minFilter === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.ETextureFilterType.NEAREST_MIPMAP_LINEAR ||
|
|
1339
1339
|
sampler.minFilter === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.ETextureFilterType.LINEAR_MIPMAP_NEAREST ||
|
|
1340
1340
|
sampler.minFilter === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.ETextureFilterType.LINEAR_MIPMAP_LINEAR;
|
|
1341
|
-
var samplingMode =
|
|
1341
|
+
var samplingMode = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.BILINEAR_SAMPLINGMODE;
|
|
1342
1342
|
var blob = buffer == null ? new Blob() : new Blob([buffer]);
|
|
1343
1343
|
var blobURL = URL.createObjectURL(blob);
|
|
1344
1344
|
var revokeBlobURL = function () { return URL.revokeObjectURL(blobURL); };
|
|
1345
|
-
var newTexture = new
|
|
1345
|
+
var newTexture = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture(blobURL, gltfRuntime.scene, !createMipMaps, true, samplingMode, revokeBlobURL, revokeBlobURL);
|
|
1346
1346
|
if (sampler.wrapS !== undefined) {
|
|
1347
1347
|
newTexture.wrapU = _glTFLoaderUtils__WEBPACK_IMPORTED_MODULE_2__.GLTFUtils.GetWrapMode(sampler.wrapS);
|
|
1348
1348
|
}
|
|
@@ -1355,14 +1355,14 @@ var GLTFLoaderBase = /** @class */ (function () {
|
|
|
1355
1355
|
};
|
|
1356
1356
|
GLTFLoaderBase.LoadShaderStringAsync = function (gltfRuntime, id, onSuccess, onError) {
|
|
1357
1357
|
var shader = gltfRuntime.shaders[id];
|
|
1358
|
-
if (
|
|
1358
|
+
if (babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.IsBase64(shader.uri)) {
|
|
1359
1359
|
var shaderString = atob(shader.uri.split(",")[1]);
|
|
1360
1360
|
if (onSuccess) {
|
|
1361
1361
|
onSuccess(shaderString);
|
|
1362
1362
|
}
|
|
1363
1363
|
}
|
|
1364
1364
|
else {
|
|
1365
|
-
|
|
1365
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.LoadFile(gltfRuntime.rootUrl + shader.uri, onSuccess, undefined, undefined, false, function (request) {
|
|
1366
1366
|
if (request && onError) {
|
|
1367
1367
|
onError(request.status + " " + request.statusText);
|
|
1368
1368
|
}
|
|
@@ -1380,18 +1380,18 @@ var GLTFLoaderBase = /** @class */ (function () {
|
|
|
1380
1380
|
var technique = gltfRuntime.techniques[material.technique];
|
|
1381
1381
|
if (!technique) {
|
|
1382
1382
|
gltfRuntime.scene._blockEntityCollection = !!gltfRuntime.assetContainer;
|
|
1383
|
-
var defaultMaterial = new
|
|
1383
|
+
var defaultMaterial = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.StandardMaterial(id, gltfRuntime.scene);
|
|
1384
1384
|
defaultMaterial._parentContainer = gltfRuntime.assetContainer;
|
|
1385
1385
|
gltfRuntime.scene._blockEntityCollection = false;
|
|
1386
|
-
defaultMaterial.diffuseColor = new
|
|
1387
|
-
defaultMaterial.sideOrientation =
|
|
1386
|
+
defaultMaterial.diffuseColor = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3(0.5, 0.5, 0.5);
|
|
1387
|
+
defaultMaterial.sideOrientation = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Material.CounterClockWiseSideOrientation;
|
|
1388
1388
|
onSuccess(defaultMaterial);
|
|
1389
1389
|
return;
|
|
1390
1390
|
}
|
|
1391
1391
|
var program = gltfRuntime.programs[technique.program];
|
|
1392
1392
|
var states = technique.states;
|
|
1393
|
-
var vertexShader =
|
|
1394
|
-
var pixelShader =
|
|
1393
|
+
var vertexShader = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Effect.ShadersStore[program.vertexShader + "VertexShader"];
|
|
1394
|
+
var pixelShader = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Effect.ShadersStore[program.fragmentShader + "PixelShader"];
|
|
1395
1395
|
var newVertexShader = "";
|
|
1396
1396
|
var newPixelShader = "";
|
|
1397
1397
|
var vertexTokenizer = new Tokenizer(vertexShader);
|
|
@@ -1474,12 +1474,12 @@ var GLTFLoaderBase = /** @class */ (function () {
|
|
|
1474
1474
|
samplers: samplers,
|
|
1475
1475
|
needAlphaBlending: states && states.enable && states.enable.indexOf(3042) !== -1,
|
|
1476
1476
|
};
|
|
1477
|
-
|
|
1478
|
-
|
|
1479
|
-
var shaderMaterial = new
|
|
1477
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Effect.ShadersStore[program.vertexShader + id + "VertexShader"] = newVertexShader;
|
|
1478
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Effect.ShadersStore[program.fragmentShader + id + "PixelShader"] = newPixelShader;
|
|
1479
|
+
var shaderMaterial = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.ShaderMaterial(id, gltfRuntime.scene, shaderPath, options);
|
|
1480
1480
|
shaderMaterial.onError = onShaderCompileError(program, shaderMaterial, onError);
|
|
1481
1481
|
shaderMaterial.onCompiled = onShaderCompileSuccess(gltfRuntime, shaderMaterial, technique, material, unTreatedUniforms, onSuccess);
|
|
1482
|
-
shaderMaterial.sideOrientation =
|
|
1482
|
+
shaderMaterial.sideOrientation = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Material.CounterClockWiseSideOrientation;
|
|
1483
1483
|
if (states && states.functions) {
|
|
1484
1484
|
var functions = states.functions;
|
|
1485
1485
|
if (functions.cullFace && functions.cullFace[0] !== _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.ECullingType.BACK) {
|
|
@@ -1491,37 +1491,37 @@ var GLTFLoaderBase = /** @class */ (function () {
|
|
|
1491
1491
|
blendFunc[1] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE_MINUS_SRC_ALPHA &&
|
|
1492
1492
|
blendFunc[2] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE &&
|
|
1493
1493
|
blendFunc[3] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE) {
|
|
1494
|
-
shaderMaterial.alphaMode =
|
|
1494
|
+
shaderMaterial.alphaMode = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Constants.ALPHA_COMBINE;
|
|
1495
1495
|
}
|
|
1496
1496
|
else if (blendFunc[0] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE &&
|
|
1497
1497
|
blendFunc[1] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE &&
|
|
1498
1498
|
blendFunc[2] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ZERO &&
|
|
1499
1499
|
blendFunc[3] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE) {
|
|
1500
|
-
shaderMaterial.alphaMode =
|
|
1500
|
+
shaderMaterial.alphaMode = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Constants.ALPHA_ONEONE;
|
|
1501
1501
|
}
|
|
1502
1502
|
else if (blendFunc[0] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.SRC_ALPHA &&
|
|
1503
1503
|
blendFunc[1] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE &&
|
|
1504
1504
|
blendFunc[2] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ZERO &&
|
|
1505
1505
|
blendFunc[3] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE) {
|
|
1506
|
-
shaderMaterial.alphaMode =
|
|
1506
|
+
shaderMaterial.alphaMode = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Constants.ALPHA_ADD;
|
|
1507
1507
|
}
|
|
1508
1508
|
else if (blendFunc[0] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ZERO &&
|
|
1509
1509
|
blendFunc[1] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE_MINUS_SRC_COLOR &&
|
|
1510
1510
|
blendFunc[2] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE &&
|
|
1511
1511
|
blendFunc[3] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE) {
|
|
1512
|
-
shaderMaterial.alphaMode =
|
|
1512
|
+
shaderMaterial.alphaMode = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Constants.ALPHA_SUBTRACT;
|
|
1513
1513
|
}
|
|
1514
1514
|
else if (blendFunc[0] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.DST_COLOR &&
|
|
1515
1515
|
blendFunc[1] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ZERO &&
|
|
1516
1516
|
blendFunc[2] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE &&
|
|
1517
1517
|
blendFunc[3] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE) {
|
|
1518
|
-
shaderMaterial.alphaMode =
|
|
1518
|
+
shaderMaterial.alphaMode = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Constants.ALPHA_MULTIPLY;
|
|
1519
1519
|
}
|
|
1520
1520
|
else if (blendFunc[0] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.SRC_ALPHA &&
|
|
1521
1521
|
blendFunc[1] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE_MINUS_SRC_COLOR &&
|
|
1522
1522
|
blendFunc[2] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE &&
|
|
1523
1523
|
blendFunc[3] === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EBlendingFunction.ONE) {
|
|
1524
|
-
shaderMaterial.alphaMode =
|
|
1524
|
+
shaderMaterial.alphaMode = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Constants.ALPHA_MAXIMIZED;
|
|
1525
1525
|
}
|
|
1526
1526
|
}
|
|
1527
1527
|
}
|
|
@@ -1539,7 +1539,7 @@ var GLTFLoader = /** @class */ (function () {
|
|
|
1539
1539
|
}
|
|
1540
1540
|
GLTFLoader.RegisterExtension = function (extension) {
|
|
1541
1541
|
if (GLTFLoader.Extensions[extension.name]) {
|
|
1542
|
-
|
|
1542
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Error('Tool with the same name "' + extension.name + '" already exists');
|
|
1543
1543
|
return;
|
|
1544
1544
|
}
|
|
1545
1545
|
GLTFLoader.Extensions[extension.name] = extension;
|
|
@@ -1564,7 +1564,7 @@ var GLTFLoader = /** @class */ (function () {
|
|
|
1564
1564
|
}
|
|
1565
1565
|
else {
|
|
1566
1566
|
gltfRuntime.importMeshesNames = [];
|
|
1567
|
-
|
|
1567
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Warn("Argument meshesNames must be of type string or string[]");
|
|
1568
1568
|
}
|
|
1569
1569
|
// Create nodes
|
|
1570
1570
|
_this._createNodes(gltfRuntime);
|
|
@@ -1573,13 +1573,13 @@ var GLTFLoader = /** @class */ (function () {
|
|
|
1573
1573
|
// Fill arrays of meshes and skeletons
|
|
1574
1574
|
for (var nde in gltfRuntime.nodes) {
|
|
1575
1575
|
var node = gltfRuntime.nodes[nde];
|
|
1576
|
-
if (node.babylonNode instanceof
|
|
1576
|
+
if (node.babylonNode instanceof babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.AbstractMesh) {
|
|
1577
1577
|
meshes.push(node.babylonNode);
|
|
1578
1578
|
}
|
|
1579
1579
|
}
|
|
1580
1580
|
for (var skl in gltfRuntime.skins) {
|
|
1581
1581
|
var skin = gltfRuntime.skins[skl];
|
|
1582
|
-
if (skin.babylonSkeleton instanceof
|
|
1582
|
+
if (skin.babylonSkeleton instanceof babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Skeleton) {
|
|
1583
1583
|
skeletons.push(skin.babylonSkeleton);
|
|
1584
1584
|
}
|
|
1585
1585
|
}
|
|
@@ -1678,13 +1678,13 @@ var GLTFLoader = /** @class */ (function () {
|
|
|
1678
1678
|
}
|
|
1679
1679
|
gltfRuntime.loadedShaderCount++;
|
|
1680
1680
|
if (shaderString) {
|
|
1681
|
-
|
|
1681
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Effect.ShadersStore[sha + (shader.type === _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EShaderType.VERTEX ? "VertexShader" : "PixelShader")] = shaderString;
|
|
1682
1682
|
}
|
|
1683
1683
|
if (gltfRuntime.loadedShaderCount === gltfRuntime.shaderscount) {
|
|
1684
1684
|
onload();
|
|
1685
1685
|
}
|
|
1686
1686
|
}, function () {
|
|
1687
|
-
|
|
1687
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Error("Error when loading shader program named " + sha + " located at " + shader.uri);
|
|
1688
1688
|
});
|
|
1689
1689
|
};
|
|
1690
1690
|
for (var sha in gltfRuntime.shaders) {
|
|
@@ -1694,7 +1694,7 @@ var GLTFLoader = /** @class */ (function () {
|
|
|
1694
1694
|
processShader.bind(this, sha, shader)();
|
|
1695
1695
|
}
|
|
1696
1696
|
else {
|
|
1697
|
-
|
|
1697
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Error("No shader named: " + sha);
|
|
1698
1698
|
}
|
|
1699
1699
|
}
|
|
1700
1700
|
if (!hasShaders) {
|
|
@@ -1708,7 +1708,7 @@ var GLTFLoader = /** @class */ (function () {
|
|
|
1708
1708
|
gltfRuntime.loadedBufferCount++;
|
|
1709
1709
|
if (bufferView) {
|
|
1710
1710
|
if (bufferView.byteLength != gltfRuntime.buffers[buf].byteLength) {
|
|
1711
|
-
|
|
1711
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Error("Buffer named " + buf + " is length " + bufferView.byteLength + ". Expected: " + buffer.byteLength); // Improve error message
|
|
1712
1712
|
}
|
|
1713
1713
|
gltfRuntime.loadedBufferViews[buf] = bufferView;
|
|
1714
1714
|
}
|
|
@@ -1716,7 +1716,7 @@ var GLTFLoader = /** @class */ (function () {
|
|
|
1716
1716
|
onLoad();
|
|
1717
1717
|
}
|
|
1718
1718
|
}, function () {
|
|
1719
|
-
|
|
1719
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Error("Error when loading buffer named " + buf + " located at " + buffer.uri);
|
|
1720
1720
|
});
|
|
1721
1721
|
};
|
|
1722
1722
|
for (var buf in gltfRuntime.buffers) {
|
|
@@ -1726,7 +1726,7 @@ var GLTFLoader = /** @class */ (function () {
|
|
|
1726
1726
|
processBuffer.bind(this, buf, buffer)();
|
|
1727
1727
|
}
|
|
1728
1728
|
else {
|
|
1729
|
-
|
|
1729
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Error("No buffer named: " + buf);
|
|
1730
1730
|
}
|
|
1731
1731
|
}
|
|
1732
1732
|
if (!hasBuffers) {
|
|
@@ -1928,10 +1928,10 @@ _glTFFileLoader__WEBPACK_IMPORTED_MODULE_3__.GLTFFileLoader._CreateGLTF1Loader =
|
|
|
1928
1928
|
|
|
1929
1929
|
/***/ }),
|
|
1930
1930
|
|
|
1931
|
-
/***/ "../../../
|
|
1932
|
-
|
|
1933
|
-
!*** ../../../
|
|
1934
|
-
|
|
1931
|
+
/***/ "../../../dev/loaders/src/glTF/1.0/glTFLoaderInterfaces.ts":
|
|
1932
|
+
/*!*****************************************************************!*\
|
|
1933
|
+
!*** ../../../dev/loaders/src/glTF/1.0/glTFLoaderInterfaces.ts ***!
|
|
1934
|
+
\*****************************************************************/
|
|
1935
1935
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
1936
1936
|
|
|
1937
1937
|
__webpack_require__.r(__webpack_exports__);
|
|
@@ -2044,19 +2044,19 @@ var EBlendingFunction;
|
|
|
2044
2044
|
|
|
2045
2045
|
/***/ }),
|
|
2046
2046
|
|
|
2047
|
-
/***/ "../../../
|
|
2048
|
-
|
|
2049
|
-
!*** ../../../
|
|
2050
|
-
|
|
2047
|
+
/***/ "../../../dev/loaders/src/glTF/1.0/glTFLoaderUtils.ts":
|
|
2048
|
+
/*!************************************************************!*\
|
|
2049
|
+
!*** ../../../dev/loaders/src/glTF/1.0/glTFLoaderUtils.ts ***!
|
|
2050
|
+
\************************************************************/
|
|
2051
2051
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
2052
2052
|
|
|
2053
2053
|
__webpack_require__.r(__webpack_exports__);
|
|
2054
2054
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
2055
2055
|
/* harmony export */ GLTFUtils: () => (/* binding */ GLTFUtils)
|
|
2056
2056
|
/* harmony export */ });
|
|
2057
|
-
/* harmony import */ var _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./glTFLoaderInterfaces */ "../../../
|
|
2058
|
-
/* harmony import */ var
|
|
2059
|
-
/* harmony import */ var
|
|
2057
|
+
/* harmony import */ var _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./glTFLoaderInterfaces */ "../../../dev/loaders/src/glTF/1.0/glTFLoaderInterfaces.ts");
|
|
2058
|
+
/* harmony import */ var babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Materials/Textures/texture */ "babylonjs/Misc/observable");
|
|
2059
|
+
/* harmony import */ var babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__);
|
|
2060
2060
|
|
|
2061
2061
|
|
|
2062
2062
|
|
|
@@ -2091,7 +2091,7 @@ var GLTFUtils = /** @class */ (function () {
|
|
|
2091
2091
|
mat = scene.getViewMatrix();
|
|
2092
2092
|
}
|
|
2093
2093
|
else if (parameter.semantic === "MODELVIEWINVERSETRANSPOSE") {
|
|
2094
|
-
mat =
|
|
2094
|
+
mat = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Matrix.Transpose(source.getWorldMatrix().multiply(scene.getViewMatrix()).invert());
|
|
2095
2095
|
}
|
|
2096
2096
|
else if (parameter.semantic === "MODELVIEW") {
|
|
2097
2097
|
mat = source.getWorldMatrix().multiply(scene.getViewMatrix());
|
|
@@ -2115,15 +2115,15 @@ var GLTFUtils = /** @class */ (function () {
|
|
|
2115
2115
|
mat = source.getWorldMatrix().multiply(scene.getTransformMatrix()).invert();
|
|
2116
2116
|
}
|
|
2117
2117
|
else if (parameter.semantic === "MODELINVERSETRANSPOSE") {
|
|
2118
|
-
mat =
|
|
2118
|
+
mat = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Matrix.Transpose(source.getWorldMatrix().invert());
|
|
2119
2119
|
}
|
|
2120
2120
|
if (mat) {
|
|
2121
2121
|
switch (parameter.type) {
|
|
2122
2122
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EParameterType.FLOAT_MAT2:
|
|
2123
|
-
shaderMaterial.setMatrix2x2(uniformName,
|
|
2123
|
+
shaderMaterial.setMatrix2x2(uniformName, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Matrix.GetAsMatrix2x2(mat));
|
|
2124
2124
|
break;
|
|
2125
2125
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EParameterType.FLOAT_MAT3:
|
|
2126
|
-
shaderMaterial.setMatrix3x3(uniformName,
|
|
2126
|
+
shaderMaterial.setMatrix3x3(uniformName, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Matrix.GetAsMatrix3x3(mat));
|
|
2127
2127
|
break;
|
|
2128
2128
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EParameterType.FLOAT_MAT4:
|
|
2129
2129
|
shaderMaterial.setMatrix(uniformName, mat);
|
|
@@ -2146,13 +2146,13 @@ var GLTFUtils = /** @class */ (function () {
|
|
|
2146
2146
|
shaderMaterial.setFloat(uniform, value);
|
|
2147
2147
|
return true;
|
|
2148
2148
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EParameterType.FLOAT_VEC2:
|
|
2149
|
-
shaderMaterial.setVector2(uniform,
|
|
2149
|
+
shaderMaterial.setVector2(uniform, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector2.FromArray(value));
|
|
2150
2150
|
return true;
|
|
2151
2151
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EParameterType.FLOAT_VEC3:
|
|
2152
|
-
shaderMaterial.setVector3(uniform,
|
|
2152
|
+
shaderMaterial.setVector3(uniform, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3.FromArray(value));
|
|
2153
2153
|
return true;
|
|
2154
2154
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.EParameterType.FLOAT_VEC4:
|
|
2155
|
-
shaderMaterial.setVector4(uniform,
|
|
2155
|
+
shaderMaterial.setVector4(uniform, babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector4.FromArray(value));
|
|
2156
2156
|
return true;
|
|
2157
2157
|
default:
|
|
2158
2158
|
return false;
|
|
@@ -2165,13 +2165,13 @@ var GLTFUtils = /** @class */ (function () {
|
|
|
2165
2165
|
GLTFUtils.GetWrapMode = function (mode) {
|
|
2166
2166
|
switch (mode) {
|
|
2167
2167
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.ETextureWrapMode.CLAMP_TO_EDGE:
|
|
2168
|
-
return
|
|
2168
|
+
return babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.CLAMP_ADDRESSMODE;
|
|
2169
2169
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.ETextureWrapMode.MIRRORED_REPEAT:
|
|
2170
|
-
return
|
|
2170
|
+
return babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.MIRROR_ADDRESSMODE;
|
|
2171
2171
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.ETextureWrapMode.REPEAT:
|
|
2172
|
-
return
|
|
2172
|
+
return babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.WRAP_ADDRESSMODE;
|
|
2173
2173
|
default:
|
|
2174
|
-
return
|
|
2174
|
+
return babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.WRAP_ADDRESSMODE;
|
|
2175
2175
|
}
|
|
2176
2176
|
};
|
|
2177
2177
|
/**
|
|
@@ -2208,12 +2208,12 @@ var GLTFUtils = /** @class */ (function () {
|
|
|
2208
2208
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.ETextureFilterType.LINEAR:
|
|
2209
2209
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.ETextureFilterType.LINEAR_MIPMAP_NEAREST:
|
|
2210
2210
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.ETextureFilterType.LINEAR_MIPMAP_LINEAR:
|
|
2211
|
-
return
|
|
2211
|
+
return babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.TRILINEAR_SAMPLINGMODE;
|
|
2212
2212
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.ETextureFilterType.NEAREST:
|
|
2213
2213
|
case _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_0__.ETextureFilterType.NEAREST_MIPMAP_NEAREST:
|
|
2214
|
-
return
|
|
2214
|
+
return babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.NEAREST_SAMPLINGMODE;
|
|
2215
2215
|
default:
|
|
2216
|
-
return
|
|
2216
|
+
return babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.BILINEAR_SAMPLINGMODE;
|
|
2217
2217
|
}
|
|
2218
2218
|
};
|
|
2219
2219
|
GLTFUtils.GetBufferFromBufferView = function (gltfRuntime, bufferView, byteOffset, byteLength, componentType) {
|
|
@@ -2266,7 +2266,7 @@ var GLTFUtils = /** @class */ (function () {
|
|
|
2266
2266
|
*/
|
|
2267
2267
|
GLTFUtils.GetDefaultMaterial = function (scene) {
|
|
2268
2268
|
if (!GLTFUtils._DefaultMaterial) {
|
|
2269
|
-
|
|
2269
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Effect.ShadersStore["GLTFDefaultMaterialVertexShader"] = [
|
|
2270
2270
|
"precision highp float;",
|
|
2271
2271
|
"",
|
|
2272
2272
|
"uniform mat4 worldView;",
|
|
@@ -2279,7 +2279,7 @@ var GLTFUtils = /** @class */ (function () {
|
|
|
2279
2279
|
" gl_Position = projection * worldView * vec4(position, 1.0);",
|
|
2280
2280
|
"}",
|
|
2281
2281
|
].join("\n");
|
|
2282
|
-
|
|
2282
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Effect.ShadersStore["GLTFDefaultMaterialPixelShader"] = [
|
|
2283
2283
|
"precision highp float;",
|
|
2284
2284
|
"",
|
|
2285
2285
|
"uniform vec4 u_emission;",
|
|
@@ -2299,8 +2299,8 @@ var GLTFUtils = /** @class */ (function () {
|
|
|
2299
2299
|
samplers: new Array(),
|
|
2300
2300
|
needAlphaBlending: false,
|
|
2301
2301
|
};
|
|
2302
|
-
GLTFUtils._DefaultMaterial = new
|
|
2303
|
-
GLTFUtils._DefaultMaterial.setColor4("u_emission", new
|
|
2302
|
+
GLTFUtils._DefaultMaterial = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.ShaderMaterial("GLTFDefaultMaterial", scene, shaderPath, options);
|
|
2303
|
+
GLTFUtils._DefaultMaterial.setColor4("u_emission", new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color4(0.5, 0.5, 0.5, 1.0));
|
|
2304
2304
|
}
|
|
2305
2305
|
return GLTFUtils._DefaultMaterial;
|
|
2306
2306
|
};
|
|
@@ -2312,10 +2312,10 @@ var GLTFUtils = /** @class */ (function () {
|
|
|
2312
2312
|
|
|
2313
2313
|
/***/ }),
|
|
2314
2314
|
|
|
2315
|
-
/***/ "../../../
|
|
2316
|
-
|
|
2317
|
-
!*** ../../../
|
|
2318
|
-
|
|
2315
|
+
/***/ "../../../dev/loaders/src/glTF/1.0/glTFMaterialsCommonExtension.ts":
|
|
2316
|
+
/*!*************************************************************************!*\
|
|
2317
|
+
!*** ../../../dev/loaders/src/glTF/1.0/glTFMaterialsCommonExtension.ts ***!
|
|
2318
|
+
\*************************************************************************/
|
|
2319
2319
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
2320
2320
|
|
|
2321
2321
|
__webpack_require__.r(__webpack_exports__);
|
|
@@ -2323,9 +2323,9 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
2323
2323
|
/* harmony export */ GLTFMaterialsCommonExtension: () => (/* binding */ GLTFMaterialsCommonExtension)
|
|
2324
2324
|
/* harmony export */ });
|
|
2325
2325
|
/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! tslib */ "../../../../node_modules/tslib/tslib.es6.mjs");
|
|
2326
|
-
/* harmony import */ var _glTFLoader__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./glTFLoader */ "../../../
|
|
2327
|
-
/* harmony import */ var
|
|
2328
|
-
/* harmony import */ var
|
|
2326
|
+
/* harmony import */ var _glTFLoader__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./glTFLoader */ "../../../dev/loaders/src/glTF/1.0/glTFLoader.ts");
|
|
2327
|
+
/* harmony import */ var babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Lights/spotLight */ "babylonjs/Misc/observable");
|
|
2328
|
+
/* harmony import */ var babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__);
|
|
2329
2329
|
|
|
2330
2330
|
|
|
2331
2331
|
|
|
@@ -2361,39 +2361,39 @@ var GLTFMaterialsCommonExtension = /** @class */ (function (_super) {
|
|
|
2361
2361
|
var light = lights[thing];
|
|
2362
2362
|
switch (light.type) {
|
|
2363
2363
|
case "ambient": {
|
|
2364
|
-
var ambientLight = new
|
|
2364
|
+
var ambientLight = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.HemisphericLight(light.name, new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3(0, 1, 0), gltfRuntime.scene);
|
|
2365
2365
|
var ambient = light.ambient;
|
|
2366
2366
|
if (ambient) {
|
|
2367
|
-
ambientLight.diffuse =
|
|
2367
|
+
ambientLight.diffuse = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3.FromArray(ambient.color || [1, 1, 1]);
|
|
2368
2368
|
}
|
|
2369
2369
|
break;
|
|
2370
2370
|
}
|
|
2371
2371
|
case "point": {
|
|
2372
|
-
var pointLight = new
|
|
2372
|
+
var pointLight = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.PointLight(light.name, new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3(10, 10, 10), gltfRuntime.scene);
|
|
2373
2373
|
var point = light.point;
|
|
2374
2374
|
if (point) {
|
|
2375
|
-
pointLight.diffuse =
|
|
2375
|
+
pointLight.diffuse = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3.FromArray(point.color || [1, 1, 1]);
|
|
2376
2376
|
}
|
|
2377
2377
|
break;
|
|
2378
2378
|
}
|
|
2379
2379
|
case "directional": {
|
|
2380
|
-
var dirLight = new
|
|
2380
|
+
var dirLight = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.DirectionalLight(light.name, new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3(0, -1, 0), gltfRuntime.scene);
|
|
2381
2381
|
var directional = light.directional;
|
|
2382
2382
|
if (directional) {
|
|
2383
|
-
dirLight.diffuse =
|
|
2383
|
+
dirLight.diffuse = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3.FromArray(directional.color || [1, 1, 1]);
|
|
2384
2384
|
}
|
|
2385
2385
|
break;
|
|
2386
2386
|
}
|
|
2387
2387
|
case "spot": {
|
|
2388
2388
|
var spot = light.spot;
|
|
2389
2389
|
if (spot) {
|
|
2390
|
-
var spotLight = new
|
|
2391
|
-
spotLight.diffuse =
|
|
2390
|
+
var spotLight = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.SpotLight(light.name, new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3(0, 10, 0), new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Vector3(0, -1, 0), spot.fallOffAngle || Math.PI, spot.fallOffExponent || 0.0, gltfRuntime.scene);
|
|
2391
|
+
spotLight.diffuse = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3.FromArray(spot.color || [1, 1, 1]);
|
|
2392
2392
|
}
|
|
2393
2393
|
break;
|
|
2394
2394
|
}
|
|
2395
2395
|
default:
|
|
2396
|
-
|
|
2396
|
+
babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Warn('GLTF Material Common extension: light type "' + light.type + "” not supported");
|
|
2397
2397
|
break;
|
|
2398
2398
|
}
|
|
2399
2399
|
}
|
|
@@ -2409,8 +2409,8 @@ var GLTFMaterialsCommonExtension = /** @class */ (function (_super) {
|
|
|
2409
2409
|
if (!extension) {
|
|
2410
2410
|
return false;
|
|
2411
2411
|
}
|
|
2412
|
-
var standardMaterial = new
|
|
2413
|
-
standardMaterial.sideOrientation =
|
|
2412
|
+
var standardMaterial = new babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.StandardMaterial(id, gltfRuntime.scene);
|
|
2413
|
+
standardMaterial.sideOrientation = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Material.CounterClockWiseSideOrientation;
|
|
2414
2414
|
if (extension.technique === "CONSTANT") {
|
|
2415
2415
|
standardMaterial.disableLighting = true;
|
|
2416
2416
|
}
|
|
@@ -2422,28 +2422,28 @@ var GLTFMaterialsCommonExtension = /** @class */ (function (_super) {
|
|
|
2422
2422
|
this._loadTexture(gltfRuntime, extension.values.ambient, standardMaterial, "ambientTexture", onError);
|
|
2423
2423
|
}
|
|
2424
2424
|
else {
|
|
2425
|
-
standardMaterial.ambientColor =
|
|
2425
|
+
standardMaterial.ambientColor = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3.FromArray(extension.values.ambient || [0, 0, 0]);
|
|
2426
2426
|
}
|
|
2427
2427
|
// Diffuse
|
|
2428
2428
|
if (typeof extension.values.diffuse === "string") {
|
|
2429
2429
|
this._loadTexture(gltfRuntime, extension.values.diffuse, standardMaterial, "diffuseTexture", onError);
|
|
2430
2430
|
}
|
|
2431
2431
|
else {
|
|
2432
|
-
standardMaterial.diffuseColor =
|
|
2432
|
+
standardMaterial.diffuseColor = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3.FromArray(extension.values.diffuse || [0, 0, 0]);
|
|
2433
2433
|
}
|
|
2434
2434
|
// Emission
|
|
2435
2435
|
if (typeof extension.values.emission === "string") {
|
|
2436
2436
|
this._loadTexture(gltfRuntime, extension.values.emission, standardMaterial, "emissiveTexture", onError);
|
|
2437
2437
|
}
|
|
2438
2438
|
else {
|
|
2439
|
-
standardMaterial.emissiveColor =
|
|
2439
|
+
standardMaterial.emissiveColor = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3.FromArray(extension.values.emission || [0, 0, 0]);
|
|
2440
2440
|
}
|
|
2441
2441
|
// Specular
|
|
2442
2442
|
if (typeof extension.values.specular === "string") {
|
|
2443
2443
|
this._loadTexture(gltfRuntime, extension.values.specular, standardMaterial, "specularTexture", onError);
|
|
2444
2444
|
}
|
|
2445
2445
|
else {
|
|
2446
|
-
standardMaterial.specularColor =
|
|
2446
|
+
standardMaterial.specularColor = babylonjs_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3.FromArray(extension.values.specular || [0, 0, 0]);
|
|
2447
2447
|
}
|
|
2448
2448
|
return true;
|
|
2449
2449
|
};
|
|
@@ -2462,10 +2462,10 @@ _glTFLoader__WEBPACK_IMPORTED_MODULE_0__.GLTFLoader.RegisterExtension(new GLTFMa
|
|
|
2462
2462
|
|
|
2463
2463
|
/***/ }),
|
|
2464
2464
|
|
|
2465
|
-
/***/ "../../../
|
|
2466
|
-
|
|
2467
|
-
!*** ../../../
|
|
2468
|
-
|
|
2465
|
+
/***/ "../../../dev/loaders/src/glTF/1.0/index.ts":
|
|
2466
|
+
/*!**************************************************!*\
|
|
2467
|
+
!*** ../../../dev/loaders/src/glTF/1.0/index.ts ***!
|
|
2468
|
+
\**************************************************/
|
|
2469
2469
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
2470
2470
|
|
|
2471
2471
|
__webpack_require__.r(__webpack_exports__);
|
|
@@ -2485,11 +2485,11 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
2485
2485
|
/* harmony export */ GLTFMaterialsCommonExtension: () => (/* reexport safe */ _glTFMaterialsCommonExtension__WEBPACK_IMPORTED_MODULE_4__.GLTFMaterialsCommonExtension),
|
|
2486
2486
|
/* harmony export */ GLTFUtils: () => (/* reexport safe */ _glTFLoaderUtils__WEBPACK_IMPORTED_MODULE_3__.GLTFUtils)
|
|
2487
2487
|
/* harmony export */ });
|
|
2488
|
-
/* harmony import */ var _glTFBinaryExtension__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./glTFBinaryExtension */ "../../../
|
|
2489
|
-
/* harmony import */ var _glTFLoader__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./glTFLoader */ "../../../
|
|
2490
|
-
/* harmony import */ var _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./glTFLoaderInterfaces */ "../../../
|
|
2491
|
-
/* harmony import */ var _glTFLoaderUtils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./glTFLoaderUtils */ "../../../
|
|
2492
|
-
/* harmony import */ var _glTFMaterialsCommonExtension__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./glTFMaterialsCommonExtension */ "../../../
|
|
2488
|
+
/* harmony import */ var _glTFBinaryExtension__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./glTFBinaryExtension */ "../../../dev/loaders/src/glTF/1.0/glTFBinaryExtension.ts");
|
|
2489
|
+
/* harmony import */ var _glTFLoader__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./glTFLoader */ "../../../dev/loaders/src/glTF/1.0/glTFLoader.ts");
|
|
2490
|
+
/* harmony import */ var _glTFLoaderInterfaces__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./glTFLoaderInterfaces */ "../../../dev/loaders/src/glTF/1.0/glTFLoaderInterfaces.ts");
|
|
2491
|
+
/* harmony import */ var _glTFLoaderUtils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./glTFLoaderUtils */ "../../../dev/loaders/src/glTF/1.0/glTFLoaderUtils.ts");
|
|
2492
|
+
/* harmony import */ var _glTFMaterialsCommonExtension__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./glTFMaterialsCommonExtension */ "../../../dev/loaders/src/glTF/1.0/glTFMaterialsCommonExtension.ts");
|
|
2493
2493
|
|
|
2494
2494
|
|
|
2495
2495
|
|
|
@@ -2499,10 +2499,10 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
2499
2499
|
|
|
2500
2500
|
/***/ }),
|
|
2501
2501
|
|
|
2502
|
-
/***/ "../../../
|
|
2503
|
-
|
|
2504
|
-
!*** ../../../
|
|
2505
|
-
|
|
2502
|
+
/***/ "../../../dev/loaders/src/glTF/glTFFileLoader.ts":
|
|
2503
|
+
/*!*******************************************************!*\
|
|
2504
|
+
!*** ../../../dev/loaders/src/glTF/glTFFileLoader.ts ***!
|
|
2505
|
+
\*******************************************************/
|
|
2506
2506
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
2507
2507
|
|
|
2508
2508
|
__webpack_require__.r(__webpack_exports__);
|
|
@@ -2512,9 +2512,9 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
2512
2512
|
/* harmony export */ GLTFLoaderCoordinateSystemMode: () => (/* binding */ GLTFLoaderCoordinateSystemMode),
|
|
2513
2513
|
/* harmony export */ GLTFLoaderState: () => (/* binding */ GLTFLoaderState)
|
|
2514
2514
|
/* harmony export */ });
|
|
2515
|
-
/* harmony import */ var
|
|
2516
|
-
/* harmony import */ var
|
|
2517
|
-
/* harmony import */ var _glTFValidation__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./glTFValidation */ "../../../
|
|
2515
|
+
/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Misc/error */ "babylonjs/Misc/observable");
|
|
2516
|
+
/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__);
|
|
2517
|
+
/* harmony import */ var _glTFValidation__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./glTFValidation */ "../../../dev/loaders/src/glTF/glTFValidation.ts");
|
|
2518
2518
|
|
|
2519
2519
|
|
|
2520
2520
|
|
|
@@ -2604,7 +2604,7 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
2604
2604
|
/**
|
|
2605
2605
|
* Raised when the asset has been parsed
|
|
2606
2606
|
*/
|
|
2607
|
-
this.onParsedObservable = new
|
|
2607
|
+
this.onParsedObservable = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Observable();
|
|
2608
2608
|
// ----------
|
|
2609
2609
|
// V2 options
|
|
2610
2610
|
// ----------
|
|
@@ -2682,45 +2682,45 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
2682
2682
|
* Observable raised when the loader creates a mesh after parsing the glTF properties of the mesh.
|
|
2683
2683
|
* Note that the observable is raised as soon as the mesh object is created, meaning some data may not have been setup yet for this mesh (vertex data, morph targets, material, ...)
|
|
2684
2684
|
*/
|
|
2685
|
-
this.onMeshLoadedObservable = new
|
|
2685
|
+
this.onMeshLoadedObservable = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Observable();
|
|
2686
2686
|
/**
|
|
2687
2687
|
* Callback raised when the loader creates a skin after parsing the glTF properties of the skin node.
|
|
2688
2688
|
* @see https://doc.babylonjs.com/features/featuresDeepDive/importers/glTF/glTFSkinning#ignoring-the-transform-of-the-skinned-mesh
|
|
2689
2689
|
* @param node - the transform node that corresponds to the original glTF skin node used for animations
|
|
2690
2690
|
* @param skinnedNode - the transform node that is the skinned mesh itself or the parent of the skinned meshes
|
|
2691
2691
|
*/
|
|
2692
|
-
this.onSkinLoadedObservable = new
|
|
2692
|
+
this.onSkinLoadedObservable = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Observable();
|
|
2693
2693
|
/**
|
|
2694
2694
|
* Observable raised when the loader creates a texture after parsing the glTF properties of the texture.
|
|
2695
2695
|
*/
|
|
2696
|
-
this.onTextureLoadedObservable = new
|
|
2696
|
+
this.onTextureLoadedObservable = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Observable();
|
|
2697
2697
|
/**
|
|
2698
2698
|
* Observable raised when the loader creates a material after parsing the glTF properties of the material.
|
|
2699
2699
|
*/
|
|
2700
|
-
this.onMaterialLoadedObservable = new
|
|
2700
|
+
this.onMaterialLoadedObservable = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Observable();
|
|
2701
2701
|
/**
|
|
2702
2702
|
* Observable raised when the loader creates a camera after parsing the glTF properties of the camera.
|
|
2703
2703
|
*/
|
|
2704
|
-
this.onCameraLoadedObservable = new
|
|
2704
|
+
this.onCameraLoadedObservable = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Observable();
|
|
2705
2705
|
/**
|
|
2706
2706
|
* Observable raised when the asset is completely loaded, immediately before the loader is disposed.
|
|
2707
2707
|
* For assets with LODs, raised when all of the LODs are complete.
|
|
2708
2708
|
* For assets without LODs, raised when the model is complete, immediately after the loader resolves the returned promise.
|
|
2709
2709
|
*/
|
|
2710
|
-
this.onCompleteObservable = new
|
|
2710
|
+
this.onCompleteObservable = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Observable();
|
|
2711
2711
|
/**
|
|
2712
2712
|
* Observable raised when an error occurs.
|
|
2713
2713
|
*/
|
|
2714
|
-
this.onErrorObservable = new
|
|
2714
|
+
this.onErrorObservable = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Observable();
|
|
2715
2715
|
/**
|
|
2716
2716
|
* Observable raised after the loader is disposed.
|
|
2717
2717
|
*/
|
|
2718
|
-
this.onDisposeObservable = new
|
|
2718
|
+
this.onDisposeObservable = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Observable();
|
|
2719
2719
|
/**
|
|
2720
2720
|
* Observable raised after a loader extension is created.
|
|
2721
2721
|
* Set additional options for a loader extension in this event.
|
|
2722
2722
|
*/
|
|
2723
|
-
this.onExtensionLoadedObservable = new
|
|
2723
|
+
this.onExtensionLoadedObservable = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Observable();
|
|
2724
2724
|
/**
|
|
2725
2725
|
* Defines if the loader should validate the asset.
|
|
2726
2726
|
*/
|
|
@@ -2728,7 +2728,7 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
2728
2728
|
/**
|
|
2729
2729
|
* Observable raised after validation when validate is set to true. The event data is the result of the validation.
|
|
2730
2730
|
*/
|
|
2731
|
-
this.onValidatedObservable = new
|
|
2731
|
+
this.onValidatedObservable = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Observable();
|
|
2732
2732
|
this._loader = null;
|
|
2733
2733
|
this._state = null;
|
|
2734
2734
|
this._requests = new Array();
|
|
@@ -2744,7 +2744,7 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
2744
2744
|
/**
|
|
2745
2745
|
* Observable raised when the loader state changes.
|
|
2746
2746
|
*/
|
|
2747
|
-
this.onLoaderStateChangedObservable = new
|
|
2747
|
+
this.onLoaderStateChangedObservable = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Observable();
|
|
2748
2748
|
this._logIndentLevel = 0;
|
|
2749
2749
|
this._loggingEnabled = false;
|
|
2750
2750
|
/** @internal */
|
|
@@ -2969,15 +2969,15 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
2969
2969
|
return null;
|
|
2970
2970
|
}
|
|
2971
2971
|
this._progressCallback = onProgress;
|
|
2972
|
-
var fileName = fileOrUrl.name ||
|
|
2972
|
+
var fileName = fileOrUrl.name || babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Tools.GetFilename(fileOrUrl);
|
|
2973
2973
|
if (useArrayBuffer) {
|
|
2974
2974
|
if (this.useRangeRequests) {
|
|
2975
2975
|
if (this.validate) {
|
|
2976
|
-
|
|
2976
|
+
babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Logger.Warn("glTF validation is not supported when range requests are enabled");
|
|
2977
2977
|
}
|
|
2978
2978
|
var fileRequest_1 = {
|
|
2979
2979
|
abort: function () { },
|
|
2980
|
-
onCompleteObservable: new
|
|
2980
|
+
onCompleteObservable: new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Observable(),
|
|
2981
2981
|
};
|
|
2982
2982
|
var dataBuffer = {
|
|
2983
2983
|
readAsync: function (byteOffset, byteLength) {
|
|
@@ -2993,7 +2993,7 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
2993
2993
|
},
|
|
2994
2994
|
byteLength: 0,
|
|
2995
2995
|
};
|
|
2996
|
-
this._unpackBinaryAsync(new
|
|
2996
|
+
this._unpackBinaryAsync(new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.DataReader(dataBuffer)).then(function (loaderData) {
|
|
2997
2997
|
fileRequest_1.onCompleteObservable.notifyObservers(fileRequest_1);
|
|
2998
2998
|
onSuccess(loaderData);
|
|
2999
2999
|
}, onError ? function (error) { return onError(undefined, error); } : undefined);
|
|
@@ -3001,7 +3001,7 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
3001
3001
|
}
|
|
3002
3002
|
return this._loadFile(scene, fileOrUrl, function (data) {
|
|
3003
3003
|
_this._validate(scene, new Uint8Array(data), rootUrl, fileName);
|
|
3004
|
-
_this._unpackBinaryAsync(new
|
|
3004
|
+
_this._unpackBinaryAsync(new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.DataReader({
|
|
3005
3005
|
readAsync: function (byteOffset, byteLength) { return readAsync(data, byteOffset, byteLength); },
|
|
3006
3006
|
byteLength: data.byteLength,
|
|
3007
3007
|
})).then(function (loaderData) {
|
|
@@ -3019,7 +3019,7 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
3019
3019
|
*/
|
|
3020
3020
|
GLTFFileLoader.prototype._loadBinary = function (scene, data, rootUrl, onSuccess, onError, fileName) {
|
|
3021
3021
|
this._validate(scene, data, rootUrl, fileName);
|
|
3022
|
-
this._unpackBinaryAsync(new
|
|
3022
|
+
this._unpackBinaryAsync(new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.DataReader({
|
|
3023
3023
|
readAsync: function (byteOffset, byteLength) { return readViewAsync(data, byteOffset, byteLength); },
|
|
3024
3024
|
byteLength: data.byteLength,
|
|
3025
3025
|
})).then(function (loaderData) {
|
|
@@ -3063,7 +3063,7 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
3063
3063
|
_this._log("Loading ".concat(fileName || ""));
|
|
3064
3064
|
_this._loader = _this._getLoader(data);
|
|
3065
3065
|
// Prepare the asset container.
|
|
3066
|
-
var container = new
|
|
3066
|
+
var container = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.AssetContainer(scene);
|
|
3067
3067
|
// Get materials/textures when loading to add to container
|
|
3068
3068
|
var materials = [];
|
|
3069
3069
|
_this.onMaterialLoadedObservable.add(function (material) {
|
|
@@ -3117,9 +3117,9 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
3117
3117
|
data.startsWith(";base64," + GLTFFileLoader._MagicBase64Encoded) ||
|
|
3118
3118
|
data.startsWith("application/octet-stream;base64," + GLTFFileLoader._MagicBase64Encoded) ||
|
|
3119
3119
|
data.startsWith("model/gltf-binary;base64," + GLTFFileLoader._MagicBase64Encoded)) {
|
|
3120
|
-
var arrayBuffer_1 = (0,
|
|
3120
|
+
var arrayBuffer_1 = (0,babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.DecodeBase64UrlToBinary)(data);
|
|
3121
3121
|
this._validate(scene, new Uint8Array(arrayBuffer_1));
|
|
3122
|
-
return this._unpackBinaryAsync(new
|
|
3122
|
+
return this._unpackBinaryAsync(new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.DataReader({
|
|
3123
3123
|
readAsync: function (byteOffset, byteLength) { return readAsync(arrayBuffer_1, byteOffset, byteLength); },
|
|
3124
3124
|
byteLength: arrayBuffer_1.byteLength,
|
|
3125
3125
|
}));
|
|
@@ -3222,7 +3222,7 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
3222
3222
|
_this.onValidatedObservable.clear();
|
|
3223
3223
|
}, function (reason) {
|
|
3224
3224
|
_this._endPerformanceCounter("Validate JSON");
|
|
3225
|
-
|
|
3225
|
+
babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Tools.Warn("Failed to validate: ".concat(reason.message));
|
|
3226
3226
|
_this.onValidatedObservable.clear();
|
|
3227
3227
|
});
|
|
3228
3228
|
};
|
|
@@ -3271,7 +3271,7 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
3271
3271
|
};
|
|
3272
3272
|
var magic = dataReader.readUint32();
|
|
3273
3273
|
if (magic !== Binary.Magic) {
|
|
3274
|
-
throw new
|
|
3274
|
+
throw new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.RuntimeError("Unexpected magic: " + magic, babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.ErrorCodes.GLTFLoaderUnexpectedMagicError);
|
|
3275
3275
|
}
|
|
3276
3276
|
var version = dataReader.readUint32();
|
|
3277
3277
|
if (_this.loggingEnabled) {
|
|
@@ -3279,7 +3279,7 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
3279
3279
|
}
|
|
3280
3280
|
var length = dataReader.readUint32();
|
|
3281
3281
|
if (!_this.useRangeRequests && length !== dataReader.buffer.byteLength) {
|
|
3282
|
-
|
|
3282
|
+
babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Logger.Warn("Length in header does not match actual data length: ".concat(length, " != ").concat(dataReader.buffer.byteLength));
|
|
3283
3283
|
}
|
|
3284
3284
|
var unpacked;
|
|
3285
3285
|
switch (version) {
|
|
@@ -3414,15 +3414,15 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
3414
3414
|
};
|
|
3415
3415
|
GLTFFileLoader.prototype._logEnabled = function (message) {
|
|
3416
3416
|
var spaces = GLTFFileLoader._logSpaces.substr(0, this._logIndentLevel * 2);
|
|
3417
|
-
|
|
3417
|
+
babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Logger.Log("".concat(spaces).concat(message));
|
|
3418
3418
|
};
|
|
3419
3419
|
GLTFFileLoader.prototype._logDisabled = function (message) { };
|
|
3420
3420
|
GLTFFileLoader.prototype._startPerformanceCounterEnabled = function (counterName) {
|
|
3421
|
-
|
|
3421
|
+
babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Tools.StartPerformanceCounter(counterName);
|
|
3422
3422
|
};
|
|
3423
3423
|
GLTFFileLoader.prototype._startPerformanceCounterDisabled = function (counterName) { };
|
|
3424
3424
|
GLTFFileLoader.prototype._endPerformanceCounterEnabled = function (counterName) {
|
|
3425
|
-
|
|
3425
|
+
babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.Tools.EndPerformanceCounter(counterName);
|
|
3426
3426
|
};
|
|
3427
3427
|
GLTFFileLoader.prototype._endPerformanceCounterDisabled = function (counterName) { };
|
|
3428
3428
|
// ----------
|
|
@@ -3445,25 +3445,25 @@ var GLTFFileLoader = /** @class */ (function () {
|
|
|
3445
3445
|
GLTFFileLoader._logSpaces = " ";
|
|
3446
3446
|
return GLTFFileLoader;
|
|
3447
3447
|
}());
|
|
3448
|
-
if (
|
|
3449
|
-
|
|
3448
|
+
if (babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.SceneLoader) {
|
|
3449
|
+
babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__.SceneLoader.RegisterPlugin(new GLTFFileLoader());
|
|
3450
3450
|
}
|
|
3451
3451
|
|
|
3452
3452
|
|
|
3453
3453
|
/***/ }),
|
|
3454
3454
|
|
|
3455
|
-
/***/ "../../../
|
|
3456
|
-
|
|
3457
|
-
!*** ../../../
|
|
3458
|
-
|
|
3455
|
+
/***/ "../../../dev/loaders/src/glTF/glTFValidation.ts":
|
|
3456
|
+
/*!*******************************************************!*\
|
|
3457
|
+
!*** ../../../dev/loaders/src/glTF/glTFValidation.ts ***!
|
|
3458
|
+
\*******************************************************/
|
|
3459
3459
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
3460
3460
|
|
|
3461
3461
|
__webpack_require__.r(__webpack_exports__);
|
|
3462
3462
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
3463
3463
|
/* harmony export */ GLTFValidation: () => (/* binding */ GLTFValidation)
|
|
3464
3464
|
/* harmony export */ });
|
|
3465
|
-
/* harmony import */ var
|
|
3466
|
-
/* harmony import */ var
|
|
3465
|
+
/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/observable");
|
|
3466
|
+
/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_0__);
|
|
3467
3467
|
|
|
3468
3468
|
function validateAsync(data, rootUrl, fileName, getExternalResource) {
|
|
3469
3469
|
var options = {
|
|
@@ -3572,7 +3572,7 @@ var GLTFValidation = /** @class */ (function () {
|
|
|
3572
3572
|
}
|
|
3573
3573
|
else {
|
|
3574
3574
|
if (!this._LoadScriptPromise) {
|
|
3575
|
-
this._LoadScriptPromise =
|
|
3575
|
+
this._LoadScriptPromise = babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_0__.Tools.LoadScriptAsync(this.Configuration.url);
|
|
3576
3576
|
}
|
|
3577
3577
|
return this._LoadScriptPromise.then(function () {
|
|
3578
3578
|
return validateAsync(dataCopy, rootUrl, fileName, getExternalResource);
|
|
@@ -3591,22 +3591,22 @@ var GLTFValidation = /** @class */ (function () {
|
|
|
3591
3591
|
|
|
3592
3592
|
/***/ }),
|
|
3593
3593
|
|
|
3594
|
-
/***/ "../../../lts/loaders/
|
|
3595
|
-
|
|
3596
|
-
!*** ../../../lts/loaders/
|
|
3597
|
-
|
|
3594
|
+
/***/ "../../../lts/loaders/src/legacy/legacy-glTF.ts":
|
|
3595
|
+
/*!******************************************************!*\
|
|
3596
|
+
!*** ../../../lts/loaders/src/legacy/legacy-glTF.ts ***!
|
|
3597
|
+
\******************************************************/
|
|
3598
3598
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
3599
3599
|
|
|
3600
3600
|
__webpack_require__.r(__webpack_exports__);
|
|
3601
3601
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
3602
|
-
/* harmony export */ GLTFFileLoader: () => (/* reexport safe */
|
|
3603
|
-
/* harmony export */ GLTFLoaderAnimationStartMode: () => (/* reexport safe */
|
|
3604
|
-
/* harmony export */ GLTFLoaderCoordinateSystemMode: () => (/* reexport safe */
|
|
3605
|
-
/* harmony export */ GLTFLoaderState: () => (/* reexport safe */
|
|
3606
|
-
/* harmony export */ GLTFValidation: () => (/* reexport safe */
|
|
3602
|
+
/* harmony export */ GLTFFileLoader: () => (/* reexport safe */ loaders_glTF_glTFFileLoader__WEBPACK_IMPORTED_MODULE_0__.GLTFFileLoader),
|
|
3603
|
+
/* harmony export */ GLTFLoaderAnimationStartMode: () => (/* reexport safe */ loaders_glTF_glTFFileLoader__WEBPACK_IMPORTED_MODULE_0__.GLTFLoaderAnimationStartMode),
|
|
3604
|
+
/* harmony export */ GLTFLoaderCoordinateSystemMode: () => (/* reexport safe */ loaders_glTF_glTFFileLoader__WEBPACK_IMPORTED_MODULE_0__.GLTFLoaderCoordinateSystemMode),
|
|
3605
|
+
/* harmony export */ GLTFLoaderState: () => (/* reexport safe */ loaders_glTF_glTFFileLoader__WEBPACK_IMPORTED_MODULE_0__.GLTFLoaderState),
|
|
3606
|
+
/* harmony export */ GLTFValidation: () => (/* reexport safe */ loaders_glTF_glTFValidation__WEBPACK_IMPORTED_MODULE_1__.GLTFValidation)
|
|
3607
3607
|
/* harmony export */ });
|
|
3608
|
-
/* harmony import */ var
|
|
3609
|
-
/* harmony import */ var
|
|
3608
|
+
/* harmony import */ var loaders_glTF_glTFFileLoader__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! loaders/glTF/glTFFileLoader */ "../../../dev/loaders/src/glTF/glTFFileLoader.ts");
|
|
3609
|
+
/* harmony import */ var loaders_glTF_glTFValidation__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! loaders/glTF/glTFValidation */ "../../../dev/loaders/src/glTF/glTFValidation.ts");
|
|
3610
3610
|
|
|
3611
3611
|
|
|
3612
3612
|
/**
|
|
@@ -3616,11 +3616,11 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
3616
3616
|
var globalObject = typeof __webpack_require__.g !== "undefined" ? __webpack_require__.g : typeof window !== "undefined" ? window : undefined;
|
|
3617
3617
|
if (typeof globalObject !== "undefined") {
|
|
3618
3618
|
globalObject.BABYLON = globalObject.BABYLON || {};
|
|
3619
|
-
for (var key in
|
|
3620
|
-
globalObject.BABYLON[key] =
|
|
3619
|
+
for (var key in loaders_glTF_glTFFileLoader__WEBPACK_IMPORTED_MODULE_0__) {
|
|
3620
|
+
globalObject.BABYLON[key] = loaders_glTF_glTFFileLoader__WEBPACK_IMPORTED_MODULE_0__[key];
|
|
3621
3621
|
}
|
|
3622
|
-
for (var key in
|
|
3623
|
-
globalObject.BABYLON[key] =
|
|
3622
|
+
for (var key in loaders_glTF_glTFValidation__WEBPACK_IMPORTED_MODULE_1__) {
|
|
3623
|
+
globalObject.BABYLON[key] = loaders_glTF_glTFValidation__WEBPACK_IMPORTED_MODULE_1__[key];
|
|
3624
3624
|
}
|
|
3625
3625
|
}
|
|
3626
3626
|
|
|
@@ -3629,17 +3629,17 @@ if (typeof globalObject !== "undefined") {
|
|
|
3629
3629
|
|
|
3630
3630
|
/***/ }),
|
|
3631
3631
|
|
|
3632
|
-
/***/ "../../../lts/loaders/
|
|
3633
|
-
|
|
3634
|
-
!*** ../../../lts/loaders/
|
|
3635
|
-
|
|
3632
|
+
/***/ "../../../lts/loaders/src/legacy/legacy-glTF1.ts":
|
|
3633
|
+
/*!*******************************************************!*\
|
|
3634
|
+
!*** ../../../lts/loaders/src/legacy/legacy-glTF1.ts ***!
|
|
3635
|
+
\*******************************************************/
|
|
3636
3636
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
3637
3637
|
|
|
3638
3638
|
__webpack_require__.r(__webpack_exports__);
|
|
3639
3639
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
3640
|
-
/* harmony export */ GLTF1: () => (/* reexport module object */
|
|
3640
|
+
/* harmony export */ GLTF1: () => (/* reexport module object */ loaders_glTF_1_0_index__WEBPACK_IMPORTED_MODULE_0__)
|
|
3641
3641
|
/* harmony export */ });
|
|
3642
|
-
/* harmony import */ var
|
|
3642
|
+
/* harmony import */ var loaders_glTF_1_0_index__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! loaders/glTF/1.0/index */ "../../../dev/loaders/src/glTF/1.0/index.ts");
|
|
3643
3643
|
/* eslint-disable import/no-internal-modules */
|
|
3644
3644
|
|
|
3645
3645
|
/**
|
|
@@ -3650,8 +3650,8 @@ var globalObject = typeof __webpack_require__.g !== "undefined" ? __webpack_requ
|
|
|
3650
3650
|
if (typeof globalObject !== "undefined") {
|
|
3651
3651
|
globalObject.BABYLON = globalObject.BABYLON || {};
|
|
3652
3652
|
globalObject.BABYLON.GLTF1 = globalObject.BABYLON.GLTF1 || {};
|
|
3653
|
-
for (var key in
|
|
3654
|
-
globalObject.BABYLON.GLTF1[key] =
|
|
3653
|
+
for (var key in loaders_glTF_1_0_index__WEBPACK_IMPORTED_MODULE_0__) {
|
|
3654
|
+
globalObject.BABYLON.GLTF1[key] = loaders_glTF_1_0_index__WEBPACK_IMPORTED_MODULE_0__[key];
|
|
3655
3655
|
}
|
|
3656
3656
|
}
|
|
3657
3657
|
|
|
@@ -3659,10 +3659,10 @@ if (typeof globalObject !== "undefined") {
|
|
|
3659
3659
|
|
|
3660
3660
|
/***/ }),
|
|
3661
3661
|
|
|
3662
|
-
/***/ "../../../lts/loaders/
|
|
3663
|
-
|
|
3664
|
-
!*** ../../../lts/loaders/
|
|
3665
|
-
|
|
3662
|
+
/***/ "../../../lts/loaders/src/legacy/legacy-glTF1FileLoader.ts":
|
|
3663
|
+
/*!*****************************************************************!*\
|
|
3664
|
+
!*** ../../../lts/loaders/src/legacy/legacy-glTF1FileLoader.ts ***!
|
|
3665
|
+
\*****************************************************************/
|
|
3666
3666
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
3667
3667
|
|
|
3668
3668
|
__webpack_require__.r(__webpack_exports__);
|
|
@@ -3674,8 +3674,8 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
3674
3674
|
/* harmony export */ GLTFLoaderState: () => (/* reexport safe */ _legacy_glTF__WEBPACK_IMPORTED_MODULE_0__.GLTFLoaderState),
|
|
3675
3675
|
/* harmony export */ GLTFValidation: () => (/* reexport safe */ _legacy_glTF__WEBPACK_IMPORTED_MODULE_0__.GLTFValidation)
|
|
3676
3676
|
/* harmony export */ });
|
|
3677
|
-
/* harmony import */ var _legacy_glTF__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./legacy-glTF */ "../../../lts/loaders/
|
|
3678
|
-
/* harmony import */ var _legacy_glTF1__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./legacy-glTF1 */ "../../../lts/loaders/
|
|
3677
|
+
/* harmony import */ var _legacy_glTF__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./legacy-glTF */ "../../../lts/loaders/src/legacy/legacy-glTF.ts");
|
|
3678
|
+
/* harmony import */ var _legacy_glTF1__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./legacy-glTF1 */ "../../../lts/loaders/src/legacy/legacy-glTF1.ts");
|
|
3679
3679
|
// eslint-disable-next-line import/export
|
|
3680
3680
|
|
|
3681
3681
|
|
|
@@ -3683,13 +3683,13 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
3683
3683
|
|
|
3684
3684
|
/***/ }),
|
|
3685
3685
|
|
|
3686
|
-
/***/ "
|
|
3686
|
+
/***/ "babylonjs/Misc/observable":
|
|
3687
3687
|
/*!****************************************************************************************************!*\
|
|
3688
3688
|
!*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
|
|
3689
3689
|
\****************************************************************************************************/
|
|
3690
3690
|
/***/ ((module) => {
|
|
3691
3691
|
|
|
3692
|
-
module.exports =
|
|
3692
|
+
module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_observable__;
|
|
3693
3693
|
|
|
3694
3694
|
/***/ }),
|
|
3695
3695
|
|
|
@@ -4146,13 +4146,13 @@ var __webpack_exports__ = {};
|
|
|
4146
4146
|
__webpack_require__.r(__webpack_exports__);
|
|
4147
4147
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
4148
4148
|
/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__),
|
|
4149
|
-
/* harmony export */ loaders: () => (/* reexport module object */
|
|
4149
|
+
/* harmony export */ loaders: () => (/* reexport module object */ _lts_loaders_legacy_legacy_glTF1FileLoader__WEBPACK_IMPORTED_MODULE_0__)
|
|
4150
4150
|
/* harmony export */ });
|
|
4151
|
-
/* harmony import */ var
|
|
4151
|
+
/* harmony import */ var _lts_loaders_legacy_legacy_glTF1FileLoader__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @lts/loaders/legacy/legacy-glTF1FileLoader */ "../../../lts/loaders/src/legacy/legacy-glTF1FileLoader.ts");
|
|
4152
4152
|
// eslint-disable-next-line import/export
|
|
4153
4153
|
|
|
4154
4154
|
|
|
4155
|
-
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (
|
|
4155
|
+
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (_lts_loaders_legacy_legacy_glTF1FileLoader__WEBPACK_IMPORTED_MODULE_0__);
|
|
4156
4156
|
|
|
4157
4157
|
})();
|
|
4158
4158
|
|