Merge branch 'master' into add_autosave

Author: krmbn0576

js/rpg_core/Graphics.js

@@ -8,7 +8,7 @@ function Graphics() {
     throw new Error('This is a static class');
 }
 
-Graphics._cssFontLoading =  document.fonts && document.fonts.ready;
+Graphics._cssFontLoading =  document.fonts && document.fonts.ready && document.fonts.ready.then;
 Graphics._fontLoaded = null;
 Graphics._videoVolume = 1;
 
@@ -36,7 +36,7 @@ Graphics.initialize = function(width, height, type) {
     this._errorPrinter = null;
     this._canvas = null;
     this._video = null;
-    this._videoUnlocked = !Utils.isMobileDevice();
+    this._videoUnlocked = false;
     this._videoLoading = false;
     this._upperCanvas = null;
     this._renderer = null;
@@ -281,6 +281,7 @@ Graphics.endLoading = function() {
  */
 Graphics.printLoadingError = function(url) {
     if (this._errorPrinter && !this._errorShowed) {
+        this._updateErrorPrinter();
         this._errorPrinter.innerHTML = this._makeErrorHtml('Loading Error', 'Failed to load: ' + url);
         var button = document.createElement('button');
         button.innerHTML = 'Retry';
@@ -309,6 +310,7 @@ Graphics.eraseLoadingError = function() {
     }
 };
 
+// The following code is partly borrowed from triacontane.
 /**
  * Displays the error text to the screen.
  *
@@ -319,13 +321,44 @@ Graphics.eraseLoadingError = function() {
  */
 Graphics.printError = function(name, message) {
     this._errorShowed = true;
+    this.hideFps();
     if (this._errorPrinter) {
+        this._updateErrorPrinter();
         this._errorPrinter.innerHTML = this._makeErrorHtml(name, message);
+        this._makeErrorMessage();
     }
     this._applyCanvasFilter();
     this._clearUpperCanvas();
 };
 
+/**
+ * Shows the stacktrace of error.
+ *
+ * @static
+ * @method printStackTrace
+ */
+Graphics.printStackTrace = function(stack) {
+    if (this._errorPrinter) {
+        stack = (stack || '')
+            .replace(/file:.*js\//g, '')
+            .replace(/http:.*js\//g, '')
+            .replace(/https:.*js\//g, '')
+            .replace(/chrome-extension:.*js\//g, '')
+            .replace(/\n/g, '<br>');
+        this._makeStackTrace(decodeURIComponent(stack));
+    }
+};
+
+/**
+ * Sets the error message.
+ *
+ * @static
+ * @method setErrorMessage
+ */
+Graphics.setErrorMessage = function(message) {
+    this._errorMessage = message;
+};
+
 /**
  * Shows the FPSMeter element.
  *
@@ -673,7 +706,7 @@ Graphics._updateRealScale = function() {
  */
 Graphics._makeErrorHtml = function(name, message) {
     return ('<font color="yellow"><b>' + name + '</b></font><br>' +
-            '<font color="white">' + message + '</font><br>');
+            '<font color="white">' + decodeURIComponent(message) + '</font><br>');
 };
 
 /**
@@ -747,14 +780,49 @@ Graphics._createErrorPrinter = function() {
  */
 Graphics._updateErrorPrinter = function() {
     this._errorPrinter.width = this._width * 0.9;
-    this._errorPrinter.height = 40;
+    this._errorPrinter.height = this._errorShowed ? this._height * 0.9 : 40;
     this._errorPrinter.style.textAlign = 'center';
     this._errorPrinter.style.textShadow = '1px 1px 3px #000';
     this._errorPrinter.style.fontSize = '20px';
     this._errorPrinter.style.zIndex = 99;
+    this._errorPrinter.style.userSelect       = 'text';
+    this._errorPrinter.style.webkitUserSelect = 'text';
+    this._errorPrinter.style.msUserSelect     = 'text';
+    this._errorPrinter.style.mozUserSelect    = 'text';
+    this._errorPrinter.oncontextmenu = null;    // enable context menu
     this._centerElement(this._errorPrinter);
 };
 
+/**
+ * @static
+ * @method _makeErrorMessage
+ * @private
+ */
+Graphics._makeErrorMessage = function() {
+    var mainMessage       = document.createElement('div');
+    var style             = mainMessage.style;
+    style.color           = 'white';
+    style.textAlign       = 'left';
+    style.fontSize        = '18px';
+    mainMessage.innerHTML = '<hr>' + (this._errorMessage || '');
+    this._errorPrinter.appendChild(mainMessage);
+};
+
+/**
+ * @static
+ * @method _makeStackTrace
+ * @private
+ */
+Graphics._makeStackTrace = function(stack) {
+    var stackTrace         = document.createElement('div');
+    var style              = stackTrace.style;
+    style.color            = 'white';
+    style.textAlign        = 'left';
+    style.fontSize         = '18px';
+    stackTrace.innerHTML   = '<br><hr>' + stack + '<hr>';
+    this._errorPrinter.appendChild(stackTrace);
+};
+
 /**
  * @static
  * @method _createCanvas
@@ -1097,6 +1165,8 @@ Graphics._isVideoVisible = function() {
 Graphics._setupEventHandlers = function() {
     window.addEventListener('resize', this._onWindowResize.bind(this));
     document.addEventListener('keydown', this._onKeyDown.bind(this));
+    document.addEventListener('keydown', this._onTouchEnd.bind(this));
+    document.addEventListener('mousedown', this._onTouchEnd.bind(this));
     document.addEventListener('touchend', this._onTouchEnd.bind(this));
 };
 

js/rpg_core/TilingSprite.js

@@ -51,23 +51,6 @@ TilingSprite.prototype._renderCanvas = function(renderer) {
     }
 };
 
-/**
- * @method _renderWebGL
- * @param {Object} renderer
- * @private
- */
-TilingSprite.prototype._renderWebGL = function(renderer) {
-    if (this._bitmap) {
-        this._bitmap.touch();
-    }
-    if (this.texture.frame.width > 0 && this.texture.frame.height > 0) {
-        if (this._bitmap) {
-            this._bitmap.checkDirty();
-        }
-        this._renderWebGL_PIXI(renderer);
-    }
-};
-
 /**
  * The image for the tiling sprite.
  *

js/rpg_core/WebAudio.js

@@ -148,16 +148,19 @@ WebAudio._createMasterGainNode = function() {
  * @private
  */
 WebAudio._setupEventHandlers = function() {
-    document.addEventListener("touchend", function() {
-            var context = WebAudio._context;
-            if (context && context.state === "suspended" && typeof context.resume === "function") {
-                context.resume().then(function() {
-                    WebAudio._onTouchStart();
-                })
-            } else {
+    var resumeHandler = function() {
+        var context = WebAudio._context;
+        if (context && context.state === "suspended" && typeof context.resume === "function") {
+            context.resume().then(function() {
                 WebAudio._onTouchStart();
-            }
-    });
+            })
+        } else {
+            WebAudio._onTouchStart();
+        }
+    };
+    document.addEventListener("keydown", resumeHandler);
+    document.addEventListener("mousedown", resumeHandler);
+    document.addEventListener("touchend", resumeHandler);
     document.addEventListener('touchstart', this._onTouchStart.bind(this));
     document.addEventListener('visibilitychange', this._onVisibilityChange.bind(this));
 };

js/rpg_managers/SceneManager.js

@@ -180,6 +180,7 @@ SceneManager.onKeyDown = function(event) {
 SceneManager.catchException = function(e) {
     if (e instanceof Error) {
         Graphics.printError(e.name, e.message);
+        Graphics.printStackTrace(e.stack);
         console.error(e.stack);
     } else {
         Graphics.printError('UnknownError', e);

js/rpg_managers/StorageManager.js

@@ -195,7 +195,11 @@ StorageManager.localFileDirectoryPath = function() {
     var path = require('path');
 
     var base = path.dirname(process.mainModule.filename);
-    return path.join(base, 'save/');
+    if (this.canMakeWwwSaveDirectory()) {
+        return path.join(base, 'save/');
+    } else {
+        return path.join(path.dirname(base), 'save/');
+    }
 };
 
 StorageManager.localFilePath = function(savefileId) {
@@ -219,3 +223,21 @@ StorageManager.webStorageKey = function(savefileId) {
         return 'RPG File%1'.format(savefileId);
     }
 };
+
+// Enigma Virtual Box cannot make www/save directory
+StorageManager.canMakeWwwSaveDirectory = function() {
+    if (this._canMakeWwwSaveDirectory === undefined) {
+        var fs = require('fs');
+        var path = require('path');
+        var base = path.dirname(process.mainModule.filename);
+        var testPath = path.join(base, 'testDirectory/');
+        try {
+            fs.mkdirSync(testPath);
+            fs.rmdirSync(testPath);
+            this._canMakeWwwSaveDirectory = true;
+        } catch (e) {
+            this._canMakeWwwSaveDirectory = false;
+        }
+    }
+    return this._canMakeWwwSaveDirectory;
+};

plugins/Community_Basic.js

@@ -46,6 +46,11 @@
  * @type number
  * @desc The file number to auto save when "Transfer Player" (0: off)
  * @default 0
+ *
+ * @param errorMessage
+ * @type string
+ * @desc The message when error occurred
+ * @default Error occurred. Please ask to the creator of this game.
  */
 
 /*:ja
@@ -96,6 +101,11 @@
  * @type number
  * @desc 「場所移動」の際にオートセーブするファイル番号 (0でoff)
  * @default 0
+ *
+ * @param errorMessage
+ * @type string
+ * @desc エラーが発生した際に表示するメッセージ
+ * @default エラーが発生しました。ゲームの作者にご連絡ください。
  */
 
 (function() {
@@ -117,6 +127,7 @@
     var windowWidthTo = toNumber(parameters['changeWindowWidthTo'], 0);
     var windowHeightTo = toNumber(parameters['changeWindowHeightTo'], 0);
     var autoSaveFileId = toNumber(parameters['autoSaveFileId'], 0);
+    var errorMessage = parameters['errorMessage'];
 
     var windowWidth;
     var windowHeight;
@@ -176,4 +187,5 @@
     };
 
     DataManager.setAutoSaveFileId(autoSaveFileId);
+    Graphics.setErrorMessage(errorMessage);
 })();