@galacean/engine-loader 2.0.0-alpha.44 → 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 +35 -107
- package/dist/main.js.map +1 -1
- package/dist/module.js +35 -107
- 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/main.js
CHANGED
|
@@ -898,7 +898,6 @@ var ReflectionParser = /*#__PURE__*/ function() {
|
|
|
898
898
|
} catch (error) {
|
|
899
899
|
return Promise.reject(error);
|
|
900
900
|
}
|
|
901
|
-
// @ts-ignore
|
|
902
901
|
return context.resourceManager.getResourceByRef(refItem).then(function(resource) {
|
|
903
902
|
if (resource && context.type === ParserType.Prefab) {
|
|
904
903
|
// @ts-ignore
|
|
@@ -1346,7 +1345,6 @@ function _instanceof(left, right) {
|
|
|
1346
1345
|
// ReferResource requires the engine to be passed as a parameter, which prevents cross-engine reuse.
|
|
1347
1346
|
// A refactor of ReferResource will be needed in the future.
|
|
1348
1347
|
if (_instanceof(resource, engineCore.ReferResource)) {
|
|
1349
|
-
// @ts-ignore
|
|
1350
1348
|
resource._associationSuperResource(this);
|
|
1351
1349
|
}
|
|
1352
1350
|
};
|
|
@@ -1357,7 +1355,6 @@ function _instanceof(left, right) {
|
|
|
1357
1355
|
(_this__root = this._root) == null ? void 0 : _this__root.destroy();
|
|
1358
1356
|
this._dependenceAssets.forEach(function(asset) {
|
|
1359
1357
|
if (_instanceof(asset, engineCore.ReferResource)) {
|
|
1360
|
-
// @ts-ignore
|
|
1361
1358
|
asset._disassociationSuperResource(_this);
|
|
1362
1359
|
}
|
|
1363
1360
|
});
|
|
@@ -1575,8 +1572,7 @@ function _instanceof(left, right) {
|
|
|
1575
1572
|
} catch (error) {
|
|
1576
1573
|
return Promise.reject(error);
|
|
1577
1574
|
}
|
|
1578
|
-
return engine.resourceManager
|
|
1579
|
-
.getResourceByRef(refItem).then(function(prefabResource) {
|
|
1575
|
+
return engine.resourceManager.getResourceByRef(refItem).then(function(prefabResource) {
|
|
1580
1576
|
var entity = _instanceof(prefabResource, PrefabResource) ? prefabResource.instantiate() : prefabResource.instantiateSceneRoot();
|
|
1581
1577
|
_this._onEntityCreated(entity);
|
|
1582
1578
|
return entity;
|
|
@@ -1639,7 +1635,6 @@ function _instanceof(left, right) {
|
|
|
1639
1635
|
var resourceManager = context.resourceManager;
|
|
1640
1636
|
var refs = data.refs;
|
|
1641
1637
|
for(var i = 0, n = refs.length; i < n; i++){
|
|
1642
|
-
// @ts-ignore
|
|
1643
1638
|
context._addDependentAsset(resourceManager.getResourceByRef(refs[i]));
|
|
1644
1639
|
}
|
|
1645
1640
|
};
|
|
@@ -1704,8 +1699,7 @@ var AnimationClipLoader = /*#__PURE__*/ function(Loader) {
|
|
|
1704
1699
|
_proto.load = function load(item, resourceManager) {
|
|
1705
1700
|
var _this = this;
|
|
1706
1701
|
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
1707
|
-
resourceManager
|
|
1708
|
-
._request(item.url, _extends({}, item, {
|
|
1702
|
+
resourceManager._request(item.url, _extends({}, item, {
|
|
1709
1703
|
type: "arraybuffer"
|
|
1710
1704
|
})).then(function(data) {
|
|
1711
1705
|
return decode(data, resourceManager.engine).then(function(clip) {
|
|
@@ -1729,8 +1723,7 @@ var AnimationClipLoader = /*#__PURE__*/ function(Loader) {
|
|
|
1729
1723
|
var value = keyframe.value;
|
|
1730
1724
|
if ((typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && (value == null ? void 0 : value.url)) {
|
|
1731
1725
|
return new Promise(function(resolve) {
|
|
1732
|
-
resourceManager
|
|
1733
|
-
.getResourceByRef(value).then(function(asset) {
|
|
1726
|
+
resourceManager.getResourceByRef(value).then(function(asset) {
|
|
1734
1727
|
keyframe.value = asset;
|
|
1735
1728
|
resolve(keyframe.value);
|
|
1736
1729
|
});
|
|
@@ -1756,8 +1749,7 @@ var AnimatorControllerLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
1756
1749
|
_proto.load = function load(item, resourceManager) {
|
|
1757
1750
|
var _this = this;
|
|
1758
1751
|
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
1759
|
-
resourceManager
|
|
1760
|
-
._request(item.url, _extends({}, item, {
|
|
1752
|
+
resourceManager._request(item.url, _extends({}, item, {
|
|
1761
1753
|
type: "json"
|
|
1762
1754
|
})).then(function(data) {
|
|
1763
1755
|
var animatorController = new engineCore.AnimatorController(resourceManager.engine);
|
|
@@ -1786,7 +1778,6 @@ var AnimatorControllerLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
1786
1778
|
statesMap[id] = state;
|
|
1787
1779
|
if (clipData) {
|
|
1788
1780
|
promises.push(new Promise(function(resolve) {
|
|
1789
|
-
//@ts-ignore
|
|
1790
1781
|
resourceManager.getResourceByRef(clipData).then(function(clip) {
|
|
1791
1782
|
resolve({
|
|
1792
1783
|
layerIndex: layerIndex,
|
|
@@ -1843,7 +1834,6 @@ var AnimatorControllerLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
1843
1834
|
transition.exitTime = transitionData.exitTime;
|
|
1844
1835
|
transition.solo = transitionData.solo;
|
|
1845
1836
|
transition.mute = transitionData.mute;
|
|
1846
|
-
// @ts-ignore
|
|
1847
1837
|
transition._isExit = transitionData.isExit;
|
|
1848
1838
|
transition.destinationState = destinationState;
|
|
1849
1839
|
transitionData.conditions.forEach(function(conditionData) {
|
|
@@ -2488,14 +2478,12 @@ exports.KTX2Loader = /*#__PURE__*/ function(Loader) {
|
|
|
2488
2478
|
/**
|
|
2489
2479
|
* @internal
|
|
2490
2480
|
*/ _proto.load = function load(item, resourceManager) {
|
|
2491
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
2492
2481
|
var remoteUrl = resourceManager._getRemoteUrl(item.url);
|
|
2493
2482
|
return new engineCore.AssetPromise(function(resolve, reject, setTaskCompleteProgress, setTaskDetailProgress) {
|
|
2494
2483
|
var requestConfig = _extends({}, item, {
|
|
2495
2484
|
type: "arraybuffer"
|
|
2496
2485
|
});
|
|
2497
|
-
resourceManager
|
|
2498
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
|
|
2486
|
+
resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
|
|
2499
2487
|
return KTX2Loader._parseBuffer(new Uint8Array(buffer), resourceManager.engine, item.params).then(function(param) {
|
|
2500
2488
|
var ktx2Container = param.ktx2Container, engine = param.engine, result = param.result, targetFormat = param.targetFormat, params = param.params;
|
|
2501
2489
|
return KTX2Loader._createTextureByBuffer(engine, ktx2Container.isSRGB, result, targetFormat, params);
|
|
@@ -2695,8 +2683,7 @@ var KTX2ContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
|
|
|
2695
2683
|
var _this1 = this, resource = _this1.resource, requestConfig = _this1.requestConfig;
|
|
2696
2684
|
var engine = resource.engine;
|
|
2697
2685
|
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
2698
|
-
engine.resourceManager
|
|
2699
|
-
._requestByRemoteUrl(_this.remoteUrl, requestConfig).then(function(buffer) {
|
|
2686
|
+
engine.resourceManager._requestByRemoteUrl(_this.remoteUrl, requestConfig).then(function(buffer) {
|
|
2700
2687
|
return exports.KTX2Loader._parseBuffer(new Uint8Array(buffer), engine, requestConfig.params).then(function(param) {
|
|
2701
2688
|
var ktx2Container = param.ktx2Container, engine = param.engine, result = param.result, targetFormat = param.targetFormat, params = param.params;
|
|
2702
2689
|
return exports.KTX2Loader._createTextureByBuffer(engine, ktx2Container.isSRGB, result, targetFormat, params, resource);
|
|
@@ -2714,15 +2701,13 @@ var AmbientLightLoader = /*#__PURE__*/ function(Loader) {
|
|
|
2714
2701
|
}
|
|
2715
2702
|
var _proto = AmbientLightLoader.prototype;
|
|
2716
2703
|
_proto.load = function load(item, resourceManager) {
|
|
2717
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
2718
2704
|
var remoteUrl = resourceManager._getRemoteUrl(item.url);
|
|
2719
2705
|
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
2720
2706
|
var requestConfig = _extends({}, item, {
|
|
2721
2707
|
type: "arraybuffer"
|
|
2722
2708
|
});
|
|
2723
2709
|
var engine = resourceManager.engine;
|
|
2724
|
-
resourceManager
|
|
2725
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).then(function(buffer) {
|
|
2710
|
+
resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).then(function(buffer) {
|
|
2726
2711
|
var header = FileHeader.decode(buffer);
|
|
2727
2712
|
var dataOffset = header.headerLength;
|
|
2728
2713
|
var sh = new engineMath.SphericalHarmonics3();
|
|
@@ -2789,8 +2774,7 @@ AmbientLightLoader = __decorate([
|
|
|
2789
2774
|
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
2790
2775
|
var resource = _this.resource;
|
|
2791
2776
|
var engine = resource.engine;
|
|
2792
|
-
engine.resourceManager
|
|
2793
|
-
._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(buffer) {
|
|
2777
|
+
engine.resourceManager._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(buffer) {
|
|
2794
2778
|
var header = FileHeader.decode(buffer);
|
|
2795
2779
|
var dataOffset = header.headerLength;
|
|
2796
2780
|
var textureOffset = dataOffset + AmbientLightLoader._shByteLength;
|
|
@@ -2841,14 +2825,12 @@ var FontLoader = /*#__PURE__*/ function(Loader) {
|
|
|
2841
2825
|
_proto.load = function load(item, resourceManager) {
|
|
2842
2826
|
var _this = this;
|
|
2843
2827
|
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
2844
|
-
resourceManager
|
|
2845
|
-
._request(item.url, _extends({}, item, {
|
|
2828
|
+
resourceManager._request(item.url, _extends({}, item, {
|
|
2846
2829
|
type: "json"
|
|
2847
2830
|
})).then(function(data) {
|
|
2848
2831
|
var fontName = data.fontName, fontUrl = data.fontUrl;
|
|
2849
2832
|
if (fontUrl) {
|
|
2850
2833
|
var absoluteUrl = engineCore.Utils.resolveAbsoluteUrl(item.url, fontUrl);
|
|
2851
|
-
// @ts-ignore
|
|
2852
2834
|
var remoteUrl = resourceManager._getRemoteUrl(absoluteUrl);
|
|
2853
2835
|
_this._registerFont(fontName, remoteUrl).then(function() {
|
|
2854
2836
|
var font = new engineCore.Font(resourceManager.engine, fontName);
|
|
@@ -2962,7 +2944,6 @@ function getMeshoptDecoder() {
|
|
|
2962
2944
|
73,
|
|
2963
2945
|
115
|
|
2964
2946
|
]);
|
|
2965
|
-
// @ts-ignore
|
|
2966
2947
|
var wasm = engineCore.SystemInfo._detectSIMDSupported() ? wasm_simd : wasm_base;
|
|
2967
2948
|
var instance;
|
|
2968
2949
|
ready = WebAssembly.instantiate(unpack(wasm)).then(function(result) {
|
|
@@ -3113,19 +3094,18 @@ function getMeshoptDecoder() {
|
|
|
3113
3094
|
_proto._onDestroy = function _onDestroy() {
|
|
3114
3095
|
ReferResource.prototype._onDestroy.call(this);
|
|
3115
3096
|
var _this = this, textures = _this.textures, materials = _this.materials, meshes = _this.meshes;
|
|
3116
|
-
textures && this.
|
|
3117
|
-
materials && this.
|
|
3097
|
+
textures && this._disassociateResources(textures);
|
|
3098
|
+
materials && this._disassociateResources(materials);
|
|
3118
3099
|
if (meshes) {
|
|
3119
3100
|
for(var i = 0, n = meshes.length; i < n; i++){
|
|
3120
3101
|
var meshArr = meshes[i];
|
|
3121
|
-
meshArr && this.
|
|
3102
|
+
meshArr && this._disassociateResources(meshArr);
|
|
3122
3103
|
}
|
|
3123
3104
|
}
|
|
3124
3105
|
};
|
|
3125
|
-
_proto.
|
|
3106
|
+
_proto._disassociateResources = function _disassociateResources(resources) {
|
|
3126
3107
|
for(var i = 0, n = resources.length; i < n; i++){
|
|
3127
|
-
var
|
|
3128
|
-
_resources_i;
|
|
3108
|
+
var _resources_i;
|
|
3129
3109
|
(_resources_i = resources[i]) == null ? void 0 : _resources_i._disassociationSuperResource(this);
|
|
3130
3110
|
}
|
|
3131
3111
|
};
|
|
@@ -3344,7 +3324,6 @@ function getMeshoptDecoder() {
|
|
|
3344
3324
|
detail.total = total;
|
|
3345
3325
|
_this._setTaskDetailProgress(url, loaded, total);
|
|
3346
3326
|
};
|
|
3347
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
3348
3327
|
this._remoteAssetBaseURL = resourceManager._getRemoteUrl(glTFResource.url);
|
|
3349
3328
|
this.contentRestorer = new GLTFContentRestorer(glTFResource);
|
|
3350
3329
|
}
|
|
@@ -3447,15 +3426,12 @@ function getMeshoptDecoder() {
|
|
|
3447
3426
|
if (type === 7) {
|
|
3448
3427
|
for(var i = 0, length = item.length; i < length; i++){
|
|
3449
3428
|
var mesh = item[i];
|
|
3450
|
-
// @ts-ignore
|
|
3451
3429
|
_this.resourceManager._onSubAssetSuccess(remoteAssetBaseURL, glTFResourceKey + "[" + index + "][" + i + "]", mesh);
|
|
3452
3430
|
}
|
|
3453
3431
|
} else {
|
|
3454
|
-
// @ts-ignore
|
|
3455
3432
|
_this.resourceManager._onSubAssetSuccess(remoteAssetBaseURL, "" + glTFResourceKey + (index === undefined ? "" : "[" + index + "]"), item);
|
|
3456
3433
|
var _this_glTF_scene;
|
|
3457
3434
|
if (type === 2 && ((_this_glTF_scene = _this.glTF.scene) != null ? _this_glTF_scene : 0) === index) {
|
|
3458
|
-
// @ts-ignore
|
|
3459
3435
|
_this.resourceManager._onSubAssetSuccess(remoteAssetBaseURL, "defaultSceneRoot", item);
|
|
3460
3436
|
}
|
|
3461
3437
|
}
|
|
@@ -4259,10 +4235,8 @@ exports.GLTFSchemaParser = /*#__PURE__*/ function(GLTFParser) {
|
|
|
4259
4235
|
var requestConfig = {
|
|
4260
4236
|
type: "arraybuffer"
|
|
4261
4237
|
};
|
|
4262
|
-
// @ts-ignore
|
|
4263
4238
|
var remoteUrl = resourceManager._getRemoteUrl(url);
|
|
4264
|
-
return resourceManager
|
|
4265
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(undefined, context._onTaskDetail).then(function(buffer) {
|
|
4239
|
+
return resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(undefined, context._onTaskDetail).then(function(buffer) {
|
|
4266
4240
|
var parseResult = GLTFUtils.parseGLB(context, buffer);
|
|
4267
4241
|
// If the buffer is a GLB file, we need to restore the buffer data
|
|
4268
4242
|
if (parseResult == null ? void 0 : parseResult.glTF) {
|
|
@@ -4495,15 +4469,13 @@ exports.GLTFBufferParser = /*#__PURE__*/ function(GLTFParser) {
|
|
|
4495
4469
|
var glTFResource = context.glTFResource, contentRestorer = context.contentRestorer, resourceManager = context.resourceManager;
|
|
4496
4470
|
var url = glTFResource.url;
|
|
4497
4471
|
var absoluteUrl = engineCore.Utils.resolveAbsoluteUrl(url, bufferInfo.uri);
|
|
4498
|
-
// @ts-ignore
|
|
4499
4472
|
var remoteUrl = resourceManager._getRemoteUrl(absoluteUrl);
|
|
4500
4473
|
var restoreBufferRequests = contentRestorer.bufferRequests;
|
|
4501
4474
|
var requestConfig = {
|
|
4502
4475
|
type: "arraybuffer"
|
|
4503
4476
|
};
|
|
4504
4477
|
restoreBufferRequests.push(new BufferRequestInfo(remoteUrl, requestConfig));
|
|
4505
|
-
var promise = resourceManager
|
|
4506
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(undefined, context._onTaskDetail);
|
|
4478
|
+
var promise = resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(undefined, context._onTaskDetail);
|
|
4507
4479
|
context._addTaskCompletePromise(promise);
|
|
4508
4480
|
return promise;
|
|
4509
4481
|
};
|
|
@@ -4525,7 +4497,6 @@ exports.GLTFEntityParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
4525
4497
|
var engine = glTFResource.engine;
|
|
4526
4498
|
var matrix = entityInfo.matrix, translation = entityInfo.translation, rotation = entityInfo.rotation, scale = entityInfo.scale, extensions = entityInfo.extensions;
|
|
4527
4499
|
var entity = new engineCore.Entity(engine, entityInfo.name || "_GLTF_ENTITY_" + index);
|
|
4528
|
-
// @ts-ignore
|
|
4529
4500
|
entity._markAsTemplate(glTFResource);
|
|
4530
4501
|
var transform = entity.transform;
|
|
4531
4502
|
if (matrix) {
|
|
@@ -4585,10 +4556,8 @@ exports.GLTFMaterialParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
4585
4556
|
GLTFMaterialParser._parseStandardProperty(context, material, materialInfo);
|
|
4586
4557
|
}
|
|
4587
4558
|
return engineCore.AssetPromise.resolve(material).then(function(material) {
|
|
4588
|
-
// @ts-ignore
|
|
4589
4559
|
material || (material = engine._basicResources._getBlinnPhongMaterial());
|
|
4590
4560
|
GLTFParser.executeExtensionsAdditiveAndParse(extensions, context, material, materialInfo);
|
|
4591
|
-
// @ts-ignore
|
|
4592
4561
|
material._associationSuperResource(glTFResource);
|
|
4593
4562
|
return material;
|
|
4594
4563
|
});
|
|
@@ -4709,19 +4678,16 @@ exports.GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
4709
4678
|
var mesh = GLTFParser.executeExtensionsCreateAndParse(gltfPrimitive.extensions, context, gltfPrimitive, meshInfo);
|
|
4710
4679
|
if (mesh) {
|
|
4711
4680
|
if (_instanceof(mesh, engineCore.ModelMesh)) {
|
|
4712
|
-
// @ts-ignore
|
|
4713
4681
|
mesh._associationSuperResource(glTFResource);
|
|
4714
4682
|
resolve(mesh);
|
|
4715
4683
|
} else {
|
|
4716
4684
|
mesh.then(function(mesh) {
|
|
4717
|
-
// @ts-ignore
|
|
4718
4685
|
mesh._associationSuperResource(glTFResource);
|
|
4719
4686
|
resolve(mesh);
|
|
4720
4687
|
});
|
|
4721
4688
|
}
|
|
4722
4689
|
} else {
|
|
4723
4690
|
var mesh1 = new engineCore.ModelMesh(engine, meshInfo.name || i + "");
|
|
4724
|
-
// @ts-ignore
|
|
4725
4691
|
mesh1._associationSuperResource(glTFResource);
|
|
4726
4692
|
var meshRestoreInfo = new ModelMeshRestoreInfo();
|
|
4727
4693
|
meshRestoreInfo.mesh = mesh1;
|
|
@@ -4918,7 +4884,6 @@ exports.GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
4918
4884
|
var sceneNodes = sceneInfo.nodes || [];
|
|
4919
4885
|
var sceneRoot;
|
|
4920
4886
|
sceneRoot = new engineCore.Entity(engine, "GLTF_ROOT");
|
|
4921
|
-
// @ts-ignore
|
|
4922
4887
|
sceneRoot._markAsTemplate(glTFResource);
|
|
4923
4888
|
for(var i = 0; i < sceneNodes.length; i++){
|
|
4924
4889
|
sceneRoot.addChild(context.get(GLTFParserType.Entity, sceneNodes[i]));
|
|
@@ -5040,7 +5005,6 @@ exports.GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
5040
5005
|
GLTFParser.executeExtensionsAdditiveAndParse(glTFPrimitive.extensions, context, renderer, glTFPrimitive);
|
|
5041
5006
|
};
|
|
5042
5007
|
var meshes = param[0], skin = param[1], materials = param[2];
|
|
5043
|
-
// @ts-ignore
|
|
5044
5008
|
var basicResources = context.glTFResource.engine._basicResources;
|
|
5045
5009
|
for(var i = 0; i < rendererCount; i++)_loop(i);
|
|
5046
5010
|
}).catch(function(e) {
|
|
@@ -5168,7 +5132,6 @@ exports.GLTFTextureParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
5168
5132
|
}
|
|
5169
5133
|
return engineCore.AssetPromise.resolve(texture).then(function(texture) {
|
|
5170
5134
|
GLTFParser.executeExtensionsAdditiveAndParse(extensions, context, texture, textureInfo);
|
|
5171
|
-
// @ts-ignore
|
|
5172
5135
|
texture._associationSuperResource(glTFResource);
|
|
5173
5136
|
return texture;
|
|
5174
5137
|
});
|
|
@@ -5452,8 +5415,7 @@ var PrefabLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5452
5415
|
_proto.load = function load(item, resourceManager) {
|
|
5453
5416
|
var engine = resourceManager.engine;
|
|
5454
5417
|
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
5455
|
-
resourceManager
|
|
5456
|
-
._request(item.url, _extends({}, item, {
|
|
5418
|
+
resourceManager._request(item.url, _extends({}, item, {
|
|
5457
5419
|
type: "json"
|
|
5458
5420
|
})).then(function(data) {
|
|
5459
5421
|
PrefabParser.parse(engine, item.url, data).then(resolve).catch(reject);
|
|
@@ -5475,7 +5437,6 @@ var JSONLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5475
5437
|
}
|
|
5476
5438
|
var _proto = JSONLoader.prototype;
|
|
5477
5439
|
_proto.load = function load(item, resourceManager) {
|
|
5478
|
-
// @ts-ignore
|
|
5479
5440
|
return resourceManager._request(item.url, _extends({}, item, {
|
|
5480
5441
|
type: "json"
|
|
5481
5442
|
})).then(function(data) {
|
|
@@ -5686,10 +5647,9 @@ var KTXCubeLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5686
5647
|
_proto.load = function load(item, resourceManager) {
|
|
5687
5648
|
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
5688
5649
|
Promise.all(item.urls.map(function(url) {
|
|
5689
|
-
return(
|
|
5690
|
-
resourceManager._request(url, _extends({}, item, {
|
|
5650
|
+
return resourceManager._request(url, _extends({}, item, {
|
|
5691
5651
|
type: "arraybuffer"
|
|
5692
|
-
}))
|
|
5652
|
+
}));
|
|
5693
5653
|
})).then(function(data) {
|
|
5694
5654
|
var parsedData = parseCubeKTX(data);
|
|
5695
5655
|
var width = parsedData.width, mipmapsFaces = parsedData.mipmapsFaces, engineFormat = parsedData.engineFormat;
|
|
@@ -5721,14 +5681,12 @@ var KTXLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5721
5681
|
}
|
|
5722
5682
|
var _proto = KTXLoader.prototype;
|
|
5723
5683
|
_proto.load = function load(item, resourceManager) {
|
|
5724
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
5725
5684
|
var remoteUrl = resourceManager._getRemoteUrl(item.url);
|
|
5726
5685
|
var requestConfig = _extends({}, item, {
|
|
5727
5686
|
type: "arraybuffer"
|
|
5728
5687
|
});
|
|
5729
5688
|
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
5730
|
-
resourceManager
|
|
5731
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).then(function(bin) {
|
|
5689
|
+
resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).then(function(bin) {
|
|
5732
5690
|
var parsedData = parseSingleKTX(bin);
|
|
5733
5691
|
var width = parsedData.width, height = parsedData.height, mipmaps = parsedData.mipmaps, engineFormat = parsedData.engineFormat;
|
|
5734
5692
|
var mipmap = mipmaps.length > 1;
|
|
@@ -5764,8 +5722,7 @@ var KTXContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
|
|
|
5764
5722
|
var resource = this.resource;
|
|
5765
5723
|
var engine = resource.engine;
|
|
5766
5724
|
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
5767
|
-
engine.resourceManager
|
|
5768
|
-
._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(bin) {
|
|
5725
|
+
engine.resourceManager._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(bin) {
|
|
5769
5726
|
var mipmaps = parseSingleKTX(bin).mipmaps;
|
|
5770
5727
|
for(var miplevel = 0; miplevel < mipmaps.length; miplevel++){
|
|
5771
5728
|
var _mipmaps_miplevel = mipmaps[miplevel], width = _mipmaps_miplevel.width, height = _mipmaps_miplevel.height, data = _mipmaps_miplevel.data;
|
|
@@ -5789,7 +5746,6 @@ var MaterialLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5789
5746
|
var _proto = MaterialLoader.prototype;
|
|
5790
5747
|
_proto.load = function load(item, resourceManager) {
|
|
5791
5748
|
var _this = this;
|
|
5792
|
-
// @ts-expect-error _request is @internal
|
|
5793
5749
|
return resourceManager._request(item.url, _extends({}, item, {
|
|
5794
5750
|
type: "json"
|
|
5795
5751
|
})).then(function(materialSchema) {
|
|
@@ -5808,7 +5764,6 @@ var MaterialLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5808
5764
|
if (!shaderRef) {
|
|
5809
5765
|
throw new Error('MaterialLoader: shader "' + shaderName + '" not found.');
|
|
5810
5766
|
}
|
|
5811
|
-
// @ts-expect-error getResourceByRef is @internal
|
|
5812
5767
|
return resourceManager.getResourceByRef(shaderRef).then(function(shader) {
|
|
5813
5768
|
if (!_instanceof(shader, engineCore.Shader)) {
|
|
5814
5769
|
throw new Error('MaterialLoader: shader reference "' + shaderRef.url + '" did not resolve to a Shader.');
|
|
@@ -5837,8 +5792,7 @@ var MaterialLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5837
5792
|
materialShaderData.setFloat(key, value);
|
|
5838
5793
|
break;
|
|
5839
5794
|
case MaterialLoaderType.Texture:
|
|
5840
|
-
texturePromises.push(
|
|
5841
|
-
engine.resourceManager.getResourceByRef(value).then(function(texture) {
|
|
5795
|
+
texturePromises.push(engine.resourceManager.getResourceByRef(value).then(function(texture) {
|
|
5842
5796
|
if (!_instanceof(texture, engineCore.Texture)) {
|
|
5843
5797
|
throw new Error('MaterialLoader: texture reference "' + value.url + '" did not resolve to a Texture.');
|
|
5844
5798
|
}
|
|
@@ -5894,11 +5848,9 @@ var MeshLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5894
5848
|
var requestConfig = _extends({}, item, {
|
|
5895
5849
|
type: "arraybuffer"
|
|
5896
5850
|
});
|
|
5897
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
5898
5851
|
var remoteUrl = resourceManager._getRemoteUrl(item.url);
|
|
5899
5852
|
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
5900
|
-
resourceManager
|
|
5901
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).then(function(data) {
|
|
5853
|
+
resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).then(function(data) {
|
|
5902
5854
|
return decode(data, resourceManager.engine);
|
|
5903
5855
|
}).then(function(mesh) {
|
|
5904
5856
|
resourceManager.addContentRestorer(new MeshContentRestorer(mesh, remoteUrl, requestConfig));
|
|
@@ -5926,8 +5878,7 @@ var MeshContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
|
|
|
5926
5878
|
var resource = this.resource;
|
|
5927
5879
|
var engine = resource.engine;
|
|
5928
5880
|
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
5929
|
-
engine.resourceManager
|
|
5930
|
-
._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(data) {
|
|
5881
|
+
engine.resourceManager._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(data) {
|
|
5931
5882
|
return decode(data, engine, resource);
|
|
5932
5883
|
}).then(function(mesh) {
|
|
5933
5884
|
resolve(mesh);
|
|
@@ -5945,8 +5896,7 @@ var PrimitiveMeshLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5945
5896
|
var _proto = PrimitiveMeshLoader.prototype;
|
|
5946
5897
|
_proto.load = function load(item, resourceManager) {
|
|
5947
5898
|
var engine = resourceManager.engine;
|
|
5948
|
-
return resourceManager
|
|
5949
|
-
._request(item.url, _extends({}, item, {
|
|
5899
|
+
return resourceManager._request(item.url, _extends({}, item, {
|
|
5950
5900
|
type: "json"
|
|
5951
5901
|
})).then(function(data) {
|
|
5952
5902
|
switch(data.type){
|
|
@@ -5984,8 +5934,7 @@ var ProjectLoader = /*#__PURE__*/ function(Loader) {
|
|
|
5984
5934
|
_proto.load = function load(item, resourceManager) {
|
|
5985
5935
|
var engine = resourceManager.engine;
|
|
5986
5936
|
return new engineCore.AssetPromise(function(resolve, reject, onTaskCompeteProgress) {
|
|
5987
|
-
resourceManager
|
|
5988
|
-
._request(item.url, _extends({}, item, {
|
|
5937
|
+
resourceManager._request(item.url, _extends({}, item, {
|
|
5989
5938
|
type: "json"
|
|
5990
5939
|
})).then(function(data) {
|
|
5991
5940
|
engine.resourceManager.registerVirtualResources(data.files);
|
|
@@ -6016,7 +5965,6 @@ var SourceFontLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6016
5965
|
_proto.load = function load(item, resourceManager) {
|
|
6017
5966
|
var _this = this;
|
|
6018
5967
|
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
6019
|
-
// @ts-ignore
|
|
6020
5968
|
var url = resourceManager._getRemoteUrl(item.url);
|
|
6021
5969
|
_this._registerFont(url, url).then(function() {
|
|
6022
5970
|
var font = new engineCore.Font(resourceManager.engine, url);
|
|
@@ -6074,7 +6022,6 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6074
6022
|
chainPromises[i].cancel();
|
|
6075
6023
|
}
|
|
6076
6024
|
});
|
|
6077
|
-
// @ts-ignore
|
|
6078
6025
|
var configPromise = resourceManager._request(item.url, _extends({}, item, {
|
|
6079
6026
|
type: "json"
|
|
6080
6027
|
}));
|
|
@@ -6097,13 +6044,11 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6097
6044
|
wrapModeU !== undefined && (texture.wrapModeU = wrapModeU);
|
|
6098
6045
|
wrapModeV !== undefined && (texture.wrapModeV = wrapModeV);
|
|
6099
6046
|
for(var i = 0; i < atlasItem.sprites.length; i++){
|
|
6100
|
-
// @ts-ignore
|
|
6101
6047
|
spriteAtlas._addSprite(_this._makeSprite(engine, atlasItem.sprites[i], texture));
|
|
6102
6048
|
}
|
|
6103
6049
|
}).catch(reject));
|
|
6104
6050
|
} else {
|
|
6105
6051
|
for(var i1 = 0; i1 < atlasItem.sprites.length; i1++){
|
|
6106
|
-
// @ts-ignore
|
|
6107
6052
|
spriteAtlas._addSprite(_this._makeSprite(engine, atlasItem.sprites[i1]));
|
|
6108
6053
|
}
|
|
6109
6054
|
}
|
|
@@ -6158,8 +6103,7 @@ var SpriteLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6158
6103
|
var _proto = SpriteLoader.prototype;
|
|
6159
6104
|
_proto.load = function load(item, resourceManager) {
|
|
6160
6105
|
var _this = this;
|
|
6161
|
-
return resourceManager
|
|
6162
|
-
._request(item.url, _extends({}, item, {
|
|
6106
|
+
return resourceManager._request(item.url, _extends({}, item, {
|
|
6163
6107
|
type: "json"
|
|
6164
6108
|
})).then(function(data) {
|
|
6165
6109
|
return data.belongToAtlas ? _this._loadFromAtlas(resourceManager, data) : _this._loadFromTexture(resourceManager, data);
|
|
@@ -6167,15 +6111,13 @@ var SpriteLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6167
6111
|
};
|
|
6168
6112
|
_proto._loadFromAtlas = function _loadFromAtlas(resourceManager, data) {
|
|
6169
6113
|
var _this = this;
|
|
6170
|
-
return resourceManager
|
|
6171
|
-
.getResourceByRef(data.belongToAtlas).then(function(atlas) {
|
|
6114
|
+
return resourceManager.getResourceByRef(data.belongToAtlas).then(function(atlas) {
|
|
6172
6115
|
return atlas.getSprite(data.fullPath) || _this._loadFromTexture(resourceManager, data);
|
|
6173
6116
|
});
|
|
6174
6117
|
};
|
|
6175
6118
|
_proto._loadFromTexture = function _loadFromTexture(resourceManager, data) {
|
|
6176
6119
|
if (data.texture) {
|
|
6177
|
-
return resourceManager
|
|
6178
|
-
.getResourceByRef(data.texture).then(function(texture) {
|
|
6120
|
+
return resourceManager.getResourceByRef(data.texture).then(function(texture) {
|
|
6179
6121
|
var sprite = new engineCore.Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border);
|
|
6180
6122
|
var width = data.width, height = data.height;
|
|
6181
6123
|
width === undefined || (sprite.width = width);
|
|
@@ -6207,7 +6149,6 @@ var TextLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6207
6149
|
}
|
|
6208
6150
|
var _proto = TextLoader.prototype;
|
|
6209
6151
|
_proto.load = function load(item, resourceManager) {
|
|
6210
|
-
// @ts-ignore
|
|
6211
6152
|
return resourceManager._request(item.url, _extends({}, item, {
|
|
6212
6153
|
type: "text"
|
|
6213
6154
|
})).then(function(text) {
|
|
@@ -6233,14 +6174,12 @@ var TextureLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6233
6174
|
_proto.load = function load(item, resourceManager) {
|
|
6234
6175
|
var _this = this;
|
|
6235
6176
|
var url = item.url;
|
|
6236
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
6237
6177
|
var remoteUrl = resourceManager._getRemoteUrl(url);
|
|
6238
6178
|
var requestConfig = _extends({}, item, {
|
|
6239
6179
|
type: "arraybuffer"
|
|
6240
6180
|
});
|
|
6241
6181
|
return new engineCore.AssetPromise(function(resolve, reject, setTaskCompleteProgress, setTaskDetailProgress) {
|
|
6242
|
-
resourceManager
|
|
6243
|
-
._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
|
|
6182
|
+
resourceManager._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
|
|
6244
6183
|
_this._decode(buffer, item, resourceManager).then(function(texture) {
|
|
6245
6184
|
resourceManager.addContentRestorer(new TextureContentRestorer(texture, url, remoteUrl, requestConfig));
|
|
6246
6185
|
resolve(texture);
|
|
@@ -6326,8 +6265,7 @@ var TextureContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
|
|
|
6326
6265
|
var _proto = TextureContentRestorer.prototype;
|
|
6327
6266
|
_proto.restoreContent = function restoreContent() {
|
|
6328
6267
|
var _this = this;
|
|
6329
|
-
return this.resource.engine.resourceManager
|
|
6330
|
-
._requestByRemoteUrl(this.remoteUrl, this.requestConfig).then(function(buffer) {
|
|
6268
|
+
return this.resource.engine.resourceManager._requestByRemoteUrl(this.remoteUrl, this.requestConfig).then(function(buffer) {
|
|
6331
6269
|
if (FileHeader.checkMagic(buffer)) {
|
|
6332
6270
|
return decode(buffer, _this.resource.engine, _this.resource);
|
|
6333
6271
|
}
|
|
@@ -6381,11 +6319,9 @@ var AudioLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6381
6319
|
var requestConfig = _extends({}, item, {
|
|
6382
6320
|
type: "arraybuffer"
|
|
6383
6321
|
});
|
|
6384
|
-
resourceManager
|
|
6385
|
-
._request(url, requestConfig).then(function(arrayBuffer) {
|
|
6322
|
+
resourceManager._request(url, requestConfig).then(function(arrayBuffer) {
|
|
6386
6323
|
var audioClip = new engineCore.AudioClip(resourceManager.engine);
|
|
6387
6324
|
AudioLoader._getDecodeContext().decodeAudioData(arrayBuffer).then(function(result) {
|
|
6388
|
-
// @ts-ignore
|
|
6389
6325
|
audioClip._setAudioSource(result);
|
|
6390
6326
|
if (url.indexOf("data:") !== 0) {
|
|
6391
6327
|
var index = url.lastIndexOf("/");
|
|
@@ -6427,7 +6363,6 @@ var ShaderLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6427
6363
|
var _proto = ShaderLoader.prototype;
|
|
6428
6364
|
_proto.load = function load(item, resourceManager) {
|
|
6429
6365
|
var url = item.url;
|
|
6430
|
-
// @ts-expect-error _request is @internal
|
|
6431
6366
|
return resourceManager._request(url, _extends({}, item, {
|
|
6432
6367
|
type: "text"
|
|
6433
6368
|
})).then(function(code) {
|
|
@@ -6455,8 +6390,7 @@ var PhysicsMaterialLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6455
6390
|
}
|
|
6456
6391
|
var _proto = PhysicsMaterialLoader.prototype;
|
|
6457
6392
|
_proto.load = function load(item, resourceManager) {
|
|
6458
|
-
return resourceManager
|
|
6459
|
-
._request(item.url, _extends({}, item, {
|
|
6393
|
+
return resourceManager._request(item.url, _extends({}, item, {
|
|
6460
6394
|
type: "json"
|
|
6461
6395
|
})).then(function(data) {
|
|
6462
6396
|
var physicsMaterial = new engineCore.PhysicsMaterial();
|
|
@@ -6484,10 +6418,8 @@ var RenderTargetLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6484
6418
|
var _proto = RenderTargetLoader.prototype;
|
|
6485
6419
|
_proto.load = function load(item, resourceManager) {
|
|
6486
6420
|
var engine = resourceManager.engine;
|
|
6487
|
-
// @ts-expect-error -- internal method is omitted from public declarations
|
|
6488
6421
|
var remoteAssetBaseURL = resourceManager._getRemoteUrl(item.url);
|
|
6489
|
-
return resourceManager
|
|
6490
|
-
._requestByRemoteUrl(remoteAssetBaseURL, _extends({}, item, {
|
|
6422
|
+
return resourceManager._requestByRemoteUrl(remoteAssetBaseURL, _extends({}, item, {
|
|
6491
6423
|
type: "json"
|
|
6492
6424
|
})).then(function(data) {
|
|
6493
6425
|
var width = data.width, height = data.height, colorFormats = data.colorFormats, depthFormat = data.depthFormat, antiAliasing = data.antiAliasing, autoGenerateMipmaps = data.autoGenerateMipmaps;
|
|
@@ -6512,7 +6444,6 @@ var RenderTargetLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6512
6444
|
if (autoGenerateMipmaps != null) rt.autoGenerateMipmaps = autoGenerateMipmaps;
|
|
6513
6445
|
// Notify pending sub-asset requests for colorTextures
|
|
6514
6446
|
for(var i = 0, n = colorTextures.length; i < n; i++){
|
|
6515
|
-
// @ts-ignore
|
|
6516
6447
|
resourceManager._onSubAssetSuccess(remoteAssetBaseURL, "colorTextures[" + i + "]", colorTextures[i]);
|
|
6517
6448
|
}
|
|
6518
6449
|
return rt;
|
|
@@ -6528,7 +6459,6 @@ RenderTargetLoader = __decorate([
|
|
|
6528
6459
|
|
|
6529
6460
|
function loadRef(refs, index, resourceManager, label) {
|
|
6530
6461
|
var ref = resolveRefItem(refs, index, "SceneLoader", label);
|
|
6531
|
-
// @ts-ignore
|
|
6532
6462
|
return resourceManager.getResourceByRef(ref);
|
|
6533
6463
|
}
|
|
6534
6464
|
/**
|
|
@@ -6651,8 +6581,7 @@ var SceneLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6651
6581
|
_proto.load = function load(item, resourceManager) {
|
|
6652
6582
|
var engine = resourceManager.engine;
|
|
6653
6583
|
return new engineCore.AssetPromise(function(resolve, reject, setTaskCompleteProgress) {
|
|
6654
|
-
resourceManager
|
|
6655
|
-
._request(item.url, _extends({}, item, {
|
|
6584
|
+
resourceManager._request(item.url, _extends({}, item, {
|
|
6656
6585
|
type: "json"
|
|
6657
6586
|
})).then(function(data) {
|
|
6658
6587
|
var _data_scene_name;
|
|
@@ -7020,7 +6949,6 @@ var GALACEAN_materials_remap = /*#__PURE__*/ function(GLTFExtensionParser) {
|
|
|
7020
6949
|
var _proto = GALACEAN_materials_remap.prototype;
|
|
7021
6950
|
_proto.createAndParse = function createAndParse(context, schema) {
|
|
7022
6951
|
var engine = context.glTFResource.engine;
|
|
7023
|
-
// @ts-ignore
|
|
7024
6952
|
var promise = engine.resourceManager.getResourceByRef(schema);
|
|
7025
6953
|
context._addTaskCompletePromise(promise);
|
|
7026
6954
|
return promise;
|