Merge branch 'master' into memory-bloat

Author: liply

js/libs/iphone-inline-video.browser.js

@@ -153,7 +153,7 @@ Bitmap.snap = function(stage) {
         }
         context.drawImage(canvas, 0, 0);
     } else {
-        //TODO: Ivan: what if stage is not present?
+
     }
     renderTexture.destroy({ destroyBase: true });
     bitmap._setDirty();
@@ -809,7 +809,7 @@ Bitmap.prototype.decode = function(){
 Bitmap.prototype._callLoadListeners = function() {
     while (this._loadListeners.length > 0) {
         var listener = this._loadListeners.shift();
-        listener();
+        listener(this);
     }
 };
 

js/rpg_core/Bitmap.js

@@ -73,7 +73,6 @@ CacheEntry.prototype.touch = function () {
         this.touchSeconds = cache.updateSeconds;
     } else if (this.freedByTTL) {
         this.freedByTTL = false;
-        //TODO: shall we log this event? its not normal
         if (!cache._inner[this.key]) {
             cache._inner[this.key] = this;
         }

js/rpg_core/CacheEntry.js

@@ -1,12 +1,4 @@
 //-----------------------------------------------------------------------------
-
-var waitForLoading = false;
-var register = false;
-
-function handleiOSTouch(ev) {
-        if (Graphics._video.paused && Graphics.isVideoPlaying())Graphics._video.play();
-}
-
 /**
  * The static class that carries out graphics processing.
  *
@@ -16,6 +8,10 @@ function Graphics() {
     throw new Error('This is a static class');
 }
 
+Graphics._cssFontLoading =  document.fonts && document.fonts.ready;
+Graphics._fontLoaded = null;
+
+
 /**
  * Initializes the graphics system.
  *
@@ -39,6 +35,8 @@ Graphics.initialize = function(width, height, type) {
     this._errorPrinter = null;
     this._canvas = null;
     this._video = null;
+    this._videoUnlocked = !Utils.isMobileDevice();
+    this._videoLoading = false;
     this._upperCanvas = null;
     this._renderer = null;
     this._fpsMeter = null;
@@ -62,6 +60,22 @@ Graphics.initialize = function(width, height, type) {
     this._disableTextSelection();
     this._disableContextMenu();
     this._setupEventHandlers();
+    this._setupCssFontLoading();
+};
+
+
+Graphics._setupCssFontLoading = function(){
+    if(Graphics._cssFontLoading){
+        document.fonts.ready.then(function(fonts){
+            Graphics._fontLoaded = fonts;
+        }).catch(function(error){
+            SceneManager.onError(error);
+        });
+    }
+};
+
+Graphics.canUseCssFontLoading = function(){
+    return !!this._cssFontLoading;
 };
 
 /**
@@ -323,17 +337,25 @@ Graphics.loadFont = function(name, url) {
  * @return {Boolean} True if the font file is loaded
  */
 Graphics.isFontLoaded = function(name) {
-    if (!this._hiddenCanvas) {
-        this._hiddenCanvas = document.createElement('canvas');
+    if (Graphics._cssFontLoading) {
+        if(Graphics._fontLoaded){
+            return Graphics._fontLoaded.check('10px "'+name+'"');
+        }
+
+        return false;
+    } else {
+        if (!this._hiddenCanvas) {
+            this._hiddenCanvas = document.createElement('canvas');
+        }
+        var context = this._hiddenCanvas.getContext('2d');
+        var text = 'abcdefghijklmnopqrstuvwxyz';
+        var width1, width2;
+        context.font = '40px ' + name + ', sans-serif';
+        width1 = context.measureText(text).width;
+        context.font = '40px sans-serif';
+        width2 = context.measureText(text).width;
+        return width1 !== width2;
     }
-    var context = this._hiddenCanvas.getContext('2d');
-    var text = 'abcdefghijklmnopqrstuvwxyz';
-    var width1, width2;
-    context.font = '40px ' + name + ', sans-serif';
-    width1 = context.measureText(text).width;
-    context.font = '40px sans-serif';
-    width2 = context.measureText(text).width;
-    return width1 !== width2;
 };
 
 /**
@@ -349,14 +371,7 @@ Graphics.playVideo = function(src) {
     this._video.onerror = this._onVideoError.bind(this);
     this._video.onended = this._onVideoEnd.bind(this);
     this._video.load();
-
-    if (Utils.isMobileSafari()) {
-        waitForLoading = true;
-        if (!register) {
-            register = true;
-            document.addEventListener('touchstart', handleiOSTouch);
-        }
-    }
+    this._videoLoading = true;
 };
 
 /**
@@ -367,8 +382,7 @@ Graphics.playVideo = function(src) {
  * @return {Boolean} True if the video is playing
  */
 Graphics.isVideoPlaying = function() {
-    if (Utils.isMobileSafari()) return waitForLoading || (this._video && this._isVideoVisible());
-    return this._video && this._isVideoVisible();
+    return this._videoLoading || this._isVideoVisible();
 };
 
 /**
@@ -707,7 +721,9 @@ Graphics._createVideo = function() {
     this._video = document.createElement('video');
     this._video.id = 'GameVideo';
     this._video.style.opacity = 0;
+    this._video.setAttribute('playsinline', '');
     this._updateVideo();
+    makeVideoPlayableInline(this._video);
     document.body.appendChild(this._video);
 };
 
@@ -962,9 +978,7 @@ Graphics._applyCanvasFilter = function() {
 Graphics._onVideoLoad = function() {
     this._video.play();
     this._updateVisibility(true);
-    if (Utils.isMobileSafari()) {
-        waitForLoading = false;
-    }
+    this._videoLoading = false;
 };
 
 /**
@@ -974,6 +988,7 @@ Graphics._onVideoLoad = function() {
  */
 Graphics._onVideoError = function() {
     this._updateVisibility(false);
+    this._videoLoading = false;
 };
 
 /**
@@ -983,13 +998,6 @@ Graphics._onVideoError = function() {
  */
 Graphics._onVideoEnd = function() {
     this._updateVisibility(false);
-
-    if (Utils.isMobileSafari()) {
-        if (register) {
-            document.removeEventListener('touchstart', handleiOSTouch);
-            register = false;
-        }
-    }
 };
 
 /**
@@ -1021,6 +1029,7 @@ Graphics._isVideoVisible = function() {
 Graphics._setupEventHandlers = function() {
     window.addEventListener('resize', this._onWindowResize.bind(this));
     document.addEventListener('keydown', this._onKeyDown.bind(this));
+    document.addEventListener('touchend', this._onTouchEnd.bind(this));
 };
 
 /**
@@ -1057,6 +1066,22 @@ Graphics._onKeyDown = function(event) {
     }
 };
 
+/**
+ * @static
+ * @method _onTouchEnd
+ * @param {TouchEvent} event
+ * @private
+ */
+Graphics._onTouchEnd = function(event) {
+    if (!this._videoUnlocked) {
+        this._video.play();
+        this._videoUnlocked = true;
+    }
+    if (this._isVideoVisible() && this._video.paused) {
+        this._video.play();
+    }
+};
+
 /**
  * @static
  * @method _switchFPSMeter

js/rpg_core/Graphics.js

@@ -18,6 +18,11 @@ function JsonEx() {
  */
 JsonEx.maxDepth = 100;
 
+JsonEx._id = 1;
+JsonEx._generateId = function(){
+    return JsonEx._id++;
+};
+
 /**
  * Converts an object to a JSON string with object information.
  *
@@ -27,7 +32,23 @@ JsonEx.maxDepth = 100;
  * @return {String} The JSON string
  */
 JsonEx.stringify = function(object) {
-    return JSON.stringify(this._encode(object));
+    var circular = [];
+    JsonEx._id = 1;
+    var json = JSON.stringify(this._encode(object, circular, 0));
+    this._cleanMetadata(object);
+    this._restoreCircularReference(circular);
+
+    return json;
+};
+
+JsonEx._restoreCircularReference = function(circulars){
+    circulars.forEach(function(circular){
+        var key = circular[0];
+        var value = circular[1];
+        var content = circular[2];
+
+        value[key] = content;
+    });
 };
 
 /**
@@ -39,9 +60,43 @@ JsonEx.stringify = function(object) {
  * @return {Object} The reconstructed object
  */
 JsonEx.parse = function(json) {
-    return this._decode(JSON.parse(json));
+    var circular = [];
+    var registry = {};
+    var contents = this._decode(JSON.parse(json), circular, registry);
+    this._cleanMetadata(contents);
+    this._linkCircularReference(contents, circular, registry);
+
+    return contents;
+};
+
+JsonEx._linkCircularReference = function(contents, circulars, registry){
+    circulars.forEach(function(circular){
+        var key = circular[0];
+        var value = circular[1];
+        var id = circular[2];
+
+        value[key] = registry[id];
+    });
 };
 
+JsonEx._cleanMetadata = function(object){
+    if(!object) return;
+
+    delete object['@'];
+    delete object['@c'];
+    delete object['@m'];
+
+    if(typeof object === 'object'){
+        Object.keys(object).forEach(function(key){
+            var value = object[key];
+            if(typeof value === 'object'){
+                JsonEx._cleanMetadata(value);
+            }
+        });
+    }
+};
+
+
 /**
  * Makes a deep copy of the specified object.
  *
@@ -58,24 +113,36 @@ JsonEx.makeDeepCopy = function(object) {
  * @static
  * @method _encode
  * @param {Object} value
+ * @param {Array} circular
  * @param {Number} depth
  * @return {Object}
  * @private
  */
-JsonEx._encode = function(value, depth) {
+JsonEx._encode = function(value, circular, depth) {
     depth = depth || 0;
     if (++depth >= this.maxDepth) {
         throw new Error('Object too deep');
     }
     var type = Object.prototype.toString.call(value);
     if (type === '[object Object]' || type === '[object Array]') {
+        value['@m'] = true;
+        value['@c'] = JsonEx._generateId();
         var constructorName = this._getConstructorName(value);
         if (constructorName !== 'Object' && constructorName !== 'Array') {
             value['@'] = constructorName;
         }
         for (var key in value) {
             if (value.hasOwnProperty(key)) {
-                value[key] = this._encode(value[key], depth + 1);
+                if(value[key] && typeof value[key] === 'object'){
+                    if(!value[key]['@m']){
+                        value[key] = this._encode(value[key], circular, depth + 1);
+                    }else{
+                        circular.push([key, value, value[key]]);
+                        value[key] = {'@r': value[key]['@c']};
+                    }
+                }else{
+                    value[key] = this._encode(value[key], circular, depth + 1);
+                }
             }
         }
     }
@@ -87,12 +154,16 @@ JsonEx._encode = function(value, depth) {
  * @static
  * @method _decode
  * @param {Object} value
+ * @param {Array} circular
+ * @param {Object} registry
  * @return {Object}
  * @private
  */
-JsonEx._decode = function(value) {
+JsonEx._decode = function(value, circular, registry) {
     var type = Object.prototype.toString.call(value);
     if (type === '[object Object]' || type === '[object Array]') {
+        registry[value['@c']] = value;
+
         if (value['@']) {
             var constructor = window[value['@']];
             if (constructor) {
@@ -101,7 +172,10 @@ JsonEx._decode = function(value) {
         }
         for (var key in value) {
             if (value.hasOwnProperty(key)) {
-                value[key] = this._decode(value[key]);
+                if(value[key] && value[key]['@r']){
+                    circular.push([key, value, value[key]['@r']])
+                }
+                value[key] = this._decode(value[key], circular, registry);
             }
         }
     }