@galacean/engine-loader 2.0.0-alpha.43 → 2.0.0-alpha.45
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/main.js +71 -125
- package/dist/main.js.map +1 -1
- package/dist/module.js +72 -126
- package/dist/module.js.map +1 -1
- package/package.json +4 -4
- package/types/gltf/GLTFResource.d.ts +1 -1
- package/types/resource-deserialize/resources/mesh/IModelMesh.d.ts +123 -0
package/dist/module.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Utils, AssetPromise, AnimationClip, AnimationEvent, Loader, AnimationStringCurve, Keyframe, AnimationBoolCurve, AnimationRefCurve, AnimationQuaternionCurve, AnimationColorCurve, AnimationVector4Curve, AnimationVector3Curve, AnimationVector2Curve, AnimationFloatArrayCurve, AnimationArrayCurve, AnimationFloatCurve, ModelMesh, BlendShape, TextureFormat, Texture2D, TextureCube, TextureCubeFace, ReferResource, Entity, resourceLoader, AssetType, AnimatorController, AnimatorControllerLayer, AnimatorStateTransition, BufferAsset, GLCapabilityType, Logger, ContentRestorer, AmbientLight, DiffuseMode, TextureFilterMode, Font, SystemInfo, Animator, IndexFormat, VertexElementFormat, request, InterpolationType, SkinnedMeshRenderer, Transform, PBRMaterial, TextureCoordinate, RenderFace, VertexElement, Buffer, BufferBindFlag, BufferUsage, Camera, MeshRenderer, Skin, TextureWrapMode as TextureWrapMode$1, TextureUtils, AnimatorStateMachine, JSONAsset, Shader, Material, PrimitiveMesh, SpriteAtlas, Sprite, TextAsset, AudioClip, PhysicsMaterial, RenderTarget, Scene, BackgroundMode, DirectLight, PointLight, SpotLight, UnlitMaterial } from '@galacean/engine-core';
|
|
1
|
+
import { Utils, AssetPromise, AnimationClip, AnimationEvent, Loader, AnimationStringCurve, Keyframe, AnimationBoolCurve, AnimationRefCurve, AnimationQuaternionCurve, AnimationColorCurve, AnimationVector4Curve, AnimationVector3Curve, AnimationVector2Curve, AnimationFloatArrayCurve, AnimationArrayCurve, AnimationFloatCurve, ModelMesh, BlendShape, TextureFormat, Texture2D, TextureCube, TextureCubeFace, ReferResource, Entity, resourceLoader, AssetType, AnimatorController, AnimatorControllerLayer, AnimatorStateTransition, BufferAsset, GLCapabilityType, Logger, ContentRestorer, AmbientLight, DiffuseMode, TextureFilterMode, Font, SystemInfo, Animator, IndexFormat, VertexElementFormat, request, InterpolationType, SkinnedMeshRenderer, Transform, PBRMaterial, TextureCoordinate, RenderFace, VertexElement, Buffer, BufferBindFlag, BufferUsage, Camera, MeshRenderer, Skin, TextureWrapMode as TextureWrapMode$1, TextureUtils, AnimatorStateMachine, JSONAsset, Shader, Material, Texture, PrimitiveMesh, SpriteAtlas, Sprite, TextAsset, AudioClip, PhysicsMaterial, RenderTarget, Scene, BackgroundMode, DirectLight, PointLight, SpotLight, UnlitMaterial } from '@galacean/engine-core';
|
|
2
2
|
import { Quaternion, Vector4, Color, Vector3, Vector2, MathUtil, SphericalHarmonics3, Matrix, BoundingBox, Rect } from '@galacean/engine-math';
|
|
3
3
|
import { GLCompressedTextureInternalFormat } from '@galacean/engine-rhi-webgl';
|
|
4
4
|
|
|
@@ -894,7 +894,6 @@ var ReflectionParser = /*#__PURE__*/ function() {
|
|
|
894
894
|
} catch (error) {
|
|
895
895
|
return Promise.reject(error);
|
|
896
896
|
}
|
|
897
|
-
// @ts-ignore
|
|
898
897
|
return context.resourceManager.getResourceByRef(refItem).then(function(resource) {
|
|
899
898
|
if (resource && context.type === ParserType.Prefab) {
|
|
900
899
|
// @ts-ignore
|
|
@@ -1342,7 +1341,6 @@ function _instanceof(left, right) {
|
|
|
1342
1341
|
// ReferResource requires the engine to be passed as a parameter, which prevents cross-engine reuse.
|
|
1343
1342
|
// A refactor of ReferResource will be needed in the future.
|
|
1344
1343
|
if (_instanceof(resource, ReferResource)) {
|
|
1345
|
-
// @ts-ignore
|
|
1346
1344
|
resource._associationSuperResource(this);
|
|
1347
1345
|
}
|
|
1348
1346
|
};
|
|
@@ -1353,7 +1351,6 @@ function _instanceof(left, right) {
|
|
|
1353
1351
|
(_this__root = this._root) == null ? void 0 : _this__root.destroy();
|
|
1354
1352
|
this._dependenceAssets.forEach(function(asset) {
|
|
1355
1353
|
if (_instanceof(asset, ReferResource)) {
|
|
1356
|
-
// @ts-ignore
|
|
1357
1354
|
asset._disassociationSuperResource(_this);
|
|
1358
1355
|
}
|
|
1359
1356
|
});
|
|
@@ -1571,8 +1568,7 @@ function _instanceof(left, right) {
|
|
|
1571
1568
|
} catch (error) {
|
|
1572
1569
|
return Promise.reject(error);
|
|
1573
1570
|
}
|
|
1574
|
-
return engine.resourceManager
|
|
1575
|
-
.getResourceByRef(refItem).then(function(prefabResource) {
|
|
1571
|
+
return engine.resourceManager.getResourceByRef(refItem).then(function(prefabResource) {
|
|
1576
1572
|
var entity = _instanceof(prefabResource, PrefabResource) ? prefabResource.instantiate() : prefabResource.instantiateSceneRoot();
|
|
1577
1573
|
_this._onEntityCreated(entity);
|
|
1578
1574
|
return entity;
|
|
@@ -1635,7 +1631,6 @@ function _instanceof(left, right) {
|
|
|
1635
1631
|
var resourceManager = context.resourceManager;
|
|
1636
1632
|
var refs = data.refs;
|
|
1637
1633
|
for(var i = 0, n = refs.length; i < n; i++){
|
|
1638
|
-
// @ts-ignore
|
|
1639
1634
|
context._addDependentAsset(resourceManager.getResourceByRef(refs[i]));
|
|
1640
1635
|
}
|
|
1641
1636
|
};
|
|
@@ -1700,8 +1695,7 @@ var AnimationClipLoader = /*#__PURE__*/ function(Loader) {
|
|
|
1700
1695
|
_proto.load = function load(item, resourceManager) {
|
|
1701
1696
|
var _this = this;
|
|
1702
1697
|
return new AssetPromise(function(resolve, reject) {
|
|
1703
|
-
resourceManager
|
|
1704
|
-
._request(item.url, _extends({}, item, {
|
|
1698
|
+
resourceManager._request(item.url, _extends({}, item, {
|
|
1705
1699
|
type: "arraybuffer"
|
|
1706
1700
|
})).then(function(data) {
|
|
1707
1701
|
return decode(data, resourceManager.engine).then(function(clip) {
|
|
@@ -1725,8 +1719,7 @@ var AnimationClipLoader = /*#__PURE__*/ function(Loader) {
|
|
|
1725
1719
|
var value = keyframe.value;
|
|
1726
1720
|
if ((typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && (value == null ? void 0 : value.url)) {
|
|
1727
1721
|
return new Promise(function(resolve) {
|
|
1728
|
-
resourceManager
|
|
1729
|
-
.getResourceByRef(value).then(function(asset) {
|
|
1722
|
+
resourceManager.getResourceByRef(value).then(function(asset) {
|
|
1730
1723
|
keyframe.value = asset;
|
|
1731
1724
|
resolve(keyframe.value);
|
|
1732
1725
|
});
|
|
@@ -1752,8 +1745,7 @@ var AnimatorControllerLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
1752
1745
|
_proto.load = function load(item, resourceManager) {
|
|
1753
1746
|
var _this = this;
|
|
1754
1747
|
return new AssetPromise(function(resolve, reject) {
|
|
1755
|
-
resourceManager
|
|
1756
|
-
._request(item.url, _extends({}, item, {
|
|
1748
|
+
resourceManager._request(item.url, _extends({}, item, {
|
|
1757
1749
|
type: "json"
|
|
1758
1750
|
})).then(function(data) {
|
|
1759
1751
|
var animatorController = new AnimatorController(resourceManager.engine);
|
|
@@ -1782,7 +1774,6 @@ var AnimatorControllerLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
1782
1774
|
statesMap[id] = state;
|
|
1783
1775
|
if (clipData) {
|
|
1784
1776
|
promises.push(new Promise(function(resolve) {
|
|
1785
|
-
//@ts-ignore
|
|
1786
1777
|
resourceManager.getResourceByRef(clipData).then(function(clip) {
|
|
1787
1778
|
resolve({
|
|
1788
1779
|
layerIndex: layerIndex,
|
|
@@ -1839,7 +1830,6 @@ var AnimatorControllerLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
1839
1830
|
transition.exitTime = transitionData.exitTime;
|
|
1840
1831
|
transition.solo = transitionData.solo;
|
|
1841
1832
|
transition.mute = transitionData.mute;
|
|
1842
|
-
// @ts-ignore
|
|
1843
1833
|
transition._isExit = transitionData.isExit;
|
|
1844
1834
|
transition.destinationState = destinationState;
|
|
1845
1835
|
transitionData.conditions.forEach(function(conditionData) {
|
|
@@ -2484,14 +2474,12 @@ var KTX2Loader = /*#__PURE__*/ function(Loader) {
|
|
|
2484
2474
|
/**
|
|
2485
2475
|
* @internal
|
|
2486
2476
|
*/ _proto.load = function load(item, resourceManager) {
|
|
2487
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
2488
2477
|
var remoteUrl = resourceManager._getRemoteUrl(item.url);
|
|
2489
2478
|
return new AssetPromise(function(resolve, reject, setTaskCompleteProgress, setTaskDetailProgress) {
|
|
2490
2479
|
var requestConfig = _extends({}, item, {
|
|
2491
2480
|
type: "arraybuffer"
|
|
2492
2481
|
});
|
|
2493
|
-
resourceManager
|
|
2494
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
|
|
2482
|
+
resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
|
|
2495
2483
|
return KTX2Loader._parseBuffer(new Uint8Array(buffer), resourceManager.engine, item.params).then(function(param) {
|
|
2496
2484
|
var ktx2Container = param.ktx2Container, engine = param.engine, result = param.result, targetFormat = param.targetFormat, params = param.params;
|
|
2497
2485
|
return KTX2Loader._createTextureByBuffer(engine, ktx2Container.isSRGB, result, targetFormat, params);
|
|
@@ -2691,8 +2679,7 @@ var KTX2ContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
|
|
|
2691
2679
|
var _this1 = this, resource = _this1.resource, requestConfig = _this1.requestConfig;
|
|
2692
2680
|
var engine = resource.engine;
|
|
2693
2681
|
return new AssetPromise(function(resolve, reject) {
|
|
2694
|
-
engine.resourceManager
|
|
2695
|
-
._requestByRemoteUrl(_this.remoteUrl, requestConfig).then(function(buffer) {
|
|
2682
|
+
engine.resourceManager._requestByRemoteUrl(_this.remoteUrl, requestConfig).then(function(buffer) {
|
|
2696
2683
|
return KTX2Loader._parseBuffer(new Uint8Array(buffer), engine, requestConfig.params).then(function(param) {
|
|
2697
2684
|
var ktx2Container = param.ktx2Container, engine = param.engine, result = param.result, targetFormat = param.targetFormat, params = param.params;
|
|
2698
2685
|
return KTX2Loader._createTextureByBuffer(engine, ktx2Container.isSRGB, result, targetFormat, params, resource);
|
|
@@ -2710,15 +2697,13 @@ var AmbientLightLoader = /*#__PURE__*/ function(Loader) {
|
|
|
2710
2697
|
}
|
|
2711
2698
|
var _proto = AmbientLightLoader.prototype;
|
|
2712
2699
|
_proto.load = function load(item, resourceManager) {
|
|
2713
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
2714
2700
|
var remoteUrl = resourceManager._getRemoteUrl(item.url);
|
|
2715
2701
|
return new AssetPromise(function(resolve, reject) {
|
|
2716
2702
|
var requestConfig = _extends({}, item, {
|
|
2717
2703
|
type: "arraybuffer"
|
|
2718
2704
|
});
|
|
2719
2705
|
var engine = resourceManager.engine;
|
|
2720
|
-
resourceManager
|
|
2721
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).then(function(buffer) {
|
|
2706
|
+
resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).then(function(buffer) {
|
|
2722
2707
|
var header = FileHeader.decode(buffer);
|
|
2723
2708
|
var dataOffset = header.headerLength;
|
|
2724
2709
|
var sh = new SphericalHarmonics3();
|
|
@@ -2785,8 +2770,7 @@ AmbientLightLoader = __decorate([
|
|
|
2785
2770
|
return new AssetPromise(function(resolve, reject) {
|
|
2786
2771
|
var resource = _this.resource;
|
|
2787
2772
|
var engine = resource.engine;
|
|
2788
|
-
engine.resourceManager
|
|
2789
|
-
._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(buffer) {
|
|
2773
|
+
engine.resourceManager._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(buffer) {
|
|
2790
2774
|
var header = FileHeader.decode(buffer);
|
|
2791
2775
|
var dataOffset = header.headerLength;
|
|
2792
2776
|
var textureOffset = dataOffset + AmbientLightLoader._shByteLength;
|
|
@@ -2837,14 +2821,12 @@ var FontLoader = /*#__PURE__*/ function(Loader) {
|
|
|
2837
2821
|
_proto.load = function load(item, resourceManager) {
|
|
2838
2822
|
var _this = this;
|
|
2839
2823
|
return new AssetPromise(function(resolve, reject) {
|
|
2840
|
-
resourceManager
|
|
2841
|
-
._request(item.url, _extends({}, item, {
|
|
2824
|
+
resourceManager._request(item.url, _extends({}, item, {
|
|
2842
2825
|
type: "json"
|
|
2843
2826
|
})).then(function(data) {
|
|
2844
2827
|
var fontName = data.fontName, fontUrl = data.fontUrl;
|
|
2845
2828
|
if (fontUrl) {
|
|
2846
2829
|
var absoluteUrl = Utils.resolveAbsoluteUrl(item.url, fontUrl);
|
|
2847
|
-
// @ts-ignore
|
|
2848
2830
|
var remoteUrl = resourceManager._getRemoteUrl(absoluteUrl);
|
|
2849
2831
|
_this._registerFont(fontName, remoteUrl).then(function() {
|
|
2850
2832
|
var font = new Font(resourceManager.engine, fontName);
|
|
@@ -2958,7 +2940,6 @@ function getMeshoptDecoder() {
|
|
|
2958
2940
|
73,
|
|
2959
2941
|
115
|
|
2960
2942
|
]);
|
|
2961
|
-
// @ts-ignore
|
|
2962
2943
|
var wasm = SystemInfo._detectSIMDSupported() ? wasm_simd : wasm_base;
|
|
2963
2944
|
var instance;
|
|
2964
2945
|
ready = WebAssembly.instantiate(unpack(wasm)).then(function(result) {
|
|
@@ -3109,19 +3090,18 @@ function getMeshoptDecoder() {
|
|
|
3109
3090
|
_proto._onDestroy = function _onDestroy() {
|
|
3110
3091
|
ReferResource.prototype._onDestroy.call(this);
|
|
3111
3092
|
var _this = this, textures = _this.textures, materials = _this.materials, meshes = _this.meshes;
|
|
3112
|
-
textures && this.
|
|
3113
|
-
materials && this.
|
|
3093
|
+
textures && this._disassociateResources(textures);
|
|
3094
|
+
materials && this._disassociateResources(materials);
|
|
3114
3095
|
if (meshes) {
|
|
3115
3096
|
for(var i = 0, n = meshes.length; i < n; i++){
|
|
3116
3097
|
var meshArr = meshes[i];
|
|
3117
|
-
meshArr && this.
|
|
3098
|
+
meshArr && this._disassociateResources(meshArr);
|
|
3118
3099
|
}
|
|
3119
3100
|
}
|
|
3120
3101
|
};
|
|
3121
|
-
_proto.
|
|
3102
|
+
_proto._disassociateResources = function _disassociateResources(resources) {
|
|
3122
3103
|
for(var i = 0, n = resources.length; i < n; i++){
|
|
3123
|
-
var
|
|
3124
|
-
_resources_i;
|
|
3104
|
+
var _resources_i;
|
|
3125
3105
|
(_resources_i = resources[i]) == null ? void 0 : _resources_i._disassociationSuperResource(this);
|
|
3126
3106
|
}
|
|
3127
3107
|
};
|
|
@@ -3340,7 +3320,6 @@ function getMeshoptDecoder() {
|
|
|
3340
3320
|
detail.total = total;
|
|
3341
3321
|
_this._setTaskDetailProgress(url, loaded, total);
|
|
3342
3322
|
};
|
|
3343
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
3344
3323
|
this._remoteAssetBaseURL = resourceManager._getRemoteUrl(glTFResource.url);
|
|
3345
3324
|
this.contentRestorer = new GLTFContentRestorer(glTFResource);
|
|
3346
3325
|
}
|
|
@@ -3443,15 +3422,12 @@ function getMeshoptDecoder() {
|
|
|
3443
3422
|
if (type === 7) {
|
|
3444
3423
|
for(var i = 0, length = item.length; i < length; i++){
|
|
3445
3424
|
var mesh = item[i];
|
|
3446
|
-
// @ts-ignore
|
|
3447
3425
|
_this.resourceManager._onSubAssetSuccess(remoteAssetBaseURL, glTFResourceKey + "[" + index + "][" + i + "]", mesh);
|
|
3448
3426
|
}
|
|
3449
3427
|
} else {
|
|
3450
|
-
// @ts-ignore
|
|
3451
3428
|
_this.resourceManager._onSubAssetSuccess(remoteAssetBaseURL, "" + glTFResourceKey + (index === undefined ? "" : "[" + index + "]"), item);
|
|
3452
3429
|
var _this_glTF_scene;
|
|
3453
3430
|
if (type === 2 && ((_this_glTF_scene = _this.glTF.scene) != null ? _this_glTF_scene : 0) === index) {
|
|
3454
|
-
// @ts-ignore
|
|
3455
3431
|
_this.resourceManager._onSubAssetSuccess(remoteAssetBaseURL, "defaultSceneRoot", item);
|
|
3456
3432
|
}
|
|
3457
3433
|
}
|
|
@@ -4255,10 +4231,8 @@ var GLTFSchemaParser = /*#__PURE__*/ function(GLTFParser) {
|
|
|
4255
4231
|
var requestConfig = {
|
|
4256
4232
|
type: "arraybuffer"
|
|
4257
4233
|
};
|
|
4258
|
-
// @ts-ignore
|
|
4259
4234
|
var remoteUrl = resourceManager._getRemoteUrl(url);
|
|
4260
|
-
return resourceManager
|
|
4261
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(undefined, context._onTaskDetail).then(function(buffer) {
|
|
4235
|
+
return resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(undefined, context._onTaskDetail).then(function(buffer) {
|
|
4262
4236
|
var parseResult = GLTFUtils.parseGLB(context, buffer);
|
|
4263
4237
|
// If the buffer is a GLB file, we need to restore the buffer data
|
|
4264
4238
|
if (parseResult == null ? void 0 : parseResult.glTF) {
|
|
@@ -4491,15 +4465,13 @@ var GLTFBufferParser = /*#__PURE__*/ function(GLTFParser) {
|
|
|
4491
4465
|
var glTFResource = context.glTFResource, contentRestorer = context.contentRestorer, resourceManager = context.resourceManager;
|
|
4492
4466
|
var url = glTFResource.url;
|
|
4493
4467
|
var absoluteUrl = Utils.resolveAbsoluteUrl(url, bufferInfo.uri);
|
|
4494
|
-
// @ts-ignore
|
|
4495
4468
|
var remoteUrl = resourceManager._getRemoteUrl(absoluteUrl);
|
|
4496
4469
|
var restoreBufferRequests = contentRestorer.bufferRequests;
|
|
4497
4470
|
var requestConfig = {
|
|
4498
4471
|
type: "arraybuffer"
|
|
4499
4472
|
};
|
|
4500
4473
|
restoreBufferRequests.push(new BufferRequestInfo(remoteUrl, requestConfig));
|
|
4501
|
-
var promise = resourceManager
|
|
4502
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(undefined, context._onTaskDetail);
|
|
4474
|
+
var promise = resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(undefined, context._onTaskDetail);
|
|
4503
4475
|
context._addTaskCompletePromise(promise);
|
|
4504
4476
|
return promise;
|
|
4505
4477
|
};
|
|
@@ -4521,7 +4493,6 @@ var GLTFEntityParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
4521
4493
|
var engine = glTFResource.engine;
|
|
4522
4494
|
var matrix = entityInfo.matrix, translation = entityInfo.translation, rotation = entityInfo.rotation, scale = entityInfo.scale, extensions = entityInfo.extensions;
|
|
4523
4495
|
var entity = new Entity(engine, entityInfo.name || "_GLTF_ENTITY_" + index);
|
|
4524
|
-
// @ts-ignore
|
|
4525
4496
|
entity._markAsTemplate(glTFResource);
|
|
4526
4497
|
var transform = entity.transform;
|
|
4527
4498
|
if (matrix) {
|
|
@@ -4581,10 +4552,8 @@ var GLTFMaterialParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
4581
4552
|
GLTFMaterialParser._parseStandardProperty(context, material, materialInfo);
|
|
4582
4553
|
}
|
|
4583
4554
|
return AssetPromise.resolve(material).then(function(material) {
|
|
4584
|
-
// @ts-ignore
|
|
4585
4555
|
material || (material = engine._basicResources._getBlinnPhongMaterial());
|
|
4586
4556
|
GLTFParser.executeExtensionsAdditiveAndParse(extensions, context, material, materialInfo);
|
|
4587
|
-
// @ts-ignore
|
|
4588
4557
|
material._associationSuperResource(glTFResource);
|
|
4589
4558
|
return material;
|
|
4590
4559
|
});
|
|
@@ -4705,19 +4674,16 @@ var GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
4705
4674
|
var mesh = GLTFParser.executeExtensionsCreateAndParse(gltfPrimitive.extensions, context, gltfPrimitive, meshInfo);
|
|
4706
4675
|
if (mesh) {
|
|
4707
4676
|
if (_instanceof(mesh, ModelMesh)) {
|
|
4708
|
-
// @ts-ignore
|
|
4709
4677
|
mesh._associationSuperResource(glTFResource);
|
|
4710
4678
|
resolve(mesh);
|
|
4711
4679
|
} else {
|
|
4712
4680
|
mesh.then(function(mesh) {
|
|
4713
|
-
// @ts-ignore
|
|
4714
4681
|
mesh._associationSuperResource(glTFResource);
|
|
4715
4682
|
resolve(mesh);
|
|
4716
4683
|
});
|
|
4717
4684
|
}
|
|
4718
4685
|
} else {
|
|
4719
4686
|
var mesh1 = new ModelMesh(engine, meshInfo.name || i + "");
|
|
4720
|
-
// @ts-ignore
|
|
4721
4687
|
mesh1._associationSuperResource(glTFResource);
|
|
4722
4688
|
var meshRestoreInfo = new ModelMeshRestoreInfo();
|
|
4723
4689
|
meshRestoreInfo.mesh = mesh1;
|
|
@@ -4914,7 +4880,6 @@ var GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
4914
4880
|
var sceneNodes = sceneInfo.nodes || [];
|
|
4915
4881
|
var sceneRoot;
|
|
4916
4882
|
sceneRoot = new Entity(engine, "GLTF_ROOT");
|
|
4917
|
-
// @ts-ignore
|
|
4918
4883
|
sceneRoot._markAsTemplate(glTFResource);
|
|
4919
4884
|
for(var i = 0; i < sceneNodes.length; i++){
|
|
4920
4885
|
sceneRoot.addChild(context.get(GLTFParserType.Entity, sceneNodes[i]));
|
|
@@ -5036,7 +5001,6 @@ var GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
5036
5001
|
GLTFParser.executeExtensionsAdditiveAndParse(glTFPrimitive.extensions, context, renderer, glTFPrimitive);
|
|
5037
5002
|
};
|
|
5038
5003
|
var meshes = param[0], skin = param[1], materials = param[2];
|
|
5039
|
-
// @ts-ignore
|
|
5040
5004
|
var basicResources = context.glTFResource.engine._basicResources;
|
|
5041
5005
|
for(var i = 0; i < rendererCount; i++)_loop(i);
|
|
5042
5006
|
}).catch(function(e) {
|
|
@@ -5164,7 +5128,6 @@ var GLTFTextureParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
5164
5128
|
}
|
|
5165
5129
|
return AssetPromise.resolve(texture).then(function(texture) {
|
|
5166
5130
|
GLTFParser.executeExtensionsAdditiveAndParse(extensions, context, texture, textureInfo);
|
|
5167
|
-
// @ts-ignore
|
|
5168
5131
|
texture._associationSuperResource(glTFResource);
|
|
5169
5132
|
return texture;
|
|
5170
5133
|
});
|
|
@@ -5448,8 +5411,7 @@ var PrefabLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5448
5411
|
_proto.load = function load(item, resourceManager) {
|
|
5449
5412
|
var engine = resourceManager.engine;
|
|
5450
5413
|
return new AssetPromise(function(resolve, reject) {
|
|
5451
|
-
resourceManager
|
|
5452
|
-
._request(item.url, _extends({}, item, {
|
|
5414
|
+
resourceManager._request(item.url, _extends({}, item, {
|
|
5453
5415
|
type: "json"
|
|
5454
5416
|
})).then(function(data) {
|
|
5455
5417
|
PrefabParser.parse(engine, item.url, data).then(resolve).catch(reject);
|
|
@@ -5471,7 +5433,6 @@ var JSONLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5471
5433
|
}
|
|
5472
5434
|
var _proto = JSONLoader.prototype;
|
|
5473
5435
|
_proto.load = function load(item, resourceManager) {
|
|
5474
|
-
// @ts-ignore
|
|
5475
5436
|
return resourceManager._request(item.url, _extends({}, item, {
|
|
5476
5437
|
type: "json"
|
|
5477
5438
|
})).then(function(data) {
|
|
@@ -5682,10 +5643,9 @@ var KTXCubeLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5682
5643
|
_proto.load = function load(item, resourceManager) {
|
|
5683
5644
|
return new AssetPromise(function(resolve, reject) {
|
|
5684
5645
|
Promise.all(item.urls.map(function(url) {
|
|
5685
|
-
return(
|
|
5686
|
-
resourceManager._request(url, _extends({}, item, {
|
|
5646
|
+
return resourceManager._request(url, _extends({}, item, {
|
|
5687
5647
|
type: "arraybuffer"
|
|
5688
|
-
}))
|
|
5648
|
+
}));
|
|
5689
5649
|
})).then(function(data) {
|
|
5690
5650
|
var parsedData = parseCubeKTX(data);
|
|
5691
5651
|
var width = parsedData.width, mipmapsFaces = parsedData.mipmapsFaces, engineFormat = parsedData.engineFormat;
|
|
@@ -5717,14 +5677,12 @@ var KTXLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5717
5677
|
}
|
|
5718
5678
|
var _proto = KTXLoader.prototype;
|
|
5719
5679
|
_proto.load = function load(item, resourceManager) {
|
|
5720
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
5721
5680
|
var remoteUrl = resourceManager._getRemoteUrl(item.url);
|
|
5722
5681
|
var requestConfig = _extends({}, item, {
|
|
5723
5682
|
type: "arraybuffer"
|
|
5724
5683
|
});
|
|
5725
5684
|
return new AssetPromise(function(resolve, reject) {
|
|
5726
|
-
resourceManager
|
|
5727
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).then(function(bin) {
|
|
5685
|
+
resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).then(function(bin) {
|
|
5728
5686
|
var parsedData = parseSingleKTX(bin);
|
|
5729
5687
|
var width = parsedData.width, height = parsedData.height, mipmaps = parsedData.mipmaps, engineFormat = parsedData.engineFormat;
|
|
5730
5688
|
var mipmap = mipmaps.length > 1;
|
|
@@ -5760,8 +5718,7 @@ var KTXContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
|
|
|
5760
5718
|
var resource = this.resource;
|
|
5761
5719
|
var engine = resource.engine;
|
|
5762
5720
|
return new AssetPromise(function(resolve, reject) {
|
|
5763
|
-
engine.resourceManager
|
|
5764
|
-
._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(bin) {
|
|
5721
|
+
engine.resourceManager._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(bin) {
|
|
5765
5722
|
var mipmaps = parseSingleKTX(bin).mipmaps;
|
|
5766
5723
|
for(var miplevel = 0; miplevel < mipmaps.length; miplevel++){
|
|
5767
5724
|
var _mipmaps_miplevel = mipmaps[miplevel], width = _mipmaps_miplevel.width, height = _mipmaps_miplevel.height, data = _mipmaps_miplevel.data;
|
|
@@ -5776,6 +5733,7 @@ var KTXContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
|
|
|
5776
5733
|
return KTXContentRestorer;
|
|
5777
5734
|
}(ContentRestorer);
|
|
5778
5735
|
|
|
5736
|
+
var materialLoaderTypes = new Set(Object.values(MaterialLoaderType));
|
|
5779
5737
|
var MaterialLoader = /*#__PURE__*/ function(Loader) {
|
|
5780
5738
|
_inherits(MaterialLoader, Loader);
|
|
5781
5739
|
function MaterialLoader() {
|
|
@@ -5784,23 +5742,30 @@ var MaterialLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5784
5742
|
var _proto = MaterialLoader.prototype;
|
|
5785
5743
|
_proto.load = function load(item, resourceManager) {
|
|
5786
5744
|
var _this = this;
|
|
5787
|
-
return
|
|
5788
|
-
|
|
5789
|
-
|
|
5790
|
-
|
|
5791
|
-
|
|
5792
|
-
var
|
|
5793
|
-
|
|
5794
|
-
|
|
5795
|
-
if (shader) {
|
|
5796
|
-
resolve(_this._getMaterialByShader(materialSchema, shader, engine));
|
|
5797
|
-
} else if (shaderRef) {
|
|
5798
|
-
resolve(resourceManager// @ts-ignore
|
|
5799
|
-
.getResourceByRef(shaderRef).then(function(shader) {
|
|
5800
|
-
return _this._getMaterialByShader(materialSchema, shader, engine);
|
|
5801
|
-
}));
|
|
5745
|
+
return resourceManager._request(item.url, _extends({}, item, {
|
|
5746
|
+
type: "json"
|
|
5747
|
+
})).then(function(materialSchema) {
|
|
5748
|
+
var shaderData = materialSchema.shaderData, shaderRef = materialSchema.shaderRef, shaderName = materialSchema.shader;
|
|
5749
|
+
for(var key in shaderData){
|
|
5750
|
+
var type = shaderData[key].type;
|
|
5751
|
+
if (!materialLoaderTypes.has(type)) {
|
|
5752
|
+
throw new Error('MaterialLoader: unsupported shader data type "' + type + '".');
|
|
5802
5753
|
}
|
|
5803
|
-
}
|
|
5754
|
+
}
|
|
5755
|
+
var engine = resourceManager.engine;
|
|
5756
|
+
var shader = Shader.find(shaderName);
|
|
5757
|
+
if (shader) {
|
|
5758
|
+
return _this._getMaterialByShader(materialSchema, shader, engine);
|
|
5759
|
+
}
|
|
5760
|
+
if (!shaderRef) {
|
|
5761
|
+
throw new Error('MaterialLoader: shader "' + shaderName + '" not found.');
|
|
5762
|
+
}
|
|
5763
|
+
return resourceManager.getResourceByRef(shaderRef).then(function(shader) {
|
|
5764
|
+
if (!_instanceof(shader, Shader)) {
|
|
5765
|
+
throw new Error('MaterialLoader: shader reference "' + shaderRef.url + '" did not resolve to a Shader.');
|
|
5766
|
+
}
|
|
5767
|
+
return _this._getMaterialByShader(materialSchema, shader, engine);
|
|
5768
|
+
});
|
|
5804
5769
|
});
|
|
5805
5770
|
};
|
|
5806
5771
|
_proto._getMaterialByShader = function _getMaterialByShader(materialSchema, shader, engine) {
|
|
@@ -5823,8 +5788,10 @@ var MaterialLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5823
5788
|
materialShaderData.setFloat(key, value);
|
|
5824
5789
|
break;
|
|
5825
5790
|
case MaterialLoaderType.Texture:
|
|
5826
|
-
texturePromises.push(
|
|
5827
|
-
|
|
5791
|
+
texturePromises.push(engine.resourceManager.getResourceByRef(value).then(function(texture) {
|
|
5792
|
+
if (!_instanceof(texture, Texture)) {
|
|
5793
|
+
throw new Error('MaterialLoader: texture reference "' + value.url + '" did not resolve to a Texture.');
|
|
5794
|
+
}
|
|
5828
5795
|
materialShaderData.setTexture(key, texture);
|
|
5829
5796
|
}));
|
|
5830
5797
|
break;
|
|
@@ -5834,6 +5801,8 @@ var MaterialLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5834
5801
|
case MaterialLoaderType.Integer:
|
|
5835
5802
|
materialShaderData.setInt(key, Number(value));
|
|
5836
5803
|
break;
|
|
5804
|
+
default:
|
|
5805
|
+
throw new Error('MaterialLoader: unsupported shader data type "' + type + '".');
|
|
5837
5806
|
}
|
|
5838
5807
|
};
|
|
5839
5808
|
var name = materialSchema.name, shaderData = materialSchema.shaderData, macros = materialSchema.macros;
|
|
@@ -5852,6 +5821,9 @@ var MaterialLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5852
5821
|
}
|
|
5853
5822
|
return Promise.all(texturePromises).then(function() {
|
|
5854
5823
|
return material;
|
|
5824
|
+
}, function(error) {
|
|
5825
|
+
material.destroy();
|
|
5826
|
+
throw error;
|
|
5855
5827
|
});
|
|
5856
5828
|
};
|
|
5857
5829
|
return MaterialLoader;
|
|
@@ -5872,11 +5844,9 @@ var MeshLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5872
5844
|
var requestConfig = _extends({}, item, {
|
|
5873
5845
|
type: "arraybuffer"
|
|
5874
5846
|
});
|
|
5875
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
5876
5847
|
var remoteUrl = resourceManager._getRemoteUrl(item.url);
|
|
5877
5848
|
return new AssetPromise(function(resolve, reject) {
|
|
5878
|
-
resourceManager
|
|
5879
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).then(function(data) {
|
|
5849
|
+
resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).then(function(data) {
|
|
5880
5850
|
return decode(data, resourceManager.engine);
|
|
5881
5851
|
}).then(function(mesh) {
|
|
5882
5852
|
resourceManager.addContentRestorer(new MeshContentRestorer(mesh, remoteUrl, requestConfig));
|
|
@@ -5904,8 +5874,7 @@ var MeshContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
|
|
|
5904
5874
|
var resource = this.resource;
|
|
5905
5875
|
var engine = resource.engine;
|
|
5906
5876
|
return new AssetPromise(function(resolve, reject) {
|
|
5907
|
-
engine.resourceManager
|
|
5908
|
-
._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(data) {
|
|
5877
|
+
engine.resourceManager._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(data) {
|
|
5909
5878
|
return decode(data, engine, resource);
|
|
5910
5879
|
}).then(function(mesh) {
|
|
5911
5880
|
resolve(mesh);
|
|
@@ -5923,8 +5892,7 @@ var PrimitiveMeshLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5923
5892
|
var _proto = PrimitiveMeshLoader.prototype;
|
|
5924
5893
|
_proto.load = function load(item, resourceManager) {
|
|
5925
5894
|
var engine = resourceManager.engine;
|
|
5926
|
-
return resourceManager
|
|
5927
|
-
._request(item.url, _extends({}, item, {
|
|
5895
|
+
return resourceManager._request(item.url, _extends({}, item, {
|
|
5928
5896
|
type: "json"
|
|
5929
5897
|
})).then(function(data) {
|
|
5930
5898
|
switch(data.type){
|
|
@@ -5962,8 +5930,7 @@ var ProjectLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5962
5930
|
_proto.load = function load(item, resourceManager) {
|
|
5963
5931
|
var engine = resourceManager.engine;
|
|
5964
5932
|
return new AssetPromise(function(resolve, reject, onTaskCompeteProgress) {
|
|
5965
|
-
resourceManager
|
|
5966
|
-
._request(item.url, _extends({}, item, {
|
|
5933
|
+
resourceManager._request(item.url, _extends({}, item, {
|
|
5967
5934
|
type: "json"
|
|
5968
5935
|
})).then(function(data) {
|
|
5969
5936
|
engine.resourceManager.registerVirtualResources(data.files);
|
|
@@ -5994,7 +5961,6 @@ var SourceFontLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5994
5961
|
_proto.load = function load(item, resourceManager) {
|
|
5995
5962
|
var _this = this;
|
|
5996
5963
|
return new AssetPromise(function(resolve, reject) {
|
|
5997
|
-
// @ts-ignore
|
|
5998
5964
|
var url = resourceManager._getRemoteUrl(item.url);
|
|
5999
5965
|
_this._registerFont(url, url).then(function() {
|
|
6000
5966
|
var font = new Font(resourceManager.engine, url);
|
|
@@ -6052,7 +6018,6 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6052
6018
|
chainPromises[i].cancel();
|
|
6053
6019
|
}
|
|
6054
6020
|
});
|
|
6055
|
-
// @ts-ignore
|
|
6056
6021
|
var configPromise = resourceManager._request(item.url, _extends({}, item, {
|
|
6057
6022
|
type: "json"
|
|
6058
6023
|
}));
|
|
@@ -6075,13 +6040,11 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6075
6040
|
wrapModeU !== undefined && (texture.wrapModeU = wrapModeU);
|
|
6076
6041
|
wrapModeV !== undefined && (texture.wrapModeV = wrapModeV);
|
|
6077
6042
|
for(var i = 0; i < atlasItem.sprites.length; i++){
|
|
6078
|
-
// @ts-ignore
|
|
6079
6043
|
spriteAtlas._addSprite(_this._makeSprite(engine, atlasItem.sprites[i], texture));
|
|
6080
6044
|
}
|
|
6081
6045
|
}).catch(reject));
|
|
6082
6046
|
} else {
|
|
6083
6047
|
for(var i1 = 0; i1 < atlasItem.sprites.length; i1++){
|
|
6084
|
-
// @ts-ignore
|
|
6085
6048
|
spriteAtlas._addSprite(_this._makeSprite(engine, atlasItem.sprites[i1]));
|
|
6086
6049
|
}
|
|
6087
6050
|
}
|
|
@@ -6136,8 +6099,7 @@ var SpriteLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6136
6099
|
var _proto = SpriteLoader.prototype;
|
|
6137
6100
|
_proto.load = function load(item, resourceManager) {
|
|
6138
6101
|
var _this = this;
|
|
6139
|
-
return resourceManager
|
|
6140
|
-
._request(item.url, _extends({}, item, {
|
|
6102
|
+
return resourceManager._request(item.url, _extends({}, item, {
|
|
6141
6103
|
type: "json"
|
|
6142
6104
|
})).then(function(data) {
|
|
6143
6105
|
return data.belongToAtlas ? _this._loadFromAtlas(resourceManager, data) : _this._loadFromTexture(resourceManager, data);
|
|
@@ -6145,15 +6107,13 @@ var SpriteLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6145
6107
|
};
|
|
6146
6108
|
_proto._loadFromAtlas = function _loadFromAtlas(resourceManager, data) {
|
|
6147
6109
|
var _this = this;
|
|
6148
|
-
return resourceManager
|
|
6149
|
-
.getResourceByRef(data.belongToAtlas).then(function(atlas) {
|
|
6110
|
+
return resourceManager.getResourceByRef(data.belongToAtlas).then(function(atlas) {
|
|
6150
6111
|
return atlas.getSprite(data.fullPath) || _this._loadFromTexture(resourceManager, data);
|
|
6151
6112
|
});
|
|
6152
6113
|
};
|
|
6153
6114
|
_proto._loadFromTexture = function _loadFromTexture(resourceManager, data) {
|
|
6154
6115
|
if (data.texture) {
|
|
6155
|
-
return resourceManager
|
|
6156
|
-
.getResourceByRef(data.texture).then(function(texture) {
|
|
6116
|
+
return resourceManager.getResourceByRef(data.texture).then(function(texture) {
|
|
6157
6117
|
var sprite = new Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border);
|
|
6158
6118
|
var width = data.width, height = data.height;
|
|
6159
6119
|
width === undefined || (sprite.width = width);
|
|
@@ -6185,7 +6145,6 @@ var TextLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6185
6145
|
}
|
|
6186
6146
|
var _proto = TextLoader.prototype;
|
|
6187
6147
|
_proto.load = function load(item, resourceManager) {
|
|
6188
|
-
// @ts-ignore
|
|
6189
6148
|
return resourceManager._request(item.url, _extends({}, item, {
|
|
6190
6149
|
type: "text"
|
|
6191
6150
|
})).then(function(text) {
|
|
@@ -6211,14 +6170,12 @@ var TextureLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6211
6170
|
_proto.load = function load(item, resourceManager) {
|
|
6212
6171
|
var _this = this;
|
|
6213
6172
|
var url = item.url;
|
|
6214
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
6215
6173
|
var remoteUrl = resourceManager._getRemoteUrl(url);
|
|
6216
6174
|
var requestConfig = _extends({}, item, {
|
|
6217
6175
|
type: "arraybuffer"
|
|
6218
6176
|
});
|
|
6219
6177
|
return new AssetPromise(function(resolve, reject, setTaskCompleteProgress, setTaskDetailProgress) {
|
|
6220
|
-
resourceManager
|
|
6221
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
|
|
6178
|
+
resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
|
|
6222
6179
|
_this._decode(buffer, item, resourceManager).then(function(texture) {
|
|
6223
6180
|
resourceManager.addContentRestorer(new TextureContentRestorer(texture, url, remoteUrl, requestConfig));
|
|
6224
6181
|
resolve(texture);
|
|
@@ -6304,8 +6261,7 @@ var TextureContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
|
|
|
6304
6261
|
var _proto = TextureContentRestorer.prototype;
|
|
6305
6262
|
_proto.restoreContent = function restoreContent() {
|
|
6306
6263
|
var _this = this;
|
|
6307
|
-
return this.resource.engine.resourceManager
|
|
6308
|
-
._requestByRemoteUrl(this.remoteUrl, this.requestConfig).then(function(buffer) {
|
|
6264
|
+
return this.resource.engine.resourceManager._requestByRemoteUrl(this.remoteUrl, this.requestConfig).then(function(buffer) {
|
|
6309
6265
|
if (FileHeader.checkMagic(buffer)) {
|
|
6310
6266
|
return decode(buffer, _this.resource.engine, _this.resource);
|
|
6311
6267
|
}
|
|
@@ -6359,11 +6315,9 @@ var AudioLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6359
6315
|
var requestConfig = _extends({}, item, {
|
|
6360
6316
|
type: "arraybuffer"
|
|
6361
6317
|
});
|
|
6362
|
-
resourceManager
|
|
6363
|
-
._request(url, requestConfig).then(function(arrayBuffer) {
|
|
6318
|
+
resourceManager._request(url, requestConfig).then(function(arrayBuffer) {
|
|
6364
6319
|
var audioClip = new AudioClip(resourceManager.engine);
|
|
6365
6320
|
AudioLoader._getDecodeContext().decodeAudioData(arrayBuffer).then(function(result) {
|
|
6366
|
-
// @ts-ignore
|
|
6367
6321
|
audioClip._setAudioSource(result);
|
|
6368
6322
|
if (url.indexOf("data:") !== 0) {
|
|
6369
6323
|
var index = url.lastIndexOf("/");
|
|
@@ -6405,16 +6359,15 @@ var ShaderLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6405
6359
|
var _proto = ShaderLoader.prototype;
|
|
6406
6360
|
_proto.load = function load(item, resourceManager) {
|
|
6407
6361
|
var url = item.url;
|
|
6408
|
-
// @ts-expect-error _request is @internal
|
|
6409
6362
|
return resourceManager._request(url, _extends({}, item, {
|
|
6410
6363
|
type: "text"
|
|
6411
6364
|
})).then(function(code) {
|
|
6412
6365
|
var source = code.trimStart();
|
|
6413
|
-
|
|
6414
|
-
|
|
6415
|
-
|
|
6366
|
+
var shader = source.startsWith("{") ? Shader._createFromPrecompiled(JSON.parse(source)) : Shader.create(code, undefined, url);
|
|
6367
|
+
if (!shader) {
|
|
6368
|
+
throw new Error('ShaderLoader: failed to create shader "' + url + '".');
|
|
6416
6369
|
}
|
|
6417
|
-
return
|
|
6370
|
+
return shader;
|
|
6418
6371
|
});
|
|
6419
6372
|
};
|
|
6420
6373
|
return ShaderLoader;
|
|
@@ -6433,8 +6386,7 @@ var PhysicsMaterialLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6433
6386
|
}
|
|
6434
6387
|
var _proto = PhysicsMaterialLoader.prototype;
|
|
6435
6388
|
_proto.load = function load(item, resourceManager) {
|
|
6436
|
-
return resourceManager
|
|
6437
|
-
._request(item.url, _extends({}, item, {
|
|
6389
|
+
return resourceManager._request(item.url, _extends({}, item, {
|
|
6438
6390
|
type: "json"
|
|
6439
6391
|
})).then(function(data) {
|
|
6440
6392
|
var physicsMaterial = new PhysicsMaterial();
|
|
@@ -6462,10 +6414,8 @@ var RenderTargetLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6462
6414
|
var _proto = RenderTargetLoader.prototype;
|
|
6463
6415
|
_proto.load = function load(item, resourceManager) {
|
|
6464
6416
|
var engine = resourceManager.engine;
|
|
6465
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
6466
6417
|
var remoteAssetBaseURL = resourceManager._getRemoteUrl(item.url);
|
|
6467
|
-
return resourceManager
|
|
6468
|
-
._requestByRemoteUrl(remoteAssetBaseURL, _extends({}, item, {
|
|
6418
|
+
return resourceManager._requestByRemoteUrl(remoteAssetBaseURL, _extends({}, item, {
|
|
6469
6419
|
type: "json"
|
|
6470
6420
|
})).then(function(data) {
|
|
6471
6421
|
var width = data.width, height = data.height, colorFormats = data.colorFormats, depthFormat = data.depthFormat, antiAliasing = data.antiAliasing, autoGenerateMipmaps = data.autoGenerateMipmaps;
|
|
@@ -6490,7 +6440,6 @@ var RenderTargetLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6490
6440
|
if (autoGenerateMipmaps != null) rt.autoGenerateMipmaps = autoGenerateMipmaps;
|
|
6491
6441
|
// Notify pending sub-asset requests for colorTextures
|
|
6492
6442
|
for(var i = 0, n = colorTextures.length; i < n; i++){
|
|
6493
|
-
// @ts-ignore
|
|
6494
6443
|
resourceManager._onSubAssetSuccess(remoteAssetBaseURL, "colorTextures[" + i + "]", colorTextures[i]);
|
|
6495
6444
|
}
|
|
6496
6445
|
return rt;
|
|
@@ -6506,7 +6455,6 @@ RenderTargetLoader = __decorate([
|
|
|
6506
6455
|
|
|
6507
6456
|
function loadRef(refs, index, resourceManager, label) {
|
|
6508
6457
|
var ref = resolveRefItem(refs, index, "SceneLoader", label);
|
|
6509
|
-
// @ts-ignore
|
|
6510
6458
|
return resourceManager.getResourceByRef(ref);
|
|
6511
6459
|
}
|
|
6512
6460
|
/**
|
|
@@ -6629,8 +6577,7 @@ var SceneLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6629
6577
|
_proto.load = function load(item, resourceManager) {
|
|
6630
6578
|
var engine = resourceManager.engine;
|
|
6631
6579
|
return new AssetPromise(function(resolve, reject, setTaskCompleteProgress) {
|
|
6632
|
-
resourceManager
|
|
6633
|
-
._request(item.url, _extends({}, item, {
|
|
6580
|
+
resourceManager._request(item.url, _extends({}, item, {
|
|
6634
6581
|
type: "json"
|
|
6635
6582
|
})).then(function(data) {
|
|
6636
6583
|
var _data_scene_name;
|
|
@@ -6998,7 +6945,6 @@ var GALACEAN_materials_remap = /*#__PURE__*/ function(GLTFExtensionParser) {
|
|
|
6998
6945
|
var _proto = GALACEAN_materials_remap.prototype;
|
|
6999
6946
|
_proto.createAndParse = function createAndParse(context, schema) {
|
|
7000
6947
|
var engine = context.glTFResource.engine;
|
|
7001
|
-
// @ts-ignore
|
|
7002
6948
|
var promise = engine.resourceManager.getResourceByRef(schema);
|
|
7003
6949
|
context._addTaskCompletePromise(promise);
|
|
7004
6950
|
return promise;
|