@galacean/engine-loader 1.3.0-beta.6 → 1.3.0-beta.8
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 +10 -8
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +10 -8
- package/dist/module.js +11 -9
- package/dist/module.js.map +1 -1
- package/package.json +4 -4
- package/types/resource-deserialize/resources/prefab/PrefabParser.d.ts +14 -0
- package/types/resource-deserialize/resources/prefab/PrefabParserContext.d.ts +5 -0
- package/types/resource-deserialize/resources/scene/SceneParserContext.d.ts +9 -0
- package/types/resource-deserialize/resources/schema/SceneSchema.d.ts +1 -0
package/dist/miniprogram.js
CHANGED
|
@@ -1448,7 +1448,7 @@ var AnimatorControllerLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
1448
1448
|
_this.request(item.url, _extends({}, item, {
|
|
1449
1449
|
type: "json"
|
|
1450
1450
|
})).then(function(data) {
|
|
1451
|
-
var animatorController = new miniprogram.AnimatorController();
|
|
1451
|
+
var animatorController = new miniprogram.AnimatorController(resourceManager.engine);
|
|
1452
1452
|
var layers = data.layers, parameters = data.parameters;
|
|
1453
1453
|
var promises = [];
|
|
1454
1454
|
layers.forEach(function(layerData, layerIndex) {
|
|
@@ -1506,10 +1506,7 @@ var AnimatorControllerLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
1506
1506
|
animatorController.addLayer(layer);
|
|
1507
1507
|
});
|
|
1508
1508
|
parameters.forEach(function(parameterData) {
|
|
1509
|
-
|
|
1510
|
-
parameter.name = parameterData.name;
|
|
1511
|
-
parameter.value = parameterData.value;
|
|
1512
|
-
animatorController.addParameter(parameter);
|
|
1509
|
+
animatorController.addParameter(parameterData.name, parameterData.defaultValue);
|
|
1513
1510
|
});
|
|
1514
1511
|
Promise.all(promises).then(function(clipData) {
|
|
1515
1512
|
clipData.forEach(function(data) {
|
|
@@ -4890,12 +4887,14 @@ exports.GLTFAnimatorControllerParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
4890
4887
|
return Promise.resolve(null);
|
|
4891
4888
|
}
|
|
4892
4889
|
return context.get(exports.GLTFParserType.Animation).then(function(animations) {
|
|
4893
|
-
var animatorController = _this._createAnimatorController(animations);
|
|
4890
|
+
var animatorController = _this._createAnimatorController(context, animations);
|
|
4894
4891
|
return Promise.resolve(animatorController);
|
|
4895
4892
|
});
|
|
4896
4893
|
};
|
|
4897
|
-
_proto._createAnimatorController = function _createAnimatorController(animations) {
|
|
4898
|
-
var
|
|
4894
|
+
_proto._createAnimatorController = function _createAnimatorController(context, animations) {
|
|
4895
|
+
var glTFResource = context.glTFResource;
|
|
4896
|
+
var engine = glTFResource.engine;
|
|
4897
|
+
var animatorController = new miniprogram.AnimatorController(engine);
|
|
4899
4898
|
var layer = new miniprogram.AnimatorControllerLayer("layer");
|
|
4900
4899
|
var animatorStateMachine = new miniprogram.AnimatorStateMachine();
|
|
4901
4900
|
animatorController.addLayer(layer);
|
|
@@ -6428,6 +6427,9 @@ var SceneLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
6428
6427
|
if (shadow.shadowResolution != undefined) scene.shadowResolution = shadow.shadowResolution;
|
|
6429
6428
|
if (shadow.shadowDistance != undefined) scene.shadowDistance = shadow.shadowDistance;
|
|
6430
6429
|
if (shadow.shadowCascades != undefined) scene.shadowCascades = shadow.shadowCascades;
|
|
6430
|
+
if (shadow.enableTransparentShadow != undefined) {
|
|
6431
|
+
scene.enableTransparentShadow = shadow.enableTransparentShadow;
|
|
6432
|
+
}
|
|
6431
6433
|
var _shadow_shadowTwoCascadeSplits;
|
|
6432
6434
|
scene.shadowTwoCascadeSplits = (_shadow_shadowTwoCascadeSplits = shadow.shadowTwoCascadeSplits) != null ? _shadow_shadowTwoCascadeSplits : scene.shadowTwoCascadeSplits;
|
|
6433
6435
|
shadow.shadowFourCascadeSplits && scene.shadowFourCascadeSplits.copyFrom(shadow.shadowFourCascadeSplits);
|
package/dist/module.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Utils, ModelMesh, BlendShape, Texture2D, Loader, Entity, AnimationClip, AnimationEvent, AnimationStringCurve, Keyframe, AnimationBoolCurve, AnimationRefCurve, AnimationQuaternionCurve, AnimationColorCurve, AnimationVector4Curve, AnimationVector3Curve, AnimationVector2Curve, AnimationFloatArrayCurve, AnimationArrayCurve, AnimationFloatCurve, ReferResource, Scene, resourceLoader, AssetPromise, AssetType, AnimatorController, AnimatorControllerLayer,
|
|
1
|
+
import { Utils, ModelMesh, BlendShape, Texture2D, Loader, Entity, AnimationClip, AnimationEvent, AnimationStringCurve, Keyframe, AnimationBoolCurve, AnimationRefCurve, AnimationQuaternionCurve, AnimationColorCurve, AnimationVector4Curve, AnimationVector3Curve, AnimationVector2Curve, AnimationFloatArrayCurve, AnimationArrayCurve, AnimationFloatCurve, ReferResource, Scene, resourceLoader, AssetPromise, AssetType, AnimatorController, AnimatorControllerLayer, AnimatorStateTransition, TextureCube, TextureFilterMode, TextureCubeFace, AmbientLight, DiffuseMode, Font, Animator, IndexFormat, VertexElementFormat, GLCapabilityType, Logger, TextureFormat, request, ContentRestorer, InterpolationType, SkinnedMeshRenderer, Transform, PBRMaterial, BlinnPhongMaterial, PBRSpecularMaterial, TextureCoordinate, RenderFace, VertexElement, Buffer, BufferBindFlag, BufferUsage, Camera, MeshRenderer, Skin, TextureWrapMode as TextureWrapMode$1, AnimatorStateMachine, SystemInfo, Material, Shader, PrimitiveMesh, SpriteAtlas, Sprite, BackgroundMode, DirectLight, PointLight, SpotLight, UnlitMaterial } from '@galacean/engine-core';
|
|
2
2
|
import { Color, Vector4, Vector3, Vector2, Quaternion, SphericalHarmonics3, MathUtil, BoundingBox, Matrix, Rect } from '@galacean/engine-math';
|
|
3
3
|
import { GLCompressedTextureInternalFormat } from '@galacean/engine-rhi-webgl';
|
|
4
4
|
|
|
@@ -1443,7 +1443,7 @@ var AnimatorControllerLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
1443
1443
|
_this.request(item.url, _extends({}, item, {
|
|
1444
1444
|
type: "json"
|
|
1445
1445
|
})).then(function(data) {
|
|
1446
|
-
var animatorController = new AnimatorController();
|
|
1446
|
+
var animatorController = new AnimatorController(resourceManager.engine);
|
|
1447
1447
|
var layers = data.layers, parameters = data.parameters;
|
|
1448
1448
|
var promises = [];
|
|
1449
1449
|
layers.forEach(function(layerData, layerIndex) {
|
|
@@ -1501,10 +1501,7 @@ var AnimatorControllerLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
1501
1501
|
animatorController.addLayer(layer);
|
|
1502
1502
|
});
|
|
1503
1503
|
parameters.forEach(function(parameterData) {
|
|
1504
|
-
|
|
1505
|
-
parameter.name = parameterData.name;
|
|
1506
|
-
parameter.value = parameterData.value;
|
|
1507
|
-
animatorController.addParameter(parameter);
|
|
1504
|
+
animatorController.addParameter(parameterData.name, parameterData.defaultValue);
|
|
1508
1505
|
});
|
|
1509
1506
|
Promise.all(promises).then(function(clipData) {
|
|
1510
1507
|
clipData.forEach(function(data) {
|
|
@@ -4885,12 +4882,14 @@ var GLTFAnimatorControllerParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
4885
4882
|
return Promise.resolve(null);
|
|
4886
4883
|
}
|
|
4887
4884
|
return context.get(GLTFParserType.Animation).then(function(animations) {
|
|
4888
|
-
var animatorController = _this._createAnimatorController(animations);
|
|
4885
|
+
var animatorController = _this._createAnimatorController(context, animations);
|
|
4889
4886
|
return Promise.resolve(animatorController);
|
|
4890
4887
|
});
|
|
4891
4888
|
};
|
|
4892
|
-
_proto._createAnimatorController = function _createAnimatorController(animations) {
|
|
4893
|
-
var
|
|
4889
|
+
_proto._createAnimatorController = function _createAnimatorController(context, animations) {
|
|
4890
|
+
var glTFResource = context.glTFResource;
|
|
4891
|
+
var engine = glTFResource.engine;
|
|
4892
|
+
var animatorController = new AnimatorController(engine);
|
|
4894
4893
|
var layer = new AnimatorControllerLayer("layer");
|
|
4895
4894
|
var animatorStateMachine = new AnimatorStateMachine();
|
|
4896
4895
|
animatorController.addLayer(layer);
|
|
@@ -6424,6 +6423,9 @@ var SceneLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
6424
6423
|
if (shadow.shadowResolution != undefined) scene.shadowResolution = shadow.shadowResolution;
|
|
6425
6424
|
if (shadow.shadowDistance != undefined) scene.shadowDistance = shadow.shadowDistance;
|
|
6426
6425
|
if (shadow.shadowCascades != undefined) scene.shadowCascades = shadow.shadowCascades;
|
|
6426
|
+
if (shadow.enableTransparentShadow != undefined) {
|
|
6427
|
+
scene.enableTransparentShadow = shadow.enableTransparentShadow;
|
|
6428
|
+
}
|
|
6427
6429
|
var _shadow_shadowTwoCascadeSplits;
|
|
6428
6430
|
scene.shadowTwoCascadeSplits = (_shadow_shadowTwoCascadeSplits = shadow.shadowTwoCascadeSplits) != null ? _shadow_shadowTwoCascadeSplits : scene.shadowTwoCascadeSplits;
|
|
6429
6431
|
shadow.shadowFourCascadeSplits && scene.shadowFourCascadeSplits.copyFrom(shadow.shadowFourCascadeSplits);
|