@vpmedia/phaser 1.15.0 → 1.16.0

package/src/phaser/core/loader.js

@@ -1,15 +1,15 @@
-/**
- * @copyright    Copyright (c) 2018-present Richard Davey, Photon Storm Ltd., Andras Csizmadia <andras@vpmedia.hu> (www.vpmedia.hu)
- * @author       Andras Csizmadia <andras@vpmedia.hu>
- * @author       Richard Davey <rich@photonstorm.com>
- */
-import { Signal } from  './signal';
-import { Rectangle } from  '../geom/rectangle';
+import { Signal } from './signal';
+import { Rectangle } from '../geom/rectangle';
 import { canPlayAudio } from './device_util';
+import { Game } from './game';
 
 const TEXTURE_ATLAS_JSON_HASH = 1;
 
 export class Loader {
+  /**
+   * TBD.
+   * @param {Game} game - TBD.
+   */
   constructor(game) {
     this.game = game;
     this.cache = game.cache;
@@ -45,6 +45,11 @@ export class Loader {
     this._loadedFileCount = 0;
   }
 
+  /**
+   * TBD.
+   * @param sprite
+   * @param direction
+   */
   setPreloadSprite(sprite, direction = 0) {
     this.preloadSprite = {
       sprite,
@@ -64,16 +69,29 @@ export class Loader {
     sprite.visible = true;
   }
 
+  /**
+   * TBD.
+   */
   resize() {
     if (this.preloadSprite && this.preloadSprite.height !== this.preloadSprite.sprite.height) {
       this.preloadSprite.rect.height = this.preloadSprite.sprite.height;
     }
   }
 
+  /**
+   * TBD.
+   * @param type
+   * @param {string} key - TBD.
+   */
   checkKeyExists(type, key) {
     return this.getAssetIndex(type, key) > -1;
   }
 
+  /**
+   * TBD.
+   * @param type
+   * @param {string} key - TBD.
+   */
   getAssetIndex(type, key) {
     let bestFound = -1;
     for (let i = 0; i < this._fileList.length; i += 1) {
@@ -90,6 +108,11 @@ export class Loader {
     return bestFound;
   }
 
+  /**
+   * TBD.
+   * @param type
+   * @param {string} key - TBD.
+   */
   getAsset(type, key) {
     const fileIndex = this.getAssetIndex(type, key);
     if (fileIndex > -1) {
@@ -98,6 +121,11 @@ export class Loader {
     return null;
   }
 
+  /**
+   * TBD.
+   * @param hard
+   * @param clearEvents
+   */
   reset(hard, clearEvents = false) {
     if (hard) {
       this.preloadSprite = null;
@@ -121,14 +149,16 @@ export class Loader {
     }
   }
 
-  addToFileList(
-    type,
-    key = '',
-    url = null,
-    properties = null,
-    overwrite = false,
-    extension = null
-  ) {
+  /**
+   * TBD.
+   * @param type
+   * @param {string} key - TBD.
+   * @param url
+   * @param properties
+   * @param overwrite
+   * @param extension
+   */
+  addToFileList(type, key = '', url = null, properties = null, overwrite = false, extension = null) {
     if (key === undefined || key === '') {
       console.warn('Loader: Invalid or no key given of type ' + type);
       return this;
@@ -175,10 +205,24 @@ export class Loader {
     return this;
   }
 
+  /**
+   * TBD.
+   * @param type
+   * @param {string} key - TBD.
+   * @param url
+   * @param properties
+   */
   replaceInFileList(type, key, url, properties) {
     return this.addToFileList(type, key, url, properties, true);
   }
 
+  /**
+   * TBD.
+   * @param {string} key - TBD.
+   * @param url
+   * @param data
+   * @param callbackContext
+   */
   pack(key, url, data, callbackContext) {
     const pack = {
       type: 'packfile',
@@ -210,10 +254,21 @@ export class Loader {
     return this;
   }
 
+  /**
+   * TBD.
+   * @param {string} key - TBD.
+   * @param url
+   * @param overwrite
+   */
   image(key, url, overwrite) {
     return this.addToFileList('image', key, url, undefined, overwrite, '.png');
   }
 
+  /**
+   * TBD.
+   * @param keys
+   * @param urls
+   */
   images(keys, urls) {
     if (Array.isArray(urls)) {
       for (let i = 0; i < keys.length; i += 1) {
@@ -227,18 +282,46 @@ export class Loader {
     return this;
   }
 
+  /**
+   * TBD.
+   * @param {string} key - TBD.
+   * @param url
+   * @param overwrite
+   */
   text(key, url, overwrite) {
     return this.addToFileList('text', key, url, undefined, overwrite, '.txt');
   }
 
+  /**
+   * TBD.
+   * @param {string} key - TBD.
+   * @param url
+   * @param overwrite
+   */
   json(key, url, overwrite) {
     return this.addToFileList('json', key, url, undefined, overwrite, '.json');
   }
 
+  /**
+   * TBD.
+   * @param {string} key - TBD.
+   * @param url
+   * @param overwrite
+   */
   xml(key, url, overwrite) {
     return this.addToFileList('xml', key, url, undefined, overwrite, '.xml');
   }
 
+  /**
+   * TBD.
+   * @param {string} key - TBD.
+   * @param url
+   * @param frameWidth
+   * @param frameHeight
+   * @param frameMax
+   * @param margin
+   * @param spacing
+   */
   spritesheet(key, url, frameWidth, frameHeight, frameMax = -1, margin = 0, spacing = 0) {
     return this.addToFileList(
       'spritesheet',
@@ -250,6 +333,12 @@ export class Loader {
     );
   }
 
+  /**
+   * TBD.
+   * @param {string} key - TBD.
+   * @param urls
+   * @param autoDecode
+   */
   audio(key, urls, autoDecode = true) {
     if (this.game.sound.noAudio) {
       return this;
@@ -260,6 +349,14 @@ export class Loader {
     return this.addToFileList('audio', key, urls, { buffer: null, autoDecode });
   }
 
+  /**
+   * TBD.
+   * @param {string} key - TBD.
+   * @param urls
+   * @param jsonURL
+   * @param jsonData
+   * @param autoDecode
+   */
   audioSprite(key, urls, jsonURL, jsonData, autoDecode = true) {
     if (this.game.sound.noAudio) {
       return this;
@@ -276,14 +373,16 @@ export class Loader {
     return this;
   }
 
-  bitmapFont(
-    key,
-    textureURL = null,
-    atlasURL = null,
-    atlasData = null,
-    xSpacing = 0,
-    ySpacing = 0
-  ) {
+  /**
+   * TBD.
+   * @param {string} key - TBD.
+   * @param textureURL
+   * @param atlasURL
+   * @param atlasData
+   * @param xSpacing
+   * @param ySpacing
+   */
+  bitmapFont(key, textureURL = null, atlasURL = null, atlasData = null, xSpacing = 0, ySpacing = 0) {
     if (textureURL === undefined || textureURL === null) {
       textureURL = key + '.png';
     }
@@ -316,6 +415,14 @@ export class Loader {
     return this;
   }
 
+  /**
+   * TBD.
+   * @param {string} key - TBD.
+   * @param textureURL
+   * @param atlasURL
+   * @param atlasData
+   * @param format
+   */
   atlas(key, textureURL, atlasURL = null, atlasData = null, format = TEXTURE_ATLAS_JSON_HASH) {
     if (textureURL === undefined || textureURL === null) {
       textureURL = key + '.png';
@@ -332,6 +439,11 @@ export class Loader {
     return this;
   }
 
+  /**
+   * TBD.
+   * @param callback - TBD.
+   * @param callbackContext
+   */
   withSyncPoint(callback, callbackContext) {
     this._withSyncPointDepth += 1;
     try {
@@ -342,6 +454,11 @@ export class Loader {
     return this;
   }
 
+  /**
+   * TBD.
+   * @param type
+   * @param {string} key - TBD.
+   */
   addSyncPoint(type, key) {
     const asset = this.getAsset(type, key);
     if (asset) {
@@ -350,6 +467,11 @@ export class Loader {
     return this;
   }
 
+  /**
+   * TBD.
+   * @param type
+   * @param {string} key - TBD.
+   */
   removeFile(type, key) {
     const asset = this.getAsset(type, key);
     if (asset) {
@@ -359,11 +481,17 @@ export class Loader {
     }
   }
 
+  /**
+   * TBD.
+   */
   removeAll() {
     this._fileList.length = 0;
     this._flightQueue.length = 0;
   }
 
+  /**
+   * TBD.
+   */
   start() {
     if (this.isLoading) {
       return;
@@ -374,6 +502,9 @@ export class Loader {
     this.processLoadQueue();
   }
 
+  /**
+   * TBD.
+   */
   processLoadQueue() {
     if (!this.isLoading) {
       console.warn('Loader - active loading canceled / reset');
@@ -404,12 +535,7 @@ export class Loader {
         } else if (file.type === 'packfile' && file.error) {
           // Non-error pack files are handled when processing the file queue
           this._loadedPackCount += 1;
-          this.onPackComplete.dispatch(
-            file.key,
-            !file.error,
-            this._loadedPackCount,
-            this._totalPackCount
-          );
+          this.onPackComplete.dispatch(file.key, !file.error, this._loadedPackCount, this._totalPackCount);
         }
       }
     }
@@ -423,12 +549,7 @@ export class Loader {
         // Processing the pack / adds more files
         this.processPack(file);
         this._loadedPackCount += 1;
-        this.onPackComplete.dispatch(
-          file.key,
-          !file.error,
-          this._loadedPackCount,
-          this._totalPackCount
-        );
+        this.onPackComplete.dispatch(file.key, !file.error, this._loadedPackCount, this._totalPackCount);
       }
       if (file.loaded || file.error) {
         // Item at the start of file list finished, can skip it in future
@@ -459,10 +580,7 @@ export class Loader {
       }
       // Stop looking if queue full - or if syncblocked and there are no more packs.
       // (As only packs can be loaded around a syncblock)
-      if (
-        this._flightQueue.length >= inflightLimit ||
-        (syncblock && this._loadedPackCount === this._totalPackCount)
-      ) {
+      if (this._flightQueue.length >= inflightLimit || (syncblock && this._loadedPackCount === this._totalPackCount)) {
         break;
       }
     }
@@ -482,6 +600,10 @@ export class Loader {
     }
   }
 
+  /**
+   * TBD.
+   * @param abnormal
+   */
   finishedLoading(abnormal) {
     if (this.hasLoaded) {
       return;
@@ -501,6 +623,11 @@ export class Loader {
     // this.reset();
   }
 
+  /**
+   * TBD.
+   * @param file
+   * @param errorMessage
+   */
   asyncComplete(file, errorMessage = '') {
     file.loaded = true;
     file.error = !!errorMessage;
@@ -512,6 +639,10 @@ export class Loader {
     this.processLoadQueue();
   }
 
+  /**
+   * TBD.
+   * @param pack
+   */
   processPack(pack) {
     const packData = pack.data[pack.key];
     if (!packData) {
@@ -565,18 +696,17 @@ export class Loader {
           );
           break;
         case 'atlas':
-          this.atlas(
-            file.key,
-            file.textureURL,
-            file.atlasURL,
-            file.atlasData,
-            TEXTURE_ATLAS_JSON_HASH
-          );
+          this.atlas(file.key, file.textureURL, file.atlasURL, file.atlasData, TEXTURE_ATLAS_JSON_HASH);
           break;
       }
     }
   }
 
+  /**
+   * TBD.
+   * @param url
+   * @param file
+   */
   transformUrl(url, file) {
     if (!url) {
       return false;
@@ -587,6 +717,10 @@ export class Loader {
     return this.baseURL + file.path + url;
   }
 
+  /**
+   * TBD.
+   * @param file
+   */
   loadFile(file) {
     switch (file.type) {
       case 'packfile':
@@ -603,11 +737,7 @@ export class Loader {
         if (file.url) {
           this.xhrLoad(file, this.transformUrl(file.url, file), 'arraybuffer', this.fileComplete);
         } else {
-          this.fileError(
-            file,
-            null,
-            'No supported audio URL specified or device does not have audio playback support'
-          );
+          this.fileError(file, null, 'No supported audio URL specified or device does not have audio playback support');
         }
         break;
       case 'json':
@@ -625,6 +755,10 @@ export class Loader {
     }
   }
 
+  /**
+   * TBD.
+   * @param file
+   */
   loadImageTag(file) {
     this.log('loadImageTag', file);
     const scope = this;
@@ -653,6 +787,14 @@ export class Loader {
     file.data.src = this.transformUrl(file.url, file);
   }
 
+  /**
+   * TBD.
+   * @param file
+   * @param url
+   * @param type
+   * @param onload
+   * @param onerror
+   */
   xhrLoad(file, url, type, onload, onerror) {
     this.log('xhrLoad', file);
     const scope = this;
@@ -712,11 +854,18 @@ export class Loader {
     xhr.send();
   }
 
+  /**
+   * TBD.
+   */
   xhrLoadWithXDR() {
     // TODO
     console.warn('loader.xhrLoadWithXDR() is not implemented');
   }
 
+  /**
+   * TBD.
+   * @param urls
+   */
   getAudioURL(urls) {
     if (this.game.sound.noAudio) {
       return null;
@@ -750,6 +899,12 @@ export class Loader {
     return null;
   }
 
+  /**
+   * TBD.
+   * @param file
+   * @param xhr
+   * @param reason
+   */
   fileError(file, xhr, reason) {
     // const url = file.requestUrl || this.transformUrl(file.url, file);
     let message = 'Error loading asset';
@@ -762,6 +917,11 @@ export class Loader {
     this.asyncComplete(file, message);
   }
 
+  /**
+   * TBD.
+   * @param file
+   * @param xhr
+   */
   fileComplete(file, xhr) {
     let loadNext = true;
     switch (file.type) {
@@ -790,12 +950,7 @@ export class Loader {
         } else {
           loadNext = false;
           if (file.format === TEXTURE_ATLAS_JSON_HASH) {
-            this.xhrLoad(
-              file,
-              this.transformUrl(file.atlasURL, file),
-              'text',
-              this.jsonLoadComplete
-            );
+            this.xhrLoad(file, this.transformUrl(file.atlasURL, file), 'text', this.jsonLoadComplete);
           } else {
             throw new Error('Invalid Texture Atlas format: ' + file.format);
           }
@@ -815,27 +970,22 @@ export class Loader {
         } else {
           //  Load the XML before carrying on with the next file
           loadNext = false;
-          this.xhrLoad(
-            file,
-            this.transformUrl(file.atlasURL, file),
-            'text',
-            (bitmapFontFile, bitmapFontXhr) => {
-              let json;
-              try {
-                // Try to parse as JSON, if it fails, then it's hopefully XML
-                json = JSON.parse(bitmapFontXhr.responseText);
-              } catch (e) {
-                // pass
-              }
-              if (json) {
-                bitmapFontFile.atlasType = 'json';
-                this.jsonLoadComplete(bitmapFontFile, bitmapFontXhr);
-              } else {
-                bitmapFontFile.atlasType = 'xml';
-                this.xmlLoadComplete(bitmapFontFile, bitmapFontXhr);
-              }
+          this.xhrLoad(file, this.transformUrl(file.atlasURL, file), 'text', (bitmapFontFile, bitmapFontXhr) => {
+            let json;
+            try {
+              // Try to parse as JSON, if it fails, then it's hopefully XML
+              json = JSON.parse(bitmapFontXhr.responseText);
+            } catch (e) {
+              // pass
             }
-          );
+            if (json) {
+              bitmapFontFile.atlasType = 'json';
+              this.jsonLoadComplete(bitmapFontFile, bitmapFontXhr);
+            } else {
+              bitmapFontFile.atlasType = 'xml';
+              this.xmlLoadComplete(bitmapFontFile, bitmapFontXhr);
+            }
+          });
         }
         break;
       case 'audio':
@@ -858,18 +1008,15 @@ export class Loader {
     }
   }
 
+  /**
+   * TBD.
+   * @param file
+   * @param xhr
+   */
   jsonLoadComplete(file, xhr) {
     const data = JSON.parse(xhr.responseText);
     if (file.type === 'bitmapfont') {
-      this.cache.addBitmapFont(
-        file.key,
-        file.url,
-        file.data,
-        data,
-        file.atlasType,
-        file.xSpacing,
-        file.ySpacing
-      );
+      this.cache.addBitmapFont(file.key, file.url, file.data, data, file.atlasType, file.xSpacing, file.ySpacing);
     } else if (file.type === 'json') {
       this.cache.addJSON(file.key, file.url, data);
     } else {
@@ -878,11 +1025,19 @@ export class Loader {
     this.asyncComplete(file);
   }
 
+  /**
+   * TBD.
+   */
   csvLoadComplete() {
     // TODO
     console.warn('loader.csvLoadComplete() is not implemented');
   }
 
+  /**
+   * TBD.
+   * @param file
+   * @param xhr
+   */
   xmlLoadComplete(file, xhr) {
     // Always try parsing the content as XML, regardless of actually response type
     const data = xhr.responseText;
@@ -894,15 +1049,7 @@ export class Loader {
       return;
     }
     if (file.type === 'bitmapfont') {
-      this.cache.addBitmapFont(
-        file.key,
-        file.url,
-        file.data,
-        xml,
-        file.atlasType,
-        file.xSpacing,
-        file.ySpacing
-      );
+      this.cache.addBitmapFont(file.key, file.url, file.data, xml, file.atlasType, file.xSpacing, file.ySpacing);
     } else if (file.type === 'textureatlas') {
       this.cache.addTextureAtlas(file.key, file.url, file.data, xml, file.format);
     } else if (file.type === 'xml') {
@@ -911,6 +1058,10 @@ export class Loader {
     this.asyncComplete(file);
   }
 
+  /**
+   * TBD.
+   * @param data
+   */
   parseXml(data) {
     let xml = null;
     try {
@@ -932,16 +1083,15 @@ export class Loader {
     return xml;
   }
 
+  /**
+   * TBD.
+   */
   updateProgress() {
     if (this.preloadSprite) {
       if (this.preloadSprite.direction === 0) {
-        this.preloadSprite.rect.width = Math.floor(
-          (this.preloadSprite.width / 100) * this.progress
-        );
+        this.preloadSprite.rect.width = Math.floor((this.preloadSprite.width / 100) * this.progress);
       } else {
-        this.preloadSprite.rect.height = Math.floor(
-          (this.preloadSprite.height / 100) * this.progress
-        );
+        this.preloadSprite.rect.height = Math.floor((this.preloadSprite.height / 100) * this.progress);
       }
       if (this.preloadSprite.sprite) {
         this.preloadSprite.sprite.updateCrop();
@@ -952,6 +1102,11 @@ export class Loader {
     }
   }
 
+  /**
+   * TBD.
+   * @param message
+   * @param data
+   */
   log(message, data = '') {
     if (!this.isUseLog) {
       return;
@@ -959,27 +1114,45 @@ export class Loader {
     console.log(`[Loader] ${message}`, data);
   }
 
+  /**
+   * TBD.
+   */
   totalLoadedFiles() {
     return this._loadedFileCount;
   }
 
+  /**
+   * TBD.
+   */
   totalQueuedFiles() {
     return this._totalFileCount - this._loadedFileCount;
   }
 
+  /**
+   * TBD.
+   */
   totalLoadedPacks() {
     return this._totalPackCount;
   }
 
+  /**
+   * TBD.
+   */
   totalQueuedPacks() {
     return this._totalPackCount - this._loadedPackCount;
   }
 
+  /**
+   * TBD.
+   */
   get progressFloat() {
     const progress = (this._loadedFileCount / this._totalFileCount) * 100;
     return Math.max(0, Math.min(100, progress || 0));
   }
 
+  /**
+   * TBD.
+   */
   get progress() {
     return Math.round(this.progressFloat);
   }