#127: Scene editor: fixes game loop bug.

PhaserEditor2D · PhaserEditor2D · commit 9eab94dcf842 · 2019-07-03T16:29:16.000-04:00
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/Create.ts b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/Create.ts
@@ -177,6 +177,7 @@ namespace PhaserEditor2D {
     }
 
     function PixelPerfectHandler(hitArea, x, y, sprite: Phaser.GameObjects.Sprite) {
+        
         if (sprite.flipX) {
             x = 2 * sprite.displayOriginX - x;
         }
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/Editor.ts b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/Editor.ts
@@ -35,6 +35,7 @@ namespace PhaserEditor2D {
         }
 
         stop() {
+            consoleLog("loop.stop");
             this._game.loop.stop();
         }
 
@@ -339,6 +340,8 @@ namespace PhaserEditor2D {
             });
 
             this.updateBodyColor();
+
+            this.stop();
         }
 
         snapValueX(x: number) {
@@ -421,6 +424,13 @@ namespace PhaserEditor2D {
 
             if (loadMsg.pack) {
                 let scene = this.getObjectScene();
+
+                this._loaderIntervalID = setInterval(function () {
+                    self.repaint();
+                }, 20);
+
+                setTimeout(() => self.stop(), 1500);
+
                 scene.load.once(Phaser.Loader.Events.COMPLETE,
 
                     (function (index2, list2) {
@@ -443,9 +453,6 @@ namespace PhaserEditor2D {
                 scene.load.crossOrigin = "anonymous";
                 scene.load.addPack(loadMsg.pack);
                 scene.load.start();
-                this._loaderIntervalID = setInterval(function () {
-                    self.repaint();
-                }, 20);
             } else {
                 this.processMessageList(index + 1, list);
             }
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/ObjectScene.ts b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/ObjectScene.ts
@@ -20,10 +20,11 @@ namespace PhaserEditor2D {
             consoleLog("preload()");
             this.load.setBaseURL(this._initData.projectUrl);
             this.load.pack("pack", this._initData.pack);
+            setTimeout(() => Editor.getInstance().stop(), 500);
         }
 
         create() {
-            Editor.getInstance().stop();
+            const editor = Editor.getInstance();
 
             this._dragCameraManager = new DragCameraManager(this);
 
@@ -37,9 +38,7 @@ namespace PhaserEditor2D {
 
             this.initSelectionScene();
 
-            const editor = Editor.getInstance();
-
-            editor.getCreate().createWorld(this, this._initData.displayList);            
+            editor.getCreate().createWorld(this, this._initData.displayList);
 
             editor.sceneCreated();
 
@@ -82,7 +81,7 @@ namespace PhaserEditor2D {
             return new Phaser.Math.Vector2(sceneX, sceneY);
         }
 
-    
+
         private initSelectionScene() {
             this.scene.launch("ToolScene");
             this._toolScene = <ToolScene>this.scene.get("ToolScene");
@@ -100,7 +99,7 @@ namespace PhaserEditor2D {
 
         getToolScene() {
             return this._toolScene;
-        }        
+        }
 
         onMouseWheel(e: WheelEvent) {
             var cam = this.cameras.main;
@@ -130,7 +129,7 @@ namespace PhaserEditor2D {
         }
 
         performResize() {
-            this.cameras.main.setSize(window.innerWidth, window.innerHeight);            
+            this.cameras.main.setSize(window.innerWidth, window.innerHeight);
         }
     }
 
@@ -141,8 +140,8 @@ namespace PhaserEditor2D {
             const editor = Editor.getInstance();
 
             const scene = editor.getObjectScene();
-            const pointer = scene.input.activePointer;            
-            
+            const pointer = scene.input.activePointer;
+
             if (!isLeftButton(e)) {
                 return;
             }
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/ToolScene.ts b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/ToolScene.ts
@@ -1,11 +1,14 @@
 namespace PhaserEditor2D {
 
+    var TICK_COUNT = 0;
+
     export class ToolScene extends Phaser.Scene {
 
 
         private _selectedObjects: Phaser.GameObjects.GameObject[];
         private _selectionGraphics: Phaser.GameObjects.Graphics;
         private _gridGraphics: Phaser.GameObjects.Graphics;
+        private _tick: Phaser.GameObjects.Text;
         private _tools: InteractiveTool[];
 
 
@@ -36,6 +39,9 @@ namespace PhaserEditor2D {
             });
 
             this._selectionGraphics.depth = -1;
+
+            this._tick = this.add.text(10, 10, "");
+            this._tick.depth = -1;
         }
 
         initCamera() {
@@ -113,6 +119,7 @@ namespace PhaserEditor2D {
 
             let label: Phaser.GameObjects.Text = null;
             let labelHeight = 0;
+            this._axisLabels = [];
 
             for (let x = sx; ; x += dx) {
                 const x2 = (x - cam.scrollX) * cam.zoom;
@@ -223,6 +230,9 @@ namespace PhaserEditor2D {
             this.renderAxis();
             this.renderSelection();
             this.updateTools();
+
+            this._tick.text = TICK_COUNT + "";
+            TICK_COUNT += 1;
         }
 
         setTools(tools: InteractiveTool[]) {
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/Editor.js b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/Editor.js
@@ -16,6 +16,7 @@ var PhaserEditor2D;
             this._game.loop.step(Date.now());
         };
         Editor.prototype.stop = function () {
+            consoleLog("loop.stop");
             this._game.loop.stop();
         };
         Editor.prototype.getCreate = function () {
@@ -255,6 +256,7 @@ var PhaserEditor2D;
                 self.repaint();
             });
             this.updateBodyColor();
+            this.stop();
         };
         Editor.prototype.snapValueX = function (x) {
             var props = this.sceneProperties;
@@ -320,6 +322,10 @@ var PhaserEditor2D;
             var self = this;
             if (loadMsg.pack) {
                 var scene = this.getObjectScene();
+                this._loaderIntervalID = setInterval(function () {
+                    self.repaint();
+                }, 20);
+                setTimeout(function () { return self.stop(); }, 1500);
                 scene.load.once(Phaser.Loader.Events.COMPLETE, (function (index2, list2) {
                     return function () {
                         consoleLog("Loader complete.");
@@ -334,9 +340,6 @@ var PhaserEditor2D;
                 scene.load.crossOrigin = "anonymous";
                 scene.load.addPack(loadMsg.pack);
                 scene.load.start();
-                this._loaderIntervalID = setInterval(function () {
-                    self.repaint();
-                }, 20);
             }
             else {
                 this.processMessageList(index + 1, list);
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/ObjectScene.js b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/ObjectScene.js
@@ -22,16 +22,16 @@ var PhaserEditor2D;
             consoleLog("preload()");
             this.load.setBaseURL(this._initData.projectUrl);
             this.load.pack("pack", this._initData.pack);
+            setTimeout(function () { return PhaserEditor2D.Editor.getInstance().stop(); }, 500);
         };
         ObjectScene.prototype.create = function () {
-            PhaserEditor2D.Editor.getInstance().stop();
+            var editor = PhaserEditor2D.Editor.getInstance();
             this._dragCameraManager = new DragCameraManager(this);
             this._dragObjectsManager = new DragObjectsManager();
             this._pickManager = new PickObjectManager();
             new DropManager();
             this.initCamera();
             this.initSelectionScene();
-            var editor = PhaserEditor2D.Editor.getInstance();
             editor.getCreate().createWorld(this, this._initData.displayList);
             editor.sceneCreated();
             editor.repaint();
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/ToolScene.js b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/ToolScene.js
@@ -10,6 +10,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 var PhaserEditor2D;
 (function (PhaserEditor2D) {
+    var TICK_COUNT = 0;
     var ToolScene = (function (_super) {
         __extends(ToolScene, _super);
         function ToolScene() {
@@ -42,6 +43,8 @@ var PhaserEditor2D;
                 }
             });
             this._selectionGraphics.depth = -1;
+            this._tick = this.add.text(10, 10, "");
+            this._tick.depth = -1;
         };
         ToolScene.prototype.initCamera = function () {
             this.cameras.main.setRoundPixels(true);
@@ -93,6 +96,7 @@ var PhaserEditor2D;
             }
             var label = null;
             var labelHeight = 0;
+            this._axisLabels = [];
             for (var x = sx;; x += dx) {
                 var x2 = (x - cam.scrollX) * cam.zoom;
                 if (x2 > w) {
@@ -168,6 +172,8 @@ var PhaserEditor2D;
             this.renderAxis();
             this.renderSelection();
             this.updateTools();
+            this._tick.text = TICK_COUNT + "";
+            TICK_COUNT += 1;
         };
         ToolScene.prototype.setTools = function (tools) {
             for (var _i = 0, _a = this._tools; _i < _a.length; _i++) {
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/workaround.js b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/workaround.js
@@ -2,7 +2,7 @@ window.addEventListener("onerror", function (e) {
     alert("WebView ERROR: " + e);
 });
 window.AudioContext = function () { };
-var CONSOLE_LOG = false;
+var CONSOLE_LOG = true;
 function consoleLog(msg) {
     if (CONSOLE_LOG) {
         console.log(msg);
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/workaround.ts b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/workaround.ts
@@ -7,7 +7,7 @@ window.addEventListener("onerror", function (e) {
 
 
 // disable log on production
-var CONSOLE_LOG = false;
+var CONSOLE_LOG = true;
 function consoleLog(msg: any) {
     if (CONSOLE_LOG) {
         console.log(msg);

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,7 @@ namespace PhaserEditor2D {`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`function PixelPerfectHandler(hitArea, x, y, sprite: Phaser.GameObjects.Sprite) {`
	`180`	`+`
`180`	`181`	`if (sprite.flipX) {`
`181`	`182`	`x = 2 * sprite.displayOriginX - x;`
`182`	`183`	`}`