@galacean/engine-loader 1.1.0-beta.2 → 1.1.0-beta.20

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/module.js CHANGED
@@ -1,4 +1,4 @@
1
- import { Utils, ModelMesh, BlendShape, Texture2D, Entity, Loader, Transform, Animator, DirectLight, Camera, MeshRenderer, ParticleRenderer, PointLight, SpotLight, Script, SpriteMask, SpriteRenderer, TextRenderer, AnimationClip, AnimationEvent, AnimationRefCurve, Keyframe, AnimationQuaternionCurve, AnimationColorCurve, AnimationVector4Curve, AnimationVector3Curve, AnimationVector2Curve, AnimationFloatArrayCurve, AnimationArrayCurve, AnimationFloatCurve, Scene, resourceLoader, AssetPromise, AssetType, AnimatorController, AnimatorControllerLayer, AnimatorStateMachine, AnimatorStateTransition, TextureCube, TextureFilterMode, TextureCubeFace, AmbientLight, DiffuseMode, Font, ReferResource, IndexFormat, VertexElementFormat, GLCapabilityType, Logger, TextureFormat, request, ContentRestorer, InterpolationType, SkinnedMeshRenderer, PBRMaterial, BlinnPhongMaterial, PBRSpecularMaterial, TextureCoordinate, RenderFace, VertexElement, Buffer, BufferBindFlag, BufferUsage, Skin, TextureWrapMode as TextureWrapMode$1, Material, Shader, SpriteAtlas, Sprite, BackgroundMode, UnlitMaterial } from '@galacean/engine-core';
1
+ import { Utils, ModelMesh, BlendShape, Texture2D, Loader, Entity, Transform, Animator, DirectLight, Camera, MeshRenderer, ParticleRenderer, PointLight, SpotLight, Script, SpriteMask, SpriteRenderer, TextRenderer, AnimationClip, AnimationEvent, AnimationRefCurve, Keyframe, AnimationQuaternionCurve, AnimationColorCurve, AnimationVector4Curve, AnimationVector3Curve, AnimationVector2Curve, AnimationFloatArrayCurve, AnimationArrayCurve, AnimationFloatCurve, Scene, resourceLoader, AssetPromise, AssetType, AnimatorController, AnimatorControllerLayer, AnimatorStateMachine, AnimatorStateTransition, TextureCube, TextureFilterMode, TextureCubeFace, AmbientLight, DiffuseMode, Font, ReferResource, IndexFormat, VertexElementFormat, GLCapabilityType, Logger, TextureFormat, request, ContentRestorer, InterpolationType, SkinnedMeshRenderer, PBRMaterial, BlinnPhongMaterial, PBRSpecularMaterial, TextureCoordinate, RenderFace, VertexElement, Buffer, BufferBindFlag, BufferUsage, Skin, TextureWrapMode as TextureWrapMode$1, Material, Shader, SpriteAtlas, Sprite, BackgroundMode, 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
  import { DRACODecoder } from '@galacean/engine-draco';
@@ -116,116 +116,116 @@ var BufferReader = /*#__PURE__*/ function() {
116
116
  this.data = data;
117
117
  this._dataView = new DataView(data.buffer, data.byteOffset + byteOffset, byteLength != null ? byteLength : data.byteLength - byteOffset);
118
118
  this._littleEndian = littleEndian;
119
- this._offset = 0;
119
+ this._position = 0;
120
120
  this._baseOffset = byteOffset;
121
121
  }
122
122
  var _proto = BufferReader.prototype;
123
123
  _proto.nextUint8 = function nextUint8() {
124
- var value = this._dataView.getUint8(this._offset);
125
- this._offset += 1;
124
+ var value = this._dataView.getUint8(this._position);
125
+ this._position += 1;
126
126
  return value;
127
127
  };
128
128
  _proto.nextUint16 = function nextUint16() {
129
- var value = this._dataView.getUint16(this._offset, this._littleEndian);
130
- this._offset += 2;
129
+ var value = this._dataView.getUint16(this._position, this._littleEndian);
130
+ this._position += 2;
131
131
  return value;
132
132
  };
133
133
  _proto.nextUint32 = function nextUint32() {
134
- var value = this._dataView.getUint32(this._offset, this._littleEndian);
135
- this._offset += 4;
134
+ var value = this._dataView.getUint32(this._position, this._littleEndian);
135
+ this._position += 4;
136
136
  return value;
137
137
  };
138
138
  _proto.nextInt32 = function nextInt32() {
139
- var value = this._dataView.getInt32(this._offset, this._littleEndian);
140
- this._offset += 4;
139
+ var value = this._dataView.getInt32(this._position, this._littleEndian);
140
+ this._position += 4;
141
141
  return value;
142
142
  };
143
143
  _proto.nextInt32Array = function nextInt32Array(len) {
144
- var value = new Int32Array(this.data.buffer, this._offset + this._dataView.byteOffset, len);
145
- this._offset += 4 * len;
144
+ var value = new Int32Array(this.data.buffer, this._position + this._dataView.byteOffset, len);
145
+ this._position += 4 * len;
146
146
  return value;
147
147
  };
148
148
  _proto.nextFloat32 = function nextFloat32() {
149
- var value = this._dataView.getFloat32(this._offset, this._littleEndian);
150
- this._offset += 4;
149
+ var value = this._dataView.getFloat32(this._position, this._littleEndian);
150
+ this._position += 4;
151
151
  return value;
152
152
  };
153
153
  _proto.nextFloat32Array = function nextFloat32Array(len) {
154
- var value = new Float32Array(this.data.buffer, this._offset + this._dataView.byteOffset, len);
155
- this._offset += 4 * len;
154
+ var value = new Float32Array(this.data.buffer, this._position + this._dataView.byteOffset, len);
155
+ this._position += 4 * len;
156
156
  return value;
157
157
  };
158
158
  _proto.nextUint32Array = function nextUint32Array(len) {
159
- var value = new Uint32Array(this.data.buffer, this._offset + this._dataView.byteOffset, len);
160
- this._offset += 4 * len;
159
+ var value = new Uint32Array(this.data.buffer, this._position + this._dataView.byteOffset, len);
160
+ this._position += 4 * len;
161
161
  return value;
162
162
  };
163
163
  _proto.nextUint8Array = function nextUint8Array(len) {
164
- var value = new Uint8Array(this.data.buffer, this._offset + this._dataView.byteOffset, len);
165
- this._offset += len;
164
+ var value = new Uint8Array(this.data.buffer, this._position + this._dataView.byteOffset, len);
165
+ this._position += len;
166
166
  return value;
167
167
  };
168
168
  _proto.nextUint64 = function nextUint64() {
169
- var left = this._dataView.getUint32(this._offset, this._littleEndian);
170
- var right = this._dataView.getUint32(this._offset + 4, this._littleEndian);
169
+ var left = this._dataView.getUint32(this._position, this._littleEndian);
170
+ var right = this._dataView.getUint32(this._position + 4, this._littleEndian);
171
171
  var value = left + Math.pow(2, 32) * right;
172
- this._offset += 8;
172
+ this._position += 8;
173
173
  return value;
174
174
  };
175
175
  _proto.nextStr = function nextStr() {
176
176
  var strByteLength = this.nextUint16();
177
- var uint8Array = new Uint8Array(this.data.buffer, this._offset + this._dataView.byteOffset, strByteLength);
178
- this._offset += strByteLength;
177
+ var uint8Array = new Uint8Array(this.data.buffer, this._position + this._dataView.byteOffset, strByteLength);
178
+ this._position += strByteLength;
179
179
  return Utils.decodeText(uint8Array);
180
180
  };
181
181
  /**
182
182
  * image data 放在最后
183
183
  */ _proto.nextImageData = function nextImageData(count) {
184
- return new Uint8Array(this.data.buffer, this.data.byteOffset + this._offset);
184
+ return new Uint8Array(this.data.buffer, this.data.byteOffset + this._position);
185
185
  };
186
186
  _proto.nextImagesData = function nextImagesData(count) {
187
187
  var imagesLen = new Array(count);
188
188
  // Start offset of Uint32Array should be a multiple of 4. ref: https://stackoverflow.com/questions/15417310/why-typed-array-constructors-require-offset-to-be-multiple-of-underlying-type-si
189
189
  for(var i = 0; i < count; i++){
190
- var len = this._dataView.getUint32(this._offset, this._littleEndian);
190
+ var len = this._dataView.getUint32(this._position, this._littleEndian);
191
191
  imagesLen[i] = len;
192
- this._offset += 4;
192
+ this._position += 4;
193
193
  }
194
194
  var imagesData = [];
195
195
  for(var i1 = 0; i1 < count; i1++){
196
196
  var len1 = imagesLen[i1];
197
- var buffer = new Uint8Array(this.data.buffer, this._dataView.byteOffset + this._offset, len1);
198
- this._offset += len1;
197
+ var buffer = new Uint8Array(this.data.buffer, this._dataView.byteOffset + this._position, len1);
198
+ this._position += len1;
199
199
  imagesData.push(buffer);
200
200
  }
201
201
  return imagesData;
202
202
  };
203
203
  _proto.skip = function skip(bytes) {
204
- this._offset += bytes;
204
+ this._position += bytes;
205
205
  return this;
206
206
  };
207
207
  _proto.scan = function scan(maxByteLength, term) {
208
208
  if (term === void 0) term = 0x00;
209
- var byteOffset = this._offset;
209
+ var byteOffset = this._position;
210
210
  var byteLength = 0;
211
- while(this._dataView.getUint8(this._offset) !== term && byteLength < maxByteLength){
211
+ while(this._dataView.getUint8(this._position) !== term && byteLength < maxByteLength){
212
212
  byteLength++;
213
- this._offset++;
213
+ this._position++;
214
214
  }
215
- if (byteLength < maxByteLength) this._offset++;
215
+ if (byteLength < maxByteLength) this._position++;
216
216
  return new Uint8Array(this._dataView.buffer, this._dataView.byteOffset + byteOffset, byteLength);
217
217
  };
218
218
  _create_class(BufferReader, [
219
219
  {
220
220
  key: "position",
221
221
  get: function get() {
222
- return this._offset;
222
+ return this._position;
223
223
  }
224
224
  },
225
225
  {
226
226
  key: "offset",
227
227
  get: function get() {
228
- return this._offset + this._baseOffset;
228
+ return this._position + this._baseOffset;
229
229
  }
230
230
  }
231
231
  ]);
@@ -289,75 +289,74 @@ var MeshDecoder = /*#__PURE__*/ function() {
289
289
  var encodedMeshData = JSON.parse(jsonDataString);
290
290
  // @ts-ignore Vector3 is not compatible with {x: number, y: number, z: number}.
291
291
  encodedMeshData.bounds && modelMesh.bounds.copyFrom(encodedMeshData.bounds);
292
- var offset = Math.ceil(bufferReader.offset / 4) * 4;
292
+ var offset = Math.ceil(bufferReader.offset / 4) * 4 + bufferReader.data.byteOffset;
293
293
  var buffer = bufferReader.data.buffer;
294
- var byteOffset = bufferReader.data.byteOffset;
295
- var float32Array = new Float32Array(buffer, encodedMeshData.positions.start + offset + byteOffset, (encodedMeshData.positions.end - encodedMeshData.positions.start) / 4);
294
+ var float32Array = new Float32Array(buffer, encodedMeshData.positions.start + offset, (encodedMeshData.positions.end - encodedMeshData.positions.start) / 4);
296
295
  var vertexCount = float32Array.length / 3;
297
296
  var positions = float32ArrayToVector3(float32Array, vertexCount);
298
297
  modelMesh.setPositions(positions);
299
298
  if (encodedMeshData.normals) {
300
- var float32Array1 = new Float32Array(buffer, encodedMeshData.normals.start + offset + byteOffset, (encodedMeshData.normals.end - encodedMeshData.normals.start) / 4);
299
+ var float32Array1 = new Float32Array(buffer, encodedMeshData.normals.start + offset, (encodedMeshData.normals.end - encodedMeshData.normals.start) / 4);
301
300
  var normals = float32ArrayToVector3(float32Array1, vertexCount);
302
301
  modelMesh.setNormals(normals);
303
302
  }
304
303
  if (encodedMeshData.uvs) {
305
- var float32Array2 = new Float32Array(buffer, encodedMeshData.uvs.start + offset + byteOffset, (encodedMeshData.uvs.end - encodedMeshData.uvs.start) / 4);
304
+ var float32Array2 = new Float32Array(buffer, encodedMeshData.uvs.start + offset, (encodedMeshData.uvs.end - encodedMeshData.uvs.start) / 4);
306
305
  modelMesh.setUVs(float32ArrayToVector2(float32Array2, vertexCount));
307
306
  }
308
307
  if (encodedMeshData.uv1) {
309
- var float32Array3 = new Float32Array(buffer, encodedMeshData.uv1.start + offset + byteOffset, (encodedMeshData.uv1.end - encodedMeshData.uv1.start) / 4);
308
+ var float32Array3 = new Float32Array(buffer, encodedMeshData.uv1.start + offset, (encodedMeshData.uv1.end - encodedMeshData.uv1.start) / 4);
310
309
  modelMesh.setUVs(float32ArrayToVector2(float32Array3, vertexCount), 1);
311
310
  }
312
311
  if (encodedMeshData.uv2) {
313
- var float32Array4 = new Float32Array(buffer, encodedMeshData.uv2.start + offset + byteOffset, (encodedMeshData.uv2.end - encodedMeshData.uv2.start) / 4);
312
+ var float32Array4 = new Float32Array(buffer, encodedMeshData.uv2.start + offset, (encodedMeshData.uv2.end - encodedMeshData.uv2.start) / 4);
314
313
  modelMesh.setUVs(float32ArrayToVector2(float32Array4, vertexCount), 2);
315
314
  }
316
315
  if (encodedMeshData.uv3) {
317
- var float32Array5 = new Float32Array(buffer, encodedMeshData.uv3.start + offset + byteOffset, (encodedMeshData.uv3.end - encodedMeshData.uv3.start) / 4);
316
+ var float32Array5 = new Float32Array(buffer, encodedMeshData.uv3.start + offset, (encodedMeshData.uv3.end - encodedMeshData.uv3.start) / 4);
318
317
  modelMesh.setUVs(float32ArrayToVector2(float32Array5, vertexCount), 3);
319
318
  }
320
319
  if (encodedMeshData.uv4) {
321
- var float32Array6 = new Float32Array(buffer, encodedMeshData.uv4.start + offset + byteOffset, (encodedMeshData.uv4.end - encodedMeshData.uv4.start) / 4);
320
+ var float32Array6 = new Float32Array(buffer, encodedMeshData.uv4.start + offset, (encodedMeshData.uv4.end - encodedMeshData.uv4.start) / 4);
322
321
  modelMesh.setUVs(float32ArrayToVector2(float32Array6, vertexCount), 4);
323
322
  }
324
323
  if (encodedMeshData.uv5) {
325
- var float32Array7 = new Float32Array(buffer, encodedMeshData.uv5.start + offset + byteOffset, (encodedMeshData.uv5.end - encodedMeshData.uv5.start) / 4);
324
+ var float32Array7 = new Float32Array(buffer, encodedMeshData.uv5.start + offset, (encodedMeshData.uv5.end - encodedMeshData.uv5.start) / 4);
326
325
  modelMesh.setUVs(float32ArrayToVector2(float32Array7, vertexCount), 5);
327
326
  }
328
327
  if (encodedMeshData.uv6) {
329
- var float32Array8 = new Float32Array(buffer, encodedMeshData.uv6.start + offset + byteOffset, (encodedMeshData.uv6.end - encodedMeshData.uv6.start) / 4);
328
+ var float32Array8 = new Float32Array(buffer, encodedMeshData.uv6.start + offset, (encodedMeshData.uv6.end - encodedMeshData.uv6.start) / 4);
330
329
  modelMesh.setUVs(float32ArrayToVector2(float32Array8, vertexCount), 6);
331
330
  }
332
331
  if (encodedMeshData.uv7) {
333
- var float32Array9 = new Float32Array(buffer, encodedMeshData.uv7.start + offset + byteOffset, (encodedMeshData.uv7.end - encodedMeshData.uv7.start) / 4);
332
+ var float32Array9 = new Float32Array(buffer, encodedMeshData.uv7.start + offset, (encodedMeshData.uv7.end - encodedMeshData.uv7.start) / 4);
334
333
  modelMesh.setUVs(float32ArrayToVector2(float32Array9, vertexCount), 7);
335
334
  }
336
335
  if (encodedMeshData.colors) {
337
- var float32Array10 = new Float32Array(buffer, encodedMeshData.colors.start + offset + byteOffset, (encodedMeshData.colors.end - encodedMeshData.colors.start) / 4);
336
+ var float32Array10 = new Float32Array(buffer, encodedMeshData.colors.start + offset, (encodedMeshData.colors.end - encodedMeshData.colors.start) / 4);
338
337
  modelMesh.setColors(float32ArrayToVColor(float32Array10, vertexCount));
339
338
  }
340
339
  if (encodedMeshData.boneWeights) {
341
- var float32Array11 = new Float32Array(buffer, encodedMeshData.boneWeights.start + offset + byteOffset, (encodedMeshData.boneWeights.end - encodedMeshData.boneWeights.start) / 4);
340
+ var float32Array11 = new Float32Array(buffer, encodedMeshData.boneWeights.start + offset, (encodedMeshData.boneWeights.end - encodedMeshData.boneWeights.start) / 4);
342
341
  modelMesh.setBoneWeights(float32ArrayToVector4(float32Array11, vertexCount));
343
342
  }
344
343
  if (encodedMeshData.boneIndices) {
345
- var float32Array12 = new Float32Array(buffer, encodedMeshData.boneIndices.start + offset + byteOffset, (encodedMeshData.boneIndices.end - encodedMeshData.boneIndices.start) / 4);
344
+ var float32Array12 = new Float32Array(buffer, encodedMeshData.boneIndices.start + offset, (encodedMeshData.boneIndices.end - encodedMeshData.boneIndices.start) / 4);
346
345
  modelMesh.setBoneIndices(float32ArrayToVector4(float32Array12, vertexCount));
347
346
  }
348
347
  if (encodedMeshData.blendShapes) {
349
348
  encodedMeshData.blendShapes.forEach(function(blendShapeData) {
350
349
  var blendShape = new BlendShape(blendShapeData.name);
351
350
  blendShapeData.frames.forEach(function(frameData) {
352
- var positionArray = new Float32Array(buffer, frameData.deltaPosition.start + offset + byteOffset, (frameData.deltaPosition.end - frameData.deltaPosition.start) / 4);
351
+ var positionArray = new Float32Array(buffer, frameData.deltaPosition.start + offset, (frameData.deltaPosition.end - frameData.deltaPosition.start) / 4);
353
352
  var count = positionArray.length / 3;
354
353
  var deltaPosition = float32ArrayToVector3(positionArray, count);
355
354
  if (frameData.deltaNormals) {
356
- var normalsArray = new Float32Array(buffer, frameData.deltaNormals.start + offset + byteOffset, (frameData.deltaNormals.end - frameData.deltaNormals.start) / 4);
355
+ var normalsArray = new Float32Array(buffer, frameData.deltaNormals.start + offset, (frameData.deltaNormals.end - frameData.deltaNormals.start) / 4);
357
356
  float32ArrayToVector3(normalsArray, count);
358
357
  }
359
358
  if (frameData.deltaTangents) {
360
- var tangentsArray = new Float32Array(buffer, frameData.deltaTangents.start + offset + byteOffset, (frameData.deltaTangents.end - frameData.deltaTangents.start) / 4);
359
+ var tangentsArray = new Float32Array(buffer, frameData.deltaTangents.start + offset, (frameData.deltaTangents.end - frameData.deltaTangents.start) / 4);
361
360
  float32ArrayToVector4(tangentsArray, count);
362
361
  }
363
362
  blendShape.addFrame(frameData.weight, deltaPosition);
@@ -368,9 +367,9 @@ var MeshDecoder = /*#__PURE__*/ function() {
368
367
  if (encodedMeshData.indices) {
369
368
  var indices = null;
370
369
  if (encodedMeshData.indices.type === 0) {
371
- indices = new Uint16Array(buffer, encodedMeshData.indices.start + offset + byteOffset, (encodedMeshData.indices.end - encodedMeshData.indices.start) / 2);
370
+ indices = new Uint16Array(buffer, encodedMeshData.indices.start + offset, (encodedMeshData.indices.end - encodedMeshData.indices.start) / 2);
372
371
  } else {
373
- indices = new Uint32Array(buffer, encodedMeshData.indices.start + offset + byteOffset, (encodedMeshData.indices.end - encodedMeshData.indices.start) / 4);
372
+ indices = new Uint32Array(buffer, encodedMeshData.indices.start + offset, (encodedMeshData.indices.end - encodedMeshData.indices.start) / 4);
374
373
  }
375
374
  modelMesh.setIndices(indices);
376
375
  }
@@ -523,12 +522,12 @@ function _construct(Parent, args, Class) {
523
522
  }
524
523
 
525
524
  var ReflectionParser = /*#__PURE__*/ function() {
526
- function ReflectionParser() {}
527
- ReflectionParser.registerCustomParseComponent = function registerCustomParseComponent(componentType, handle) {
528
- this.customParseComponentHandles[componentType] = handle;
529
- };
530
- ReflectionParser.parseEntity = function parseEntity(entityConfig, engine) {
531
- return ReflectionParser.getEntityByConfig(entityConfig, engine).then(function(entity) {
525
+ function ReflectionParser(_context) {
526
+ this._context = _context;
527
+ }
528
+ var _proto = ReflectionParser.prototype;
529
+ _proto.parseEntity = function parseEntity(entityConfig) {
530
+ return this._getEntityByConfig(entityConfig).then(function(entity) {
532
531
  var _entityConfig_isActive;
533
532
  entity.isActive = (_entityConfig_isActive = entityConfig.isActive) != null ? _entityConfig_isActive : true;
534
533
  var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
@@ -538,72 +537,33 @@ var ReflectionParser = /*#__PURE__*/ function() {
538
537
  return entity;
539
538
  });
540
539
  };
541
- ReflectionParser.getEntityByConfig = function getEntityByConfig(entityConfig, engine) {
542
- // @ts-ignore
543
- var assetRefId = entityConfig.assetRefId;
544
- if (assetRefId) {
545
- return engine.resourceManager// @ts-ignore
546
- .getResourceByRef({
547
- refId: assetRefId,
548
- key: entityConfig.key,
549
- isClone: entityConfig.isClone
550
- }).then(function(entity) {
551
- entity.name = entityConfig.name;
552
- return entity;
553
- });
554
- } else {
555
- var entity = new Entity(engine, entityConfig.name);
556
- return Promise.resolve(entity);
557
- }
558
- };
559
- ReflectionParser.parseClassObject = function parseClassObject(item, engine, resourceManager) {
560
- if (resourceManager === void 0) resourceManager = engine.resourceManager;
540
+ _proto.parseClassObject = function parseClassObject(item) {
541
+ var _this = this;
561
542
  var Class = Loader.getClass(item.class);
562
543
  var _item_constructParams;
563
544
  var params = (_item_constructParams = item.constructParams) != null ? _item_constructParams : [];
564
- var instance = _construct(Class, [].concat(params));
565
- return this.parsePropsAndMethods(instance, item, engine, resourceManager);
566
- };
567
- ReflectionParser.parseBasicType = function parseBasicType(value, engine, resourceManager) {
568
- if (resourceManager === void 0) resourceManager = engine.resourceManager;
569
- var _this = this;
570
- if (Array.isArray(value)) {
571
- return Promise.all(value.map(function(item) {
572
- return _this.parseBasicType(item, engine, resourceManager);
573
- }));
574
- } else if (typeof value === "object" && value != null) {
575
- if (this._isClass(value)) {
576
- // class object
577
- return this.parseClassObject(value, engine, resourceManager);
578
- } else if (this._isRef(value)) {
579
- // reference object
580
- return resourceManager.getResourceByRef(value);
581
- } else {
582
- // basic type
583
- return Promise.resolve(value);
584
- }
585
- } else {
586
- return Promise.resolve(value);
587
- }
545
+ return Promise.all(params.map(function(param) {
546
+ return _this.parseBasicType(param);
547
+ })).then(function(resultParams) {
548
+ return _construct(Class, [].concat(resultParams));
549
+ }).then(function(instance) {
550
+ return _this.parsePropsAndMethods(instance, item);
551
+ });
588
552
  };
589
- ReflectionParser.parsePropsAndMethods = function parsePropsAndMethods(instance, item, engine, resourceManager) {
590
- if (resourceManager === void 0) resourceManager = engine.resourceManager;
591
- var _this = this;
553
+ _proto.parsePropsAndMethods = function parsePropsAndMethods(instance, item) {
592
554
  var promises = [];
593
555
  if (item.methods) {
594
556
  for(var methodName in item.methods){
595
557
  var methodParams = item.methods[methodName];
596
558
  for(var i = 0, count = methodParams.length; i < count; i++){
597
- var params = methodParams[i];
598
- var promise = this.parseMethod(instance, methodName, params, engine, resourceManager);
599
- promises.push(promise);
559
+ promises.push(this.parseMethod(instance, methodName, methodParams[i]));
600
560
  }
601
561
  }
602
562
  }
603
563
  if (item.props) {
604
- var _this1 = this, _loop = function(key) {
564
+ var _this = this, _loop = function(key) {
605
565
  var value = item.props[key];
606
- var promise = _this1.parseBasicType(value, engine).then(function(v) {
566
+ var promise = _this.parseBasicType(value, instance[key]).then(function(v) {
607
567
  return instance[key] = v;
608
568
  });
609
569
  promises.push(promise);
@@ -611,27 +571,96 @@ var ReflectionParser = /*#__PURE__*/ function() {
611
571
  for(var key in item.props)_loop(key);
612
572
  }
613
573
  return Promise.all(promises).then(function() {
614
- var handle = _this.customParseComponentHandles[instance.constructor.name];
615
- if (handle) return handle(instance, item, engine);
574
+ var handle = ReflectionParser.customParseComponentHandles[instance.constructor.name];
575
+ if (handle) return handle(instance, item);
616
576
  else return instance;
617
577
  });
618
578
  };
619
- ReflectionParser.parseMethod = function parseMethod(instance, methodName, methodParams, engine, resourceManager) {
620
- if (resourceManager === void 0) resourceManager = engine.resourceManager;
579
+ _proto.parseMethod = function parseMethod(instance, methodName, methodParams) {
621
580
  var _this = this;
622
581
  return Promise.all(methodParams.map(function(param) {
623
- return _this.parseBasicType(param, engine, resourceManager);
582
+ return _this.parseBasicType(param);
624
583
  })).then(function(result) {
625
584
  var _instance;
626
585
  return (_instance = instance)[methodName].apply(_instance, [].concat(result));
627
586
  });
628
587
  };
588
+ _proto.parseBasicType = function parseBasicType(value, originValue) {
589
+ var _this = this;
590
+ if (Array.isArray(value)) {
591
+ return Promise.all(value.map(function(item) {
592
+ return _this.parseBasicType(item);
593
+ }));
594
+ } else if (typeof value === "object" && value != null) {
595
+ if (ReflectionParser._isClass(value)) {
596
+ // class object
597
+ return this.parseClassObject(value);
598
+ } else if (ReflectionParser._isAssetRef(value)) {
599
+ // reference object
600
+ // @ts-ignore
601
+ return this._context.resourceManager.getResourceByRef(value);
602
+ } else if (ReflectionParser._isEntityRef(value)) {
603
+ // entity reference
604
+ return Promise.resolve(this._context.entityMap.get(value.entityId));
605
+ } else if (originValue) {
606
+ var _this1 = this, _loop = function(key) {
607
+ if (key === "methods") {
608
+ var methods = value[key];
609
+ for(var methodName in methods){
610
+ var methodParams = methods[methodName];
611
+ for(var i = 0, count = methodParams.length; i < count; i++){
612
+ var params = methodParams[i];
613
+ var promise = _this1.parseMethod(originValue, methodName, params);
614
+ promises.push(promise);
615
+ }
616
+ }
617
+ } else {
618
+ promises.push(_this1.parseBasicType(value[key], originValue[key]).then(function(v) {
619
+ return originValue[key] = v;
620
+ }));
621
+ }
622
+ };
623
+ var promises = [];
624
+ for(var key in value)_loop(key);
625
+ return Promise.all(promises).then(function() {
626
+ return originValue;
627
+ });
628
+ }
629
+ }
630
+ // primitive type
631
+ return Promise.resolve(value);
632
+ };
633
+ _proto._getEntityByConfig = function _getEntityByConfig(entityConfig) {
634
+ // @ts-ignore
635
+ var assetRefId = entityConfig.assetRefId;
636
+ var engine = this._context.engine;
637
+ if (assetRefId) {
638
+ return engine.resourceManager// @ts-ignore
639
+ .getResourceByRef({
640
+ refId: assetRefId,
641
+ key: entityConfig.key,
642
+ isClone: entityConfig.isClone
643
+ }).then(function(entity) {
644
+ entity.name = entityConfig.name;
645
+ return entity;
646
+ });
647
+ } else {
648
+ var entity = new Entity(engine, entityConfig.name);
649
+ return Promise.resolve(entity);
650
+ }
651
+ };
652
+ ReflectionParser.registerCustomParseComponent = function registerCustomParseComponent(componentType, handle) {
653
+ this.customParseComponentHandles[componentType] = handle;
654
+ };
629
655
  ReflectionParser._isClass = function _isClass(value) {
630
656
  return value["class"] != undefined;
631
657
  };
632
- ReflectionParser._isRef = function _isRef(value) {
658
+ ReflectionParser._isAssetRef = function _isAssetRef(value) {
633
659
  return value["refId"] != undefined;
634
660
  };
661
+ ReflectionParser._isEntityRef = function _isEntityRef(value) {
662
+ return value["entityId"] != undefined;
663
+ };
635
664
  return ReflectionParser;
636
665
  }();
637
666
  (function() {
@@ -899,6 +928,8 @@ var SceneParserContext = /*#__PURE__*/ function() {
899
928
  this.assets = new Map();
900
929
  this.entityConfigMap = new Map();
901
930
  this.rootIds = [];
931
+ this.engine = scene.engine;
932
+ this.resourceManager = scene.engine.resourceManager;
902
933
  }
903
934
  var _proto = SceneParserContext.prototype;
904
935
  _proto.destroy = function destroy() {
@@ -915,7 +946,7 @@ var SceneParserContext = /*#__PURE__*/ function() {
915
946
  function SceneParser(context) {
916
947
  var _this = this;
917
948
  this.context = context;
918
- this._engine = this.context.scene.engine;
949
+ this._engine = context.scene.engine;
919
950
  this._organizeEntities = this._organizeEntities.bind(this);
920
951
  this._parseComponents = this._parseComponents.bind(this);
921
952
  this._clearAndResolveScene = this._clearAndResolveScene.bind(this);
@@ -923,22 +954,24 @@ var SceneParserContext = /*#__PURE__*/ function() {
923
954
  _this._reject = reject;
924
955
  _this._resolve = resolve;
925
956
  });
957
+ this._reflectionParser = new ReflectionParser(context);
926
958
  }
927
959
  var _proto = SceneParser.prototype;
928
960
  /** start parse the scene */ _proto.start = function start() {
929
961
  this._parseEntities().then(this._organizeEntities).then(this._parseComponents).then(this._clearAndResolveScene).then(this._resolve).catch(this._reject);
930
962
  };
931
963
  _proto._parseEntities = function _parseEntities() {
964
+ var _this = this;
932
965
  var entitiesConfig = this.context.originalData.entities;
933
966
  var entityConfigMap = this.context.entityConfigMap;
934
967
  var entitiesMap = this.context.entityMap;
935
968
  var rootIds = this.context.rootIds;
936
- var engine = this._engine;
969
+ this._engine;
937
970
  var promises = entitiesConfig.map(function(entityConfig) {
938
971
  entityConfigMap.set(entityConfig.id, entityConfig);
939
972
  // record root entities
940
973
  if (!entityConfig.parent) rootIds.push(entityConfig.id);
941
- return ReflectionParser.parseEntity(entityConfig, engine);
974
+ return _this._reflectionParser.parseEntity(entityConfig);
942
975
  });
943
976
  return Promise.all(promises).then(function(entities) {
944
977
  for(var i = 0, l = entities.length; i < l; i++){
@@ -976,7 +1009,7 @@ var SceneParserContext = /*#__PURE__*/ function() {
976
1009
  component = entity.getComponent(Loader.getClass(key));
977
1010
  }
978
1011
  component = component || entity.addComponent(Loader.getClass(key));
979
- var promise = ReflectionParser.parsePropsAndMethods(component, componentConfig, entity.engine);
1012
+ var promise = this._reflectionParser.parsePropsAndMethods(component, componentConfig);
980
1013
  promises.push(promise);
981
1014
  }
982
1015
  }
@@ -1532,10 +1565,10 @@ var TextureWrapMode;
1532
1565
  /**
1533
1566
  * @internal
1534
1567
  */ var GLTFParserContext = /*#__PURE__*/ function() {
1535
- function GLTFParserContext(glTFResource, resourceManager, keepMeshData) {
1568
+ function GLTFParserContext(glTFResource, resourceManager, params) {
1536
1569
  this.glTFResource = glTFResource;
1537
1570
  this.resourceManager = resourceManager;
1538
- this.keepMeshData = keepMeshData;
1571
+ this.params = params;
1539
1572
  this.accessorBufferCache = {};
1540
1573
  this._resourceCache = new Map();
1541
1574
  this.contentRestorer = new GLTFContentRestorer(glTFResource);
@@ -1589,11 +1622,37 @@ var TextureWrapMode;
1589
1622
  _this.get(9),
1590
1623
  _this.get(2)
1591
1624
  ]).then(function() {
1625
+ var glTFResource = _this.glTFResource;
1626
+ if (glTFResource.skins || glTFResource.animations) {
1627
+ _this._createAnimator(_this, glTFResource.animations);
1628
+ }
1592
1629
  _this.resourceManager.addContentRestorer(_this.contentRestorer);
1593
- return _this.glTFResource;
1630
+ return glTFResource;
1594
1631
  });
1595
1632
  });
1596
1633
  };
1634
+ _proto._createAnimator = function _createAnimator(context, animations) {
1635
+ var defaultSceneRoot = context.glTFResource.defaultSceneRoot;
1636
+ var animator = defaultSceneRoot.addComponent(Animator);
1637
+ var animatorController = new AnimatorController();
1638
+ var layer = new AnimatorControllerLayer("layer");
1639
+ var animatorStateMachine = new AnimatorStateMachine();
1640
+ animatorController.addLayer(layer);
1641
+ animator.animatorController = animatorController;
1642
+ layer.stateMachine = animatorStateMachine;
1643
+ if (animations) {
1644
+ for(var i = 0; i < animations.length; i++){
1645
+ var animationClip = animations[i];
1646
+ var name = animationClip.name;
1647
+ var uniqueName = animatorStateMachine.makeUniqueStateName(name);
1648
+ if (uniqueName !== name) {
1649
+ console.warn("AnimatorState name is existed, name: " + name + " reset to " + uniqueName);
1650
+ }
1651
+ var animatorState = animatorStateMachine.addState(uniqueName);
1652
+ animatorState.clip = animationClip;
1653
+ }
1654
+ }
1655
+ };
1597
1656
  _proto._handleSubAsset = function _handleSubAsset(resource, type, index) {
1598
1657
  var _this = this;
1599
1658
  var glTFResourceKey = glTFResourceMap[type];
@@ -2233,7 +2292,7 @@ var SupercompressionScheme;
2233
2292
  alphaSliceByteLength: sgdReader.nextUint32()
2234
2293
  };
2235
2294
  }
2236
- var endpointsByteOffset = sgdByteOffset + sgdReader.offset;
2295
+ var endpointsByteOffset = sgdByteOffset + sgdReader.position;
2237
2296
  var selectorsByteOffset = endpointsByteOffset + endpointsByteLength;
2238
2297
  var tablesByteOffset = selectorsByteOffset + selectorsByteLength;
2239
2298
  var extendedByteOffset = tablesByteOffset + tablesByteLength;
@@ -2425,6 +2484,25 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
2425
2484
  }();
2426
2485
 
2427
2486
  /** @internal */ function TranscodeWorkerCode$1() {
2487
+ var initPromise;
2488
+ var init = function init(wasmBinary) {
2489
+ if (!initPromise) {
2490
+ initPromise = new Promise(function(resolve, reject) {
2491
+ var BasisModule = {
2492
+ wasmBinary: wasmBinary,
2493
+ onRuntimeInitialized: function() {
2494
+ return resolve(BasisModule);
2495
+ },
2496
+ onAbort: reject
2497
+ };
2498
+ self["BASIS"](BasisModule);
2499
+ }).then(function(BasisModule) {
2500
+ BasisModule.initializeBasis();
2501
+ return BasisModule.KTX2File;
2502
+ });
2503
+ }
2504
+ return initPromise;
2505
+ };
2428
2506
  self.onmessage = function onmessage(event) {
2429
2507
  var message = event.data;
2430
2508
  switch(message.type){
@@ -2539,6 +2617,10 @@ function transcode(buffer, targetFormat, KTX2File) {
2539
2617
  cleanup();
2540
2618
  throw new Error("Invalid or unsupported .ktx2 file");
2541
2619
  }
2620
+ if (!ktx2File.startTranscoding()) {
2621
+ cleanup();
2622
+ throw new Error("KTX2 startTranscoding failed");
2623
+ }
2542
2624
  var width = ktx2File.getWidth();
2543
2625
  var height = ktx2File.getHeight();
2544
2626
  var layerCount = ktx2File.getLayers() || 1;
@@ -2547,6 +2629,7 @@ function transcode(buffer, targetFormat, KTX2File) {
2547
2629
  var faceCount = ktx2File.getFaces();
2548
2630
  var format = getTranscodeFormatFromTarget(targetFormat, hasAlpha);
2549
2631
  var faces = new Array(faceCount);
2632
+ var isBC = format === 2 || format === 3 || format === 7;
2550
2633
  for(var face = 0; face < faceCount; face++){
2551
2634
  var mipmaps = new Array(levelCount);
2552
2635
  for(var mip = 0; mip < levelCount; mip++){
@@ -2554,8 +2637,15 @@ function transcode(buffer, targetFormat, KTX2File) {
2554
2637
  var mipWidth = void 0, mipHeight = void 0;
2555
2638
  for(var layer = 0; layer < layerCount; layer++){
2556
2639
  var levelInfo = ktx2File.getImageLevelInfo(mip, layer, face);
2557
- mipWidth = levelInfo.origWidth;
2558
- mipHeight = levelInfo.origHeight;
2640
+ // see: https://github.com/KhronosGroup/KTX-Software/issues/254
2641
+ if (isBC && mip === 0 && (width !== levelInfo.width || height !== levelInfo.height)) {
2642
+ width = mipWidth = levelInfo.width;
2643
+ height = mipHeight = levelInfo.height;
2644
+ console.warn("KTX2 transcode to BC will resize to width: " + width + ", height: " + height + ". You'd better use an image whose size if multiple of 4.");
2645
+ } else {
2646
+ mipWidth = levelInfo.origWidth;
2647
+ mipHeight = levelInfo.origHeight;
2648
+ }
2559
2649
  var dst = new Uint8Array(ktx2File.getImageTranscodedSizeInBytes(mip, layer, 0, format));
2560
2650
  var status = ktx2File.transcodeImage(dst, mip, layer, face, format, 0, -1, -1);
2561
2651
  if (!status) {
@@ -2621,7 +2711,7 @@ function transcode(buffer, targetFormat, KTX2File) {
2621
2711
  } else {
2622
2712
  var funcCode = TranscodeWorkerCode$1.toString();
2623
2713
  var transcodeString = funcCode.substring(funcCode.indexOf("{"), funcCode.lastIndexOf("}") + 1);
2624
- var workerCode = "\n " + jsCode + "\n var init = (" + _init.toString() + ")();\n " + transcode.toString() + "\n " + transcodeString + "\n ";
2714
+ var workerCode = "\n " + jsCode + "\n " + transcode.toString() + "\n " + transcodeString + "\n ";
2625
2715
  var workerURL = URL.createObjectURL(new Blob([
2626
2716
  workerCode
2627
2717
  ], {
@@ -2870,6 +2960,7 @@ var KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
2870
2960
  _proto.initialize = function initialize(engine, configuration) {
2871
2961
  if (configuration.ktx2Loader) {
2872
2962
  var options = configuration.ktx2Loader;
2963
+ if (options.priorityFormats) KTX2Loader._priorityFormats = options.priorityFormats;
2873
2964
  if (this._isKhronosSupported(options.priorityFormats, engine) && options.workerCount !== 0) {
2874
2965
  return KTX2Loader._getKhronosTranscoder(options.workerCount).init();
2875
2966
  } else {
@@ -2890,25 +2981,7 @@ var KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
2890
2981
  });
2891
2982
  };
2892
2983
  _proto._isKhronosSupported = function _isKhronosSupported(priorityFormats, engine) {
2893
- if (priorityFormats === void 0) priorityFormats = [
2894
- KTX2TargetFormat.ASTC,
2895
- KTX2TargetFormat.ETC,
2896
- KTX2TargetFormat.BC7,
2897
- KTX2TargetFormat.BC1_BC3,
2898
- KTX2TargetFormat.PVRTC,
2899
- KTX2TargetFormat.R8G8B8A8
2900
- ];
2901
- var supportedList = new Array();
2902
- if (Array.isArray(priorityFormats[0])) {
2903
- for(var i = 0; i < priorityFormats.length; i++){
2904
- supportedList.push(KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats[i]));
2905
- }
2906
- } else {
2907
- supportedList.push(KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats));
2908
- }
2909
- return supportedList.every(function(format) {
2910
- return KhronosTranscoder.transcoderMap[format];
2911
- });
2984
+ return !!KhronosTranscoder.transcoderMap[KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats)];
2912
2985
  };
2913
2986
  /**
2914
2987
  * Destroy ktx2 transcoder worker.
@@ -2922,7 +2995,8 @@ var KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
2922
2995
  /** @internal */ KTX2Loader1._parseBuffer = function _parseBuffer(buffer, engine, params) {
2923
2996
  var _params;
2924
2997
  var ktx2Container = new KTX2Container(buffer);
2925
- var formatPriorities = (_params = params) == null ? void 0 : _params.priorityFormats;
2998
+ var _params_priorityFormats;
2999
+ var formatPriorities = (_params_priorityFormats = (_params = params) == null ? void 0 : _params.priorityFormats) != null ? _params_priorityFormats : KTX2Loader._priorityFormats;
2926
3000
  var targetFormat = KTX2Loader._decideTargetFormat(engine, ktx2Container, formatPriorities);
2927
3001
  var transcodeResultPromise;
2928
3002
  if (KTX2Loader._isBinomialInit || !KhronosTranscoder.transcoderMap[targetFormat] || !ktx2Container.isUASTC) {
@@ -2989,18 +3063,22 @@ var KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
2989
3063
  return targetFormat;
2990
3064
  };
2991
3065
  KTX2Loader1._detectSupportedFormat = function _detectSupportedFormat(renderer, priorityFormats) {
2992
- if (priorityFormats === void 0) priorityFormats = [
2993
- KTX2TargetFormat.ASTC,
2994
- KTX2TargetFormat.ETC,
2995
- KTX2TargetFormat.BC7,
2996
- KTX2TargetFormat.BC1_BC3,
2997
- KTX2TargetFormat.PVRTC
2998
- ];
2999
3066
  for(var i = 0; i < priorityFormats.length; i++){
3000
- var capabilities = this._supportedMap[priorityFormats[i]];
3001
- for(var j = 0; j < capabilities.length; j++){
3002
- if (renderer.canIUse(capabilities[j])) {
3003
- return priorityFormats[i];
3067
+ var format = priorityFormats[i];
3068
+ var capabilities = this._supportedMap[format];
3069
+ if (capabilities) {
3070
+ for(var j = 0; j < capabilities.length; j++){
3071
+ if (renderer.canIUse(capabilities[j])) {
3072
+ return format;
3073
+ }
3074
+ }
3075
+ } else {
3076
+ switch(priorityFormats[i]){
3077
+ case KTX2TargetFormat.R8G8B8A8:
3078
+ return format;
3079
+ case KTX2TargetFormat.R8:
3080
+ case KTX2TargetFormat.R8G8:
3081
+ if (renderer.isWebGL2) return format;
3004
3082
  }
3005
3083
  }
3006
3084
  }
@@ -3037,6 +3115,14 @@ var KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
3037
3115
  return KTX2Loader1;
3038
3116
  }(Loader), function() {
3039
3117
  _KTX2Loader._isBinomialInit = false;
3118
+ }(), function() {
3119
+ _KTX2Loader._priorityFormats = [
3120
+ KTX2TargetFormat.BC7,
3121
+ KTX2TargetFormat.ASTC,
3122
+ KTX2TargetFormat.BC1_BC3,
3123
+ KTX2TargetFormat.ETC,
3124
+ KTX2TargetFormat.PVRTC
3125
+ ];
3040
3126
  }(), function() {
3041
3127
  var _obj;
3042
3128
  _KTX2Loader._supportedMap = (_obj = {}, _obj[KTX2TargetFormat.ASTC] = [
@@ -3500,6 +3586,7 @@ var GLTFAnimationParser = /*#__PURE__*/ function(GLTFParser1) {
3500
3586
  var promises = new Array();
3501
3587
  // parse samplers
3502
3588
  for(var j = 0, m = samplers.length; j < m; j++)_loop(j);
3589
+ promises.push(context.get(GLTFParserType.Scene));
3503
3590
  return Promise.all(promises).then(function() {
3504
3591
  for(var j = 0, m = channels.length; j < m; j++){
3505
3592
  var gltfChannel = channels[j];
@@ -3511,6 +3598,10 @@ var GLTFAnimationParser = /*#__PURE__*/ function(GLTFParser1) {
3511
3598
  relativePath = relativePath === "" ? "" + entity.name : entity.name + "/" + relativePath;
3512
3599
  entity = entity.parent;
3513
3600
  }
3601
+ // If the target node is in the default scene, relativePath will be empty
3602
+ if (context.glTFResource.sceneRoots.indexOf(entity) === -1) {
3603
+ continue;
3604
+ }
3514
3605
  var ComponentType = void 0;
3515
3606
  var propertyName = void 0;
3516
3607
  switch(target.path){
@@ -3591,12 +3682,12 @@ var GLTFAnimationParser = /*#__PURE__*/ function(GLTFParser1) {
3591
3682
  if (curve2.interpolation === InterpolationType.CubicSpine) {
3592
3683
  keyframe2.inTangent = Array.from(output.subarray(offset2, offset2 + outputSize));
3593
3684
  offset2 += outputSize;
3594
- keyframe2.value = output.subarray(offset2, offset2 + outputSize);
3685
+ keyframe2.value = output.slice(offset2, offset2 + outputSize);
3595
3686
  offset2 += outputSize;
3596
3687
  keyframe2.outTangent = Array.from(output.subarray(offset2, offset2 + outputSize));
3597
3688
  offset2 += outputSize;
3598
3689
  } else {
3599
- keyframe2.value = output.subarray(offset2, offset2 + outputSize);
3690
+ keyframe2.value = output.slice(offset2, offset2 + outputSize);
3600
3691
  offset2 += outputSize;
3601
3692
  }
3602
3693
  curve2.addKey(keyframe2);
@@ -3847,7 +3938,7 @@ var GLTFMeshParser = (_GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
3847
3938
  return context.get(GLTFParserType.Buffer).then(function(buffers) {
3848
3939
  return GLTFUtils.getAccessorData(glTF, indexAccessor, buffers);
3849
3940
  });
3850
- }, context.keepMeshData).then(resolve);
3941
+ }, context.params.keepMeshData).then(resolve);
3851
3942
  }
3852
3943
  });
3853
3944
  };
@@ -4025,9 +4116,9 @@ var GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
4025
4116
  }
4026
4117
  var _proto = GLTFSceneParser.prototype;
4027
4118
  _proto.parse = function parse(context, index) {
4028
- var _this = this;
4029
4119
  var _context_glTF = context.glTF, scenes = _context_glTF.scenes, _context_glTF_scene = _context_glTF.scene, scene = _context_glTF_scene === void 0 ? 0 : _context_glTF_scene, glTFResource = context.glTFResource;
4030
4120
  var sceneInfo = scenes[index];
4121
+ var sceneExtensions = sceneInfo.extensions;
4031
4122
  var engine = glTFResource.engine;
4032
4123
  var isDefaultScene = scene === index;
4033
4124
  var sceneNodes = sceneInfo.nodes;
@@ -4053,18 +4144,7 @@ var GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
4053
4144
  promises.push(this._parseEntityComponent(context, sceneNodes[i1]));
4054
4145
  }
4055
4146
  return Promise.all(promises).then(function() {
4056
- if (isDefaultScene) {
4057
- return Promise.all([
4058
- context.get(GLTFParserType.Skin),
4059
- context.get(GLTFParserType.Animation)
4060
- ]).then(function(param) {
4061
- var skins = param[0], animations = param[1];
4062
- if (skins || animations) {
4063
- _this._createAnimator(context, animations);
4064
- }
4065
- return sceneRoot;
4066
- });
4067
- }
4147
+ GLTFParser.executeExtensionsAdditiveAndParse(sceneExtensions, context, sceneRoot, sceneInfo);
4068
4148
  return sceneRoot;
4069
4149
  });
4070
4150
  };
@@ -4176,28 +4256,6 @@ var GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
4176
4256
  for(var i = 0; i < glTFMeshPrimitives.length; i++)_loop(i);
4177
4257
  return Promise.all(promises);
4178
4258
  };
4179
- _proto._createAnimator = function _createAnimator(context, animations) {
4180
- var defaultSceneRoot = context.glTFResource.defaultSceneRoot;
4181
- var animator = defaultSceneRoot.addComponent(Animator);
4182
- var animatorController = new AnimatorController();
4183
- var layer = new AnimatorControllerLayer("layer");
4184
- var animatorStateMachine = new AnimatorStateMachine();
4185
- animatorController.addLayer(layer);
4186
- animator.animatorController = animatorController;
4187
- layer.stateMachine = animatorStateMachine;
4188
- if (animations) {
4189
- for(var i = 0; i < animations.length; i++){
4190
- var animationClip = animations[i];
4191
- var name = animationClip.name;
4192
- var uniqueName = animatorStateMachine.makeUniqueStateName(name);
4193
- if (uniqueName !== name) {
4194
- console.warn("AnimatorState name is existed, name: " + name + " reset to " + uniqueName);
4195
- }
4196
- var animatorState = animatorStateMachine.addState(uniqueName);
4197
- animatorState.clip = animationClip;
4198
- }
4199
- }
4200
- };
4201
4259
  _proto._computeLocalBounds = function _computeLocalBounds(skinnedMeshRenderer, mesh, bones, rootBone, inverseBindMatrices) {
4202
4260
  var rootBoneIndex = bones.indexOf(rootBone);
4203
4261
  if (rootBoneIndex !== -1) {
@@ -4347,8 +4405,7 @@ var GLTFTextureParser = (_GLTFTextureParser = /*#__PURE__*/ function(GLTFParser1
4347
4405
  mipmap: (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap
4348
4406
  }
4349
4407
  }).then(function(texture) {
4350
- var _texture;
4351
- (_texture = texture).name || (_texture.name = textureName || imageName || "texture_" + index);
4408
+ texture.name = textureName || imageName || texture.name || "texture_" + index;
4352
4409
  useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
4353
4410
  return texture;
4354
4411
  });
@@ -4430,11 +4487,12 @@ var GLTFLoader = /*#__PURE__*/ function(Loader1) {
4430
4487
  }
4431
4488
  var _proto = GLTFLoader.prototype;
4432
4489
  _proto.load = function load(item, resourceManager) {
4433
- var _params;
4434
4490
  var url = item.url;
4435
4491
  var params = item.params;
4436
4492
  var glTFResource = new GLTFResource(resourceManager.engine, url);
4437
- var context = new GLTFParserContext(glTFResource, resourceManager, !!((_params = params) == null ? void 0 : _params.keepMeshData));
4493
+ var context = new GLTFParserContext(glTFResource, resourceManager, _extends({
4494
+ keepMeshData: false
4495
+ }, params));
4438
4496
  return context.parse();
4439
4497
  };
4440
4498
  return GLTFLoader;
@@ -5082,6 +5140,12 @@ var MaterialLoader = /*#__PURE__*/ function(Loader1) {
5082
5140
  materialShaderData.setTexture(key, texture);
5083
5141
  }));
5084
5142
  break;
5143
+ case "Boolean":
5144
+ materialShaderData.setInt(key, value ? 1 : 0);
5145
+ break;
5146
+ case "Integer":
5147
+ materialShaderData.setInt(key, Number(value));
5148
+ break;
5085
5149
  }
5086
5150
  };
5087
5151
  var engine = resourceManager.engine;
@@ -5217,9 +5281,10 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader1) {
5217
5281
  var _loop = function(i) {
5218
5282
  var atlasItem = atlasItems[i];
5219
5283
  if (atlasItem.img) {
5284
+ var _atlasItem_type;
5220
5285
  chainPromises.push(resourceManager.load({
5221
5286
  url: Utils.resolveAbsoluteUrl(item.url, atlasItem.img),
5222
- type: AssetType.Texture2D,
5287
+ type: (_atlasItem_type = atlasItem.type) != null ? _atlasItem_type : AssetType.Texture2D,
5223
5288
  params: {
5224
5289
  format: format,
5225
5290
  mipmap: mipmap
@@ -5455,6 +5520,39 @@ TextureCubeLoader = __decorate([
5455
5520
  ])
5456
5521
  ], TextureCubeLoader);
5457
5522
 
5523
+ var ProjectLoader = /*#__PURE__*/ function(Loader1) {
5524
+ _inherits(ProjectLoader, Loader1);
5525
+ function ProjectLoader() {
5526
+ return Loader1.apply(this, arguments);
5527
+ }
5528
+ var _proto = ProjectLoader.prototype;
5529
+ _proto.load = function load(item, resourceManager) {
5530
+ var _this = this;
5531
+ var engine = resourceManager.engine;
5532
+ return new AssetPromise(function(resolve, reject) {
5533
+ _this.request(item.url, {
5534
+ type: "json"
5535
+ }).then(function(data) {
5536
+ // @ts-ignore
5537
+ engine.resourceManager.initVirtualResources(data.files);
5538
+ return resourceManager.load({
5539
+ type: AssetType.Scene,
5540
+ url: data.scene
5541
+ }).then(function(scene) {
5542
+ engine.sceneManager.activeScene = scene;
5543
+ resolve();
5544
+ });
5545
+ }).catch(reject);
5546
+ });
5547
+ };
5548
+ return ProjectLoader;
5549
+ }(Loader);
5550
+ ProjectLoader = __decorate([
5551
+ resourceLoader(AssetType.Project, [
5552
+ "proj"
5553
+ ], false)
5554
+ ], ProjectLoader);
5555
+
5458
5556
  var SceneLoader = /*#__PURE__*/ function(Loader1) {
5459
5557
  _inherits(SceneLoader, Loader1);
5460
5558
  function SceneLoader() {
@@ -5472,33 +5570,34 @@ var SceneLoader = /*#__PURE__*/ function(Loader1) {
5472
5570
  var promises = [];
5473
5571
  // parse ambient light
5474
5572
  var ambient = data.scene.ambient;
5475
- var useCustomAmbient = ambient.specularMode === "Custom";
5476
- if (useCustomAmbient && ambient.customAmbientLight) {
5477
- // @ts-ignore
5478
- // prettier-ignore
5479
- var customAmbientPromise = resourceManager.getResourceByRef(ambient.customAmbientLight).then(function(ambientLight) {
5480
- scene.ambientLight = ambientLight;
5481
- scene.ambientLight.diffuseIntensity = ambient.diffuseIntensity;
5482
- scene.ambientLight.specularIntensity = ambient.specularIntensity;
5483
- scene.ambientLight.diffuseMode = ambient.diffuseMode;
5484
- scene.ambientLight.diffuseSolidColor.copyFrom(ambient.diffuseSolidColor);
5485
- });
5486
- promises.push(customAmbientPromise);
5487
- } else if (!useCustomAmbient && ambient.ambientLight) {
5488
- // @ts-ignore
5489
- // prettier-ignore
5490
- var ambientLightPromise = resourceManager.getResourceByRef(ambient.ambientLight).then(function(ambientLight) {
5491
- scene.ambientLight = ambientLight;
5492
- scene.ambientLight.diffuseIntensity = ambient.diffuseIntensity;
5493
- scene.ambientLight.specularIntensity = ambient.specularIntensity;
5494
- scene.ambientLight.diffuseMode = ambient.diffuseMode;
5495
- scene.ambientLight.diffuseSolidColor.copyFrom(ambient.diffuseSolidColor);
5496
- });
5497
- promises.push(ambientLightPromise);
5498
- } else {
5573
+ if (ambient) {
5574
+ var useCustomAmbient = ambient.specularMode === "Custom";
5575
+ var useSH = ambient.diffuseMode === DiffuseMode.SphericalHarmonics;
5499
5576
  scene.ambientLight.diffuseIntensity = ambient.diffuseIntensity;
5500
5577
  scene.ambientLight.specularIntensity = ambient.specularIntensity;
5578
+ scene.ambientLight.diffuseMode = ambient.diffuseMode;
5501
5579
  scene.ambientLight.diffuseSolidColor.copyFrom(ambient.diffuseSolidColor);
5580
+ scene.ambientLight.specularTextureDecodeRGBM = true;
5581
+ if (useCustomAmbient && ambient.customAmbientLight) {
5582
+ promises.push(// @ts-ignore
5583
+ resourceManager.getResourceByRef(ambient.customAmbientLight).then(function(ambientLight) {
5584
+ var _ambientLight;
5585
+ scene.ambientLight.specularTexture = (_ambientLight = ambientLight) == null ? void 0 : _ambientLight.specularTexture;
5586
+ }));
5587
+ }
5588
+ if (ambient.ambientLight && (!useCustomAmbient || useSH)) {
5589
+ promises.push(// @ts-ignore
5590
+ resourceManager.getResourceByRef(ambient.ambientLight).then(function(ambientLight) {
5591
+ if (!useCustomAmbient) {
5592
+ var _ambientLight;
5593
+ scene.ambientLight.specularTexture = (_ambientLight = ambientLight) == null ? void 0 : _ambientLight.specularTexture;
5594
+ }
5595
+ if (useSH) {
5596
+ var _ambientLight1;
5597
+ scene.ambientLight.diffuseSphericalHarmonics = (_ambientLight1 = ambientLight) == null ? void 0 : _ambientLight1.diffuseSphericalHarmonics;
5598
+ }
5599
+ }));
5600
+ }
5502
5601
  }
5503
5602
  var background = data.scene.background;
5504
5603
  scene.background.mode = background.mode;
@@ -5555,13 +5654,13 @@ SceneLoader = __decorate([
5555
5654
  "scene"
5556
5655
  ], true)
5557
5656
  ], SceneLoader);
5558
- ReflectionParser.registerCustomParseComponent("TextRenderer", /*#__PURE__*/ _async_to_generator(function(instance, item, engine) {
5657
+ ReflectionParser.registerCustomParseComponent("TextRenderer", /*#__PURE__*/ _async_to_generator(function(instance, item) {
5559
5658
  var props;
5560
5659
  return __generator(this, function(_state) {
5561
5660
  props = item.props;
5562
5661
  if (!props.font) {
5563
5662
  // @ts-ignore
5564
- instance.font = Font.createFromOS(engine, props.fontFamily || "Arial");
5663
+ instance.font = Font.createFromOS(instance.engine, props.fontFamily || "Arial");
5565
5664
  }
5566
5665
  return [
5567
5666
  2,
@@ -5617,7 +5716,7 @@ var KHR_draco_mesh_compression = (_KHR_draco_mesh_compression = /*#__PURE__*/ fu
5617
5716
  throw "BlendShape animation is not supported when using draco.";
5618
5717
  }, function() {
5619
5718
  return decodedGeometry.index.array;
5620
- }, context.keepMeshData);
5719
+ }, context.params.keepMeshData);
5621
5720
  });
5622
5721
  });
5623
5722
  };