@urso/core 0.7.86 → 0.7.88

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 (4) hide show
  1. package/build/js/index.js +1 -1
  2. package/package.json +1 -1
  3. package/src/js/lib/helper.js +1 -1
  4. package/src/js/modules/assets/service.js +16 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@urso/core",
3
- "version": "0.7.86",
3
+ "version": "0.7.88",
4
4
  "description": "HTML5 game engine",
5
5
  "main": "build/js/index.js",
6
6
  "author": "Megbrimef",
package/src/js/lib/helper.js CHANGED
@@ -444,7 +444,7 @@ class LibHelper {
444
444
  check = true;
445
445
  })(navigator.userAgent || navigator.vendor || window.opera);
446
446
 
447
- return check;
447
+ return check || Urso.helper.isIpadOS();
448
448
  }
449
449
 
450
450
  /**
package/src/js/modules/assets/service.js CHANGED
@@ -82,7 +82,13 @@ class ModulesAssetsService {
82
82
  return Urso.logger.error('ModulesAssetsService group error, no assets:' + group + ' Check ModulesAssetsConfig please');
83
83
 
84
84
  //we need load and parse atlases at first (!)
85
- this._loadGroupAtlases(assetsSpace, group, () => { this._loadGroupRestAssets(assetsSpace, group, callback, updateCallback) });
85
+ const loadRestAssetsCallback = () => { this._loadGroupRestAssets(assetsSpace, group, callback, updateCallback) };
86
+
87
+ const loadAtlasesCallback = () => {
88
+ this._loadGroupAtlases(assetsSpace, group, loadRestAssetsCallback, Urso.types.assets.ATLAS);
89
+ }
90
+
91
+ this._loadGroupAtlases(assetsSpace, group, loadAtlasesCallback, Urso.types.assets.JSONATLAS);
86
92
  }
87
93
 
88
94
  preloadAllImagesInGPU() {
@@ -120,8 +126,8 @@ class ModulesAssetsService {
120
126
  * @param {String} group
121
127
  * @param {Function} callback
122
128
  */
123
- _loadGroupAtlases(assetsSpace, group, callback) {
124
- const atlases = assetsSpace[group].filter(assetModel => assetModel.type === Urso.types.assets.ATLAS || assetModel.type === Urso.types.assets.JSONATLAS);
129
+ _loadGroupAtlases(assetsSpace, group, callback, atlasType) {
130
+ const atlases = assetsSpace[group].filter(assetModel => assetModel.type === atlasType);
125
131
 
126
132
  if (!atlases.length)
127
133
  return callback();
@@ -131,7 +137,12 @@ class ModulesAssetsService {
131
137
  for (let assetModel of atlases)
132
138
  this._addAssetToLoader(assetModel, loader);
133
139
 
134
- loader.start(() => { this._processLoadedAtlases(assetsSpace, group); callback(); });
140
+ loader.start(() => {
141
+ if (atlasType === Urso.types.assets.ATLAS)
142
+ this._processLoadedAtlases(assetsSpace, group);
143
+
144
+ callback();
145
+ });
135
146
  }
136
147
 
137
148
  /**
@@ -147,7 +158,7 @@ class ModulesAssetsService {
147
158
  const noAtlasSpines = [];
148
159
 
149
160
  for (let assetModel of assetsSpace[group])
150
- if (assetModel.type !== Urso.types.assets.ATLAS)
161
+ if (assetModel.type !== Urso.types.assets.ATLAS && assetModel.type !== Urso.types.assets.JSONATLAS)
151
162
  if (!Urso.cache.getFile(assetModel.path)) {
152
163
  //filter noAtlas Spine files
153
164
  if (assetModel.type === Urso.types.assets.SPINE && assetModel.noAtlas) {