@galacean/engine-loader 1.4.0-beta.1 → 1.4.0-beta.2
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 +25 -11
- package/dist/main.js.map +1 -1
- package/dist/module.js +26 -12
- package/dist/module.js.map +1 -1
- package/package.json +4 -4
- package/types/resource-deserialize/resources/schema/BasicSchema.d.ts +1 -0
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, AnimatorStateTransition, AmbientLight, DiffuseMode, TextureCube, TextureFilterMode, TextureCubeFace, request, ContentRestorer, Font, Animator, IndexFormat, VertexElementFormat, GLCapabilityType, Logger, TextureFormat, InterpolationType, SkinnedMeshRenderer,
|
|
1
|
+
import { Utils, ModelMesh, BlendShape, Texture2D, Loader, Entity, Transform, AnimationClip, AnimationEvent, AnimationStringCurve, Keyframe, AnimationBoolCurve, AnimationRefCurve, AnimationQuaternionCurve, AnimationColorCurve, AnimationVector4Curve, AnimationVector3Curve, AnimationVector2Curve, AnimationFloatArrayCurve, AnimationArrayCurve, AnimationFloatCurve, ReferResource, Scene, resourceLoader, AssetPromise, AssetType, AnimatorController, AnimatorControllerLayer, AnimatorStateTransition, AmbientLight, DiffuseMode, TextureCube, TextureFilterMode, TextureCubeFace, request, ContentRestorer, Font, Animator, IndexFormat, VertexElementFormat, GLCapabilityType, Logger, TextureFormat, InterpolationType, SkinnedMeshRenderer, PBRMaterial, BlinnPhongMaterial, PBRSpecularMaterial, TextureCoordinate, RenderFace, VertexElement, Buffer, BufferBindFlag, BufferUsage, Camera, MeshRenderer, Skin, TextureWrapMode as TextureWrapMode$1, AnimatorStateMachine, SystemInfo, Shader, Material, PrimitiveMesh, SpriteAtlas, Sprite, AudioClip, AudioManager, ShaderFactory, ShaderLib, PhysicsMaterial, 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
|
|
|
@@ -597,10 +597,16 @@ var ReflectionParser = /*#__PURE__*/ function() {
|
|
|
597
597
|
return this._getEntityByConfig(entityConfig).then(function(entity) {
|
|
598
598
|
var _entityConfig_isActive;
|
|
599
599
|
entity.isActive = (_entityConfig_isActive = entityConfig.isActive) != null ? _entityConfig_isActive : true;
|
|
600
|
-
var
|
|
601
|
-
|
|
602
|
-
if (
|
|
603
|
-
|
|
600
|
+
var transform = entity.transform;
|
|
601
|
+
var transformConfig = entityConfig.transform;
|
|
602
|
+
if (transformConfig) {
|
|
603
|
+
_this.parsePropsAndMethods(transform, transformConfig);
|
|
604
|
+
} else {
|
|
605
|
+
var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
|
|
606
|
+
if (position) transform.position.copyFrom(position);
|
|
607
|
+
if (rotation) transform.rotation.copyFrom(rotation);
|
|
608
|
+
if (scale) transform.scale.copyFrom(scale);
|
|
609
|
+
}
|
|
604
610
|
var _entityConfig_layer;
|
|
605
611
|
entity.layer = (_entityConfig_layer = entityConfig.layer) != null ? _entityConfig_layer : entity.layer;
|
|
606
612
|
// @ts-ignore
|
|
@@ -741,7 +747,8 @@ var ReflectionParser = /*#__PURE__*/ function() {
|
|
|
741
747
|
return entity;
|
|
742
748
|
});
|
|
743
749
|
} else {
|
|
744
|
-
var
|
|
750
|
+
var transform = entityConfig.transform;
|
|
751
|
+
var entity = new Entity(engine, entityConfig.name, transform ? Loader.getClass(transform.class) : Transform);
|
|
745
752
|
return Promise.resolve(entity);
|
|
746
753
|
}
|
|
747
754
|
};
|
|
@@ -1247,7 +1254,8 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
|
|
|
1247
1254
|
});
|
|
1248
1255
|
};
|
|
1249
1256
|
_proto._parseEntity = function _parseEntity(entityConfig, engine) {
|
|
1250
|
-
var
|
|
1257
|
+
var transform = entityConfig.transform;
|
|
1258
|
+
var entity = new Entity(engine, entityConfig.name, transform ? Loader.getClass(transform.class) : Transform);
|
|
1251
1259
|
if (!entityConfig.parent) this.context.rootIds.push(entityConfig.id);
|
|
1252
1260
|
return Promise.resolve(entity);
|
|
1253
1261
|
};
|
|
@@ -1307,11 +1315,17 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
|
|
|
1307
1315
|
entity.isActive = (_entityConfig_isActive = entityConfig.isActive) != null ? _entityConfig_isActive : entity.isActive;
|
|
1308
1316
|
var _entityConfig_name;
|
|
1309
1317
|
entity.name = (_entityConfig_name = entityConfig.name) != null ? _entityConfig_name : entity.name;
|
|
1310
|
-
var
|
|
1311
|
-
|
|
1312
|
-
if (
|
|
1313
|
-
|
|
1314
|
-
|
|
1318
|
+
var transform = entity.transform;
|
|
1319
|
+
var transformConfig = entityConfig.transform;
|
|
1320
|
+
if (transformConfig) {
|
|
1321
|
+
this._reflectionParser.parsePropsAndMethods(transform, transformConfig);
|
|
1322
|
+
} else {
|
|
1323
|
+
var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
|
|
1324
|
+
if (position) transform.position.copyFrom(position);
|
|
1325
|
+
if (rotation) transform.rotation.copyFrom(rotation);
|
|
1326
|
+
if (scale) transform.scale.copyFrom(scale);
|
|
1327
|
+
}
|
|
1328
|
+
if (entityConfig.layer) entity.layer = entityConfig.layer;
|
|
1315
1329
|
return entity;
|
|
1316
1330
|
};
|
|
1317
1331
|
_proto._generateInstanceContext = function _generateInstanceContext(entity, context, path) {
|