Merge branch 'develop'

CHANGELOG.MD

@@ -1,5 +1,15 @@
 # Change Log
 
+## v3.60.3 - Apr 27, 2023
+
+* Fixes regression bug with the Play command.
+
+## v3.60.2 - Apr 27, 2023
+
+* Fixes creating a prefab layer with a selected container or layer.
+* Updates the ScriptNode resources with the bug fixes.
+* [#129](https://github.com/PhaserEditor2D/PhaserEditor2D-v3/issues/129) Adds Preview Scene command (Ctrl+0). It runs the game in the browser and passes the `start=<scene-name>` parameter.
+
 ## v3.60.1 - Apr 21, 2023
 
 * Fixes plain object serialization (keyboard keys, colliders,...).

source/editor/plugins/colibri/src/ui/ide/EditorRegistry.ts

@@ -25,6 +25,7 @@ namespace colibri.ui.ide {
             for (const factory of this._factories) {
 
                 if (factory.acceptInput(input)) {
+
                     return factory;
                 }
             }

source/editor/plugins/phasereditor2d.files/src/FilesPlugin.ts

@@ -8,15 +8,27 @@ namespace phasereditor2d.files {
     export class FilesPlugin extends colibri.Plugin {
 
         private static _instance = new FilesPlugin();
+        private _openFileAction: (file: colibri.core.io.FilePath) => void;
 
         static getInstance() {
+
             return this._instance;
         }
 
         private constructor() {
             super("phasereditor2d.files");
         }
 
+        setOpenFileAction(action: (file: colibri.core.io.FilePath) => void) {
+
+            this._openFileAction = action;
+        }
+
+        getOpenFileAction() {
+
+            return this._openFileAction;
+        }
+
         public registerExtensions(reg: colibri.ExtensionRegistry) {
 
             // icons loader

source/editor/plugins/phasereditor2d.files/src/ui/views/FilesView.ts

@@ -161,6 +161,7 @@ namespace phasereditor2d.files.ui.views {
         }
 
         getPropertyProvider() {
+
             return this._propertyProvider;
         }
 
@@ -181,7 +182,7 @@ namespace phasereditor2d.files.ui.views {
 
             viewer.repaint();
 
-            viewer.eventOpenItem.addListener((file: io.FilePath) => {
+            viewer.eventOpenItem.addListener(async (file: io.FilePath) => {
 
                 if (file.isFolder()) {
 
@@ -192,7 +193,7 @@ namespace phasereditor2d.files.ui.views {
                     return;
                 }
 
-                wb.openEditor(file);
+                FilesPlugin.getInstance().getOpenFileAction()(file);
             });
 
             wb.getFileStorage().addChangeListener(change => this.onFileStorageChange(change));

source/editor/plugins/phasereditor2d.ide/src/IDEPlugin.ts

@@ -6,7 +6,7 @@ namespace phasereditor2d.ide {
     export const ICON_PLAY = "play";
 
     export class IDEPlugin extends colibri.Plugin {
-
+        
         public eventActivationChanged = new controls.ListenerList<boolean>();
 
         private static _instance = new IDEPlugin();
@@ -82,6 +82,8 @@ namespace phasereditor2d.ide {
                     command: ui.actions.CMD_LOCATE_FILE
                 }));
             }
+
+            phasereditor2d.files.FilesPlugin.getInstance().setOpenFileAction(file => this.openFileFromFilesView(file));
         }
 
         async compileProject() {
@@ -141,6 +143,25 @@ namespace phasereditor2d.ide {
             });
         }
 
+        async playProject(startScene?: string) {
+
+            const config = await IDEPlugin.getInstance().requestProjectConfig();
+
+            const search = startScene ? `?start=${startScene}` : "";
+
+            const url = (config.playUrl || colibri.ui.ide.FileUtils.getRoot().getExternalUrl())
+                    + search;
+
+            colibri.Platform.onElectron(electron => {
+
+                colibri.core.io.apiRequest("OpenBrowser", { url: config.playUrl });
+
+            }, () => {
+
+                controls.Controls.openUrlInNewPage(url);
+            });
+        }
+
         async requestUpdateAvailable() {
 
             if (this.isDesktopMode()) {
@@ -166,6 +187,7 @@ namespace phasereditor2d.ide {
         }
 
         isDesktopMode() {
+
             return this._desktopMode;
         }
 
@@ -246,6 +268,40 @@ namespace phasereditor2d.ide {
             this.openFileExternalEditor(colibri.ui.ide.FileUtils.getRoot());
         }
 
+        setEnableOpenCodeFileInExternalEditor(enabled: boolean) {
+
+            window.localStorage.setItem("phasereditor2d.ide.enableOpenCodeFileInExternalEditor", enabled? "1" : "0");
+        }
+
+        isEnableOpenCodeFileInExternalEditor() {
+
+            return window.localStorage.getItem("phasereditor2d.ide.enableOpenCodeFileInExternalEditor") === "1";
+        }
+
+        private openFileFromFilesView(file: io.FilePath) {
+
+            // a hack, detect if content type is JS, TS, or plain text, so it opens the external editor
+            if (this.isEnableOpenCodeFileInExternalEditor()) {
+
+                const ct = colibri.Platform.getWorkbench().getContentTypeRegistry().getCachedContentType(file);
+
+                switch (ct) {
+                    case "typescript":
+                    case "javascript":
+                    case "html":
+                    case "css":
+
+                        console.log(`Openin ${file.getFullName()} with external editor`);
+
+                        this.openFileExternalEditor(file);
+
+                        return;
+                }
+            }
+
+            colibri.Platform.getWorkbench().openEditor(file);
+        }
+
         async openFileExternalEditor(file: io.FilePath) {
 
             const resp = await colibri.core.io.apiRequest("OpenVSCode", { location: file.getFullName() });
@@ -261,7 +317,7 @@ namespace phasereditor2d.ide {
 
     /* program entry point */
 
-    export const VER = "3.60.1";
+    export const VER = "3.60.3";
 
     async function main() {
 

source/editor/plugins/phasereditor2d.ide/src/ui/actions/IDEActions.ts

@@ -7,8 +7,9 @@ namespace phasereditor2d.ide.ui.actions {
     export const CMD_PLAY_PROJECT = "phasereditor2d.ide.ui.actions.PlayProject";
     export const CMD_QUICK_PLAY_PROJECT = "phasereditor2d.ide.ui.actions.QuickPlayProject";
     export const CMD_OPEN_VSCODE = "phasereditor2d.ide.ui.actions.OpenVSCode";
+    export const CMD_ENABLE_OPEN_SOURCE_FILE_IN_EXTERNAL_EDITOR = "phasereditor2d.ide.ui.actions.EnableOpenCodeFileInExternalEditor";
+    export const CMD_DISABLE_OPEN_SOURCE_FILE_IN_EXTERNAL_EDITOR = "phasereditor2d.ide.ui.actions.EnableOpenCodeFileInExternalEditor";
 
-    import controls = colibri.ui.controls;
     import commands = colibri.ui.ide.commands;
     import io = colibri.core.io;
 
@@ -27,6 +28,38 @@ namespace phasereditor2d.ide.ui.actions {
                 name: "Project"
             });
 
+            manager.add({
+                command: {
+                    id: CMD_ENABLE_OPEN_SOURCE_FILE_IN_EXTERNAL_EDITOR,
+                    category: CAT_PROJECT,
+                    name: "Enable Open Code File In External Editor",
+                    tooltip: "If enable, clicking on a coding file in the Files view opens the external editor"
+                },
+                handler: {
+                    testFunc: isNotWelcomeWindowScope,
+                    executeFunc: () => {
+
+                        IDEPlugin.getInstance().setEnableOpenCodeFileInExternalEditor(true);
+                    }
+                }
+            });
+
+            manager.add({
+                command: {
+                    id: CMD_DISABLE_OPEN_SOURCE_FILE_IN_EXTERNAL_EDITOR,
+                    category: CAT_PROJECT,
+                    name: "Disable Open Code File In External Editor",
+                    tooltip: "If disabled, clicking on a coding file open the built-in editor."
+                },
+                handler: {
+                    testFunc: isNotWelcomeWindowScope,
+                    executeFunc: () => {
+
+                        IDEPlugin.getInstance().setEnableOpenCodeFileInExternalEditor(false);
+                    }
+                }
+            });
+
             // play game
 
             manager.add({
@@ -45,18 +78,7 @@ namespace phasereditor2d.ide.ui.actions {
 
                     executeFunc: async (args) => {
 
-                        const config = await IDEPlugin.getInstance().requestProjectConfig();
-
-                        const url = config.playUrl || colibri.ui.ide.FileUtils.getRoot().getExternalUrl();
-
-                        colibri.Platform.onElectron(electron => {
-
-                            colibri.core.io.apiRequest("OpenBrowser", { url: config.playUrl });
-
-                        }, () => {
-
-                            controls.Controls.openUrlInNewPage(url);
-                        });
+                        IDEPlugin.getInstance().playProject();
                     }
                 },
                 keys: {

source/editor/plugins/phasereditor2d.scene/code-resources/js-module/ScriptNode.js

@@ -1,17 +1,16 @@
 import Phaser from "phaser";
 
-
 export default class ScriptNode {
 
-    /**
+    /** 
      * @private
-     * @type {Phaser.Scene}
-     */
+     * @type {Phaser.Scene} 
+     **/
     _scene;
 
     /**
-     * @private
-     * @type {Phaser.GameObjects.GameObject}
+     * @private 
+     * @type {Phaser.GameObjects.GameObject | undefined}
      */
     _gameObject;
 
@@ -23,12 +22,11 @@ export default class ScriptNode {
 
     /**
      * @private
-     * @type {ScriptNode[]}
+     * @type {ScriptNode[] | undefined}
      */
     _children;
 
     /**
-     * 
      * @param {ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene} parent 
      */
     constructor(parent) {
@@ -72,10 +70,11 @@ export default class ScriptNode {
             this.scene.events.on(Phaser.Scenes.Events.UPDATE, this.update, this);
         }
 
-        if (listenStart || listenUpdate || listenDestroy) {
+        if (listenAwake || listenStart || listenUpdate || listenDestroy) {
 
             const destroyCallback = () => {
 
+                this.scene.events.off("scene-awake", this.awake, this);
                 this.scene.events.off(Phaser.Scenes.Events.UPDATE, this.start, this);
                 this.scene.events.off(Phaser.Scenes.Events.UPDATE, this.update, this);
 
@@ -91,7 +90,7 @@ export default class ScriptNode {
 
             } else {
 
-                this.scene.events.on(Phaser.Scenes.Events.DESTROY, destroyCallback);
+                this.scene.events.on(Phaser.Scenes.Events.SHUTDOWN, destroyCallback);
             }
         }
     }
@@ -111,9 +110,6 @@ export default class ScriptNode {
         return this._parent;
     }
 
-    /**
-     * @type {ScriptNode[]}
-     */
     get children() {
 
         if (!this._children) {
@@ -125,7 +121,6 @@ export default class ScriptNode {
     }
 
     /**
-     * 
      * @param {ScriptNode} child 
      */
     add(child) {
@@ -134,25 +129,23 @@ export default class ScriptNode {
     }
 
     /**
-     * 
-     * @param {any | undefined} args 
+     * @param  {...any} args 
      */
-    executeChildren(args) {
+    executeChildren(...args) {
 
         if (this._children) {
 
-            for(const child of this._children) {
+            for (const child of this._children) {
 
-                child.execute(args);
+                child.execute(...args);
             }
         }
     }
 
     /**
-     * 
-     * @param {any | undefined} args 
+     * @param  {...any} args 
      */
-    execute(args) {
+    execute(...args) {
         // override this on executable nodes
     }