@galacean/engine-loader 1.3.17 → 1.3.19

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.
Files changed (8) hide show
  1. package/dist/main.js +32 -7
  2. package/dist/main.js.map +1 -1
  3. package/dist/miniprogram.js +32 -7
  4. package/dist/module.js +32 -7
  5. package/dist/module.js.map +1 -1
  6. package/package.json +4 -4
  7. package/types/MeshLoader.d.ts +1 -0
  8. package/types/index.d.ts +1 -0
package/dist/miniprogram.js CHANGED
@@ -5833,20 +5833,19 @@ var MaterialLoader = /*#__PURE__*/ function(Loader1) {
5833
5833
  })).then(function(materialSchema) {
5834
5834
  var engine = resourceManager.engine;
5835
5835
  var shaderRef = materialSchema.shaderRef, shaderName = materialSchema.shader;
5836
- if (shaderRef) {
5836
+ var shader = miniprogram.Shader.find(shaderName);
5837
+ if (shader) {
5838
+ resolve(_this._getMaterialByShader(materialSchema, shader, engine));
5839
+ } else if (shaderRef) {
5837
5840
  resolve(resourceManager// @ts-ignore
5838
5841
  .getResourceByRef(shaderRef).then(function(shader) {
5839
- return _this.getMaterialByShader(materialSchema, shader, engine);
5842
+ return _this._getMaterialByShader(materialSchema, shader, engine);
5840
5843
  }));
5841
- } else {
5842
- // compatible with 1.2-pre version material schema
5843
- var shader = miniprogram.Shader.find(shaderName);
5844
- resolve(_this.getMaterialByShader(materialSchema, shader, engine));
5845
5844
  }
5846
5845
  }).catch(reject);
5847
5846
  });
5848
5847
  };
5849
- _proto.getMaterialByShader = function getMaterialByShader(materialSchema, shader, engine) {
5848
+ _proto._getMaterialByShader = function _getMaterialByShader(materialSchema, shader, engine) {
5850
5849
  var _loop = function(key) {
5851
5850
  var _shaderData_key = shaderData[key], type = _shaderData_key.type, value = _shaderData_key.value;
5852
5851
  switch(type){
@@ -5906,6 +5905,32 @@ MaterialLoader = __decorate([
5906
5905
  ])
5907
5906
  ], MaterialLoader);
5908
5907
 
5908
+ var MeshLoader = /*#__PURE__*/ function(Loader1) {
5909
+ _inherits(MeshLoader, Loader1);
5910
+ function MeshLoader() {
5911
+ return Loader1.apply(this, arguments);
5912
+ }
5913
+ var _proto = MeshLoader.prototype;
5914
+ _proto.load = function load(item, resourceManager) {
5915
+ var _this = this;
5916
+ return new miniprogram.AssetPromise(function(resolve, reject) {
5917
+ _this.request(item.url, resourceManager, _extends({}, item, {
5918
+ type: "arraybuffer"
5919
+ })).then(function(data) {
5920
+ return decode(data, resourceManager.engine);
5921
+ }).then(function(mesh) {
5922
+ resolve(mesh);
5923
+ }).catch(reject);
5924
+ });
5925
+ };
5926
+ return MeshLoader;
5927
+ }(miniprogram.Loader);
5928
+ MeshLoader = __decorate([
5929
+ miniprogram.resourceLoader(miniprogram.AssetType.Mesh, [
5930
+ "mesh"
5931
+ ])
5932
+ ], MeshLoader);
5933
+
5909
5934
  var PrimitiveMeshLoader = /*#__PURE__*/ function(Loader1) {
5910
5935
  _inherits(PrimitiveMeshLoader, Loader1);
5911
5936
  function PrimitiveMeshLoader() {
package/dist/module.js CHANGED
@@ -5829,20 +5829,19 @@ var MaterialLoader = /*#__PURE__*/ function(Loader1) {
5829
5829
  })).then(function(materialSchema) {
5830
5830
  var engine = resourceManager.engine;
5831
5831
  var shaderRef = materialSchema.shaderRef, shaderName = materialSchema.shader;
5832
- if (shaderRef) {
5832
+ var shader = Shader.find(shaderName);
5833
+ if (shader) {
5834
+ resolve(_this._getMaterialByShader(materialSchema, shader, engine));
5835
+ } else if (shaderRef) {
5833
5836
  resolve(resourceManager// @ts-ignore
5834
5837
  .getResourceByRef(shaderRef).then(function(shader) {
5835
- return _this.getMaterialByShader(materialSchema, shader, engine);
5838
+ return _this._getMaterialByShader(materialSchema, shader, engine);
5836
5839
  }));
5837
- } else {
5838
- // compatible with 1.2-pre version material schema
5839
- var shader = Shader.find(shaderName);
5840
- resolve(_this.getMaterialByShader(materialSchema, shader, engine));
5841
5840
  }
5842
5841
  }).catch(reject);
5843
5842
  });
5844
5843
  };
5845
- _proto.getMaterialByShader = function getMaterialByShader(materialSchema, shader, engine) {
5844
+ _proto._getMaterialByShader = function _getMaterialByShader(materialSchema, shader, engine) {
5846
5845
  var _loop = function(key) {
5847
5846
  var _shaderData_key = shaderData[key], type = _shaderData_key.type, value = _shaderData_key.value;
5848
5847
  switch(type){
@@ -5902,6 +5901,32 @@ MaterialLoader = __decorate([
5902
5901
  ])
5903
5902
  ], MaterialLoader);
5904
5903
 
5904
+ var MeshLoader = /*#__PURE__*/ function(Loader1) {
5905
+ _inherits(MeshLoader, Loader1);
5906
+ function MeshLoader() {
5907
+ return Loader1.apply(this, arguments);
5908
+ }
5909
+ var _proto = MeshLoader.prototype;
5910
+ _proto.load = function load(item, resourceManager) {
5911
+ var _this = this;
5912
+ return new AssetPromise(function(resolve, reject) {
5913
+ _this.request(item.url, resourceManager, _extends({}, item, {
5914
+ type: "arraybuffer"
5915
+ })).then(function(data) {
5916
+ return decode(data, resourceManager.engine);
5917
+ }).then(function(mesh) {
5918
+ resolve(mesh);
5919
+ }).catch(reject);
5920
+ });
5921
+ };
5922
+ return MeshLoader;
5923
+ }(Loader);
5924
+ MeshLoader = __decorate([
5925
+ resourceLoader(AssetType.Mesh, [
5926
+ "mesh"
5927
+ ])
5928
+ ], MeshLoader);
5929
+
5905
5930
  var PrimitiveMeshLoader = /*#__PURE__*/ function(Loader1) {
5906
5931
  _inherits(PrimitiveMeshLoader, Loader1);
5907
5932
  function PrimitiveMeshLoader() {