@galacean/engine-loader 1.0.0-beta.14 → 1.0.0-beta.16
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 +14 -7
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +14 -7
- package/dist/module.js +14 -7
- package/dist/module.js.map +1 -1
- package/package.json +5 -5
- package/types/gltf/GLTFUtil.d.ts +3 -3
package/dist/main.js
CHANGED
|
@@ -221,7 +221,8 @@ var EnvLoader = /*#__PURE__*/ function(Loader) {
|
|
|
221
221
|
var shArray = new Float32Array(arraybuffer, 0, 27);
|
|
222
222
|
var shByteLength = 27 * 4;
|
|
223
223
|
var size = (_ref = new Uint16Array(arraybuffer, shByteLength, 1)) == null ? void 0 : _ref[0];
|
|
224
|
-
var
|
|
224
|
+
var engine = resourceManager.engine;
|
|
225
|
+
var texture = new engineCore.TextureCube(engine, size);
|
|
225
226
|
texture.filterMode = engineCore.TextureFilterMode.Trilinear;
|
|
226
227
|
var mipmapCount = texture.mipmapCount;
|
|
227
228
|
var offset = shByteLength + 2;
|
|
@@ -234,7 +235,7 @@ var EnvLoader = /*#__PURE__*/ function(Loader) {
|
|
|
234
235
|
texture.setPixelBuffer(engineCore.TextureCubeFace.PositiveX + face, data, mipLevel);
|
|
235
236
|
}
|
|
236
237
|
}
|
|
237
|
-
var ambientLight = new engineCore.AmbientLight();
|
|
238
|
+
var ambientLight = new engineCore.AmbientLight(engine);
|
|
238
239
|
var sh = new engineMath.SphericalHarmonics3();
|
|
239
240
|
ambientLight.diffuseMode = engineCore.DiffuseMode.SphericalHarmonics;
|
|
240
241
|
sh.copyFromArray(shArray);
|
|
@@ -2409,8 +2410,14 @@ var GLTFLoader = /*#__PURE__*/ function(Loader) {
|
|
|
2409
2410
|
resourceManager.addContentRestorer(restorer);
|
|
2410
2411
|
masterPromiseInfo.resolve(glTFResource);
|
|
2411
2412
|
}).catch(function(e) {
|
|
2412
|
-
|
|
2413
|
-
|
|
2413
|
+
var msg = "Error loading glTF model from " + url + " .";
|
|
2414
|
+
engineCore.Logger.error(msg);
|
|
2415
|
+
masterPromiseInfo.reject(msg);
|
|
2416
|
+
context.defaultSceneRootPromiseInfo.reject(e);
|
|
2417
|
+
context.texturesPromiseInfo.reject(e);
|
|
2418
|
+
context.materialsPromiseInfo.reject(e);
|
|
2419
|
+
context.meshesPromiseInfo.reject(e);
|
|
2420
|
+
context.animationClipsPromiseInfo.reject(e);
|
|
2414
2421
|
});
|
|
2415
2422
|
return context.promiseMap;
|
|
2416
2423
|
};
|
|
@@ -3962,7 +3969,7 @@ exports.MeshLoader = /*#__PURE__*/ function(Loader) {
|
|
|
3962
3969
|
decode(data, resourceManager.engine).then(function(mesh) {
|
|
3963
3970
|
resolve(mesh);
|
|
3964
3971
|
});
|
|
3965
|
-
});
|
|
3972
|
+
}).catch(reject);
|
|
3966
3973
|
});
|
|
3967
3974
|
};
|
|
3968
3975
|
return MeshLoader;
|
|
@@ -3981,14 +3988,14 @@ exports.EditorTextureLoader = /*#__PURE__*/ function(Loader) {
|
|
|
3981
3988
|
var _proto = EditorTextureLoader.prototype;
|
|
3982
3989
|
_proto.load = function load(item, resourceManager) {
|
|
3983
3990
|
var _this = this;
|
|
3984
|
-
return new engineCore.AssetPromise(function(resolve) {
|
|
3991
|
+
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
3985
3992
|
_this.request(item.url, {
|
|
3986
3993
|
type: "arraybuffer"
|
|
3987
3994
|
}).then(function(data) {
|
|
3988
3995
|
decode(data, resourceManager.engine).then(function(texture) {
|
|
3989
3996
|
resolve(texture);
|
|
3990
3997
|
});
|
|
3991
|
-
});
|
|
3998
|
+
}).catch(reject);
|
|
3992
3999
|
});
|
|
3993
4000
|
};
|
|
3994
4001
|
return EditorTextureLoader;
|