@gg-web-engine/core 0.0.48 → 0.0.56

package/dist/dev/gg-static.js

@@ -7,13 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { GgWorld } from '../base';
+import { GgWorld, KeyboardInput } from '../base';
 import { GgConsoleUI } from './gg-console.ui';
 import { GgDebuggerUI } from './gg-debugger.ui';
+import { BehaviorSubject, combineLatest, filter, fromEvent, NEVER, Subject, switchMap, take, takeUntil, takeWhile, } from 'rxjs';
 export class GgStatic {
     static get instance() {
         if (!window.ggstatic) {
-            window.ggstatic = new GgStatic();
+            return new GgStatic();
         }
         return window.ggstatic;
     }
@@ -35,25 +36,52 @@ export class GgStatic {
             }
         }
     }
+    toggleDevConsole(value) {
+        if (value === this.consoleUI.isUIShown)
+            return;
+        if (this.consoleUI.isUIShown) {
+            this.consoleUI.destroyUI();
+        }
+        else {
+            this.consoleUI.createUI();
+        }
+    }
     get showStats() {
-        return this.debuggerUI.showStats;
+        return this.showStats$.getValue();
     }
     set showStats(value) {
-        this.debuggerUI.setShowStats(this.selectedWorld, value);
+        if (value === this.showStats)
+            return;
+        this.showStats$.next(value);
     }
     get showDebugControls() {
-        return this.debuggerUI.showDebugControls;
+        return this.showDebugControls$.getValue();
     }
     set showDebugControls(value) {
-        this.debuggerUI.setShowDebugControls(this.selectedWorld, value);
+        if (value === this.showDebugControls)
+            return;
+        this.showDebugControls$.next(value);
     }
     get selectedWorld() {
-        return this._selectedWorld || GgWorld.documentWorlds[0] || null;
+        return this._selectedWorld$.getValue();
+    }
+    set selectedWorld(w) {
+        this._selectedWorld$.next(w);
+    }
+    autoAssignSelectedWorld() {
+        if (GgWorld.documentWorlds.length > 0) {
+            this.selectedWorld = GgWorld.documentWorlds[0];
+        }
+        else {
+            GgWorld.worldCreated$
+                .pipe(takeWhile(() => !this.selectedWorld), take(1))
+                .subscribe(w => (this.selectedWorld = w));
+        }
     }
     get availableCommands() {
         let commands = this.consoleCommands.get(null) || {};
         if (this.selectedWorld) {
-            commands = Object.assign(Object.assign({}, (this.consoleCommands.get(this.selectedWorld) || {})), commands);
+            commands = Object.assign(Object.assign({}, commands), (this.consoleCommands.get(this.selectedWorld) || {}));
         }
         return Object.entries(commands);
     }
@@ -72,37 +100,88 @@ export class GgStatic {
                 }
             }
         };
-        this._selectedWorld = null;
+        this.showStats$ = new BehaviorSubject(false);
+        this.showDebugControls$ = new BehaviorSubject(false);
+        this._selectedWorld$ = new BehaviorSubject(null);
         this.consoleCommands = new Map();
-        this.registerConsoleCommand(null, 'ls_commands', () => __awaiter(this, void 0, void 0, function* () {
+        this.registerConsoleCommand(null, 'commands', () => __awaiter(this, void 0, void 0, function* () {
             return this.availableCommands
                 .map(([key, value]) => `<span style='color:yellow'>${key}</span>${value.doc ? '\t<span style="color:#aaa">// ' + value.doc + '</span>' : ''}`)
-                .sort()
                 .join('\n\n');
-        }), 'no args; print all available commands');
-        this.registerConsoleCommand(null, 'ls_worlds', () => __awaiter(this, void 0, void 0, function* () {
+        }), 'no args; Print all available commands. List includes global commands and commands, ' +
+            'specific to currently selected world. Run "world" to check which world is currently ' +
+            'selected and "world {world_name}" to select desired world');
+        this.registerConsoleCommand(null, 'help', (keyword) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const command = (_a = this.availableCommands.find(([key]) => key === keyword)) === null || _a === void 0 ? void 0 : _a[1];
+            if (!command) {
+                throw new Error(`Unrecognized command: ${keyword}`);
+            }
+            return `<span style='color:#aaa'>${command.doc || 'No doc string given'}</span>`;
+        }), 'args: [ string ]; Print doc string of provided command');
+        this.registerConsoleCommand(null, 'worlds', () => __awaiter(this, void 0, void 0, function* () {
             return GgWorld.documentWorlds
                 .map(w => (w === this.selectedWorld ? `<span style='color:lightgreen;'>* ${w.name}</span>` : `  ${w.name}`))
                 .join('\n');
-        }), 'no args; print all available worlds');
-        this.registerConsoleCommand(null, 'select_world', (...args) => __awaiter(this, void 0, void 0, function* () {
+        }), 'no args; Print all currently available worlds');
+        this.registerConsoleCommand(null, 'world', (...args) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             for (const w of GgWorld.documentWorlds) {
                 if (w.name === args[0]) {
-                    this._selectedWorld = w;
+                    this.selectedWorld = w;
                     break;
                 }
             }
             return ((_a = this.selectedWorld) === null || _a === void 0 ? void 0 : _a.name) || 'null';
-        }), 'args: [string]; select world by name');
-        this.registerConsoleCommand(null, 'show_debugger', (...args) => __awaiter(this, void 0, void 0, function* () {
-            this.showDebugControls = ['1', 'true', '+'].includes(args[0]);
-            return '' + this.showDebugControls;
-        }), 'args: [0 or 1]; turn on/off debug panel. Default value is 0');
-        this.registerConsoleCommand(null, 'show_stats', (...args) => __awaiter(this, void 0, void 0, function* () {
-            this.showStats = ['1', 'true', '+'].includes(args[0]);
-            return '' + this.showStats;
-        }), 'args: [0 or 1]; turn on/off stats. Default value is 0');
+        }), 'args: [ string? ]; Get name of selected world or select world by name. Use ' +
+            '"worlds" to get list of currently available worlds');
+        this.registerConsoleCommand(null, 'stats_panel', (...args) => __awaiter(this, void 0, void 0, function* () {
+            this.showStats = args[0] === undefined ? !this.showStats : args[0] === '1';
+            return this.showStats ? '1' : '0';
+        }), 'args: [ 0|1? ]; Turn on/off stats panel, skip argument to toggle value');
+        this.registerConsoleCommand(null, 'debug_panel', (...args) => __awaiter(this, void 0, void 0, function* () {
+            this.showDebugControls = args[0] === undefined ? !this.showDebugControls : args[0] === '1';
+            return this.showDebugControls ? '1' : '0';
+        }), 'args: [ 0|1? ]; Turn on/off debug panel, skip argument to toggle value');
+        let unbindKey$ = new Subject();
+        this.registerConsoleCommand(null, 'bind_key', (keyCode, command, ...args) => __awaiter(this, void 0, void 0, function* () {
+            fromEvent(window, 'keydown')
+                .pipe(takeUntil(unbindKey$.pipe(filter(x => x === keyCode))), filter(e => {
+                if (e.code !== keyCode) {
+                    return false;
+                }
+                if (document.activeElement) {
+                    for (const k of KeyboardInput.externalFocusBlacklist) {
+                        if (document.activeElement instanceof k) {
+                            return false;
+                        }
+                    }
+                }
+                return true;
+            }))
+                .subscribe(() => {
+                this.runConsoleCommand(command, args);
+            });
+            return 'Ok';
+        }), 'args: [ string, ...string ]; Bind a keyboard key by code to console command. Check key codes' +
+            ' <a target="_blank" rel="noopener noreferrer" href="https://www.toptal.com/developers/keycode">here</a>. Use "unbind_key" command to unbind it');
+        this.registerConsoleCommand(null, 'unbind_key', (...args) => __awaiter(this, void 0, void 0, function* () {
+            unbindKey$.next(args[0]);
+            return 'Ok';
+        }), 'args: [ string ]; Unbind a keyboard key from console command');
+        window.ggstatic = this;
+        this.autoAssignSelectedWorld();
+        this._selectedWorld$.pipe(switchMap(w => (w ? w.disposed$ : NEVER))).subscribe(() => {
+            this.selectedWorld = null;
+            this.autoAssignSelectedWorld();
+        });
+        window.dispatchEvent(new Event('ggstatic_added'));
+        combineLatest([this._selectedWorld$, this.showDebugControls$]).subscribe(([world, showControls]) => {
+            this.debuggerUI.setShowDebugControls(world, !!world && showControls);
+        });
+        combineLatest([this._selectedWorld$, this.showStats$]).subscribe(([world, showStats]) => {
+            this.debuggerUI.setShowStats(world, !!world && showStats);
+        });
     }
     registerConsoleCommand(world, command, handler, doc) {
         let commands = {};

package/dist/index.d.ts

@@ -1,4 +1,6 @@
+import { VERSION } from './version';
 export * from './base';
 export * from './2d';
 export * from './3d';
 export * from './dev';
+export { VERSION };

package/dist/index.js

@@ -1,4 +1,7 @@
+import { VERSION } from './version';
+window.gg_version = VERSION;
 export * from './base';
 export * from './2d';
 export * from './3d';
 export * from './dev';
+export { VERSION };

package/dist/version.d.ts

@@ -0,0 +1 @@
+export declare const VERSION = "0.0.56";

package/dist/version.js

@@ -0,0 +1 @@
+export const VERSION = '0.0.56';

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@gg-web-engine/core",
-  "version": "0.0.48",
+  "version": "0.0.56",
   "description": "An attempt to create open source game engine for browser",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "test": "jest",
     "prettier-format": "prettier --config .prettierrc 'src/**/*.ts' --write",
-    "prepublish": "rm -rf ./dist/ && tsc",
-    "build": "tsc"
+    "prepublish": "rm -rf ./dist/ && npm run build",
+    "update-version": "VERSION=$(grep '\"version\":' package.json | sed -E 's/.*\"version\": *\"([^\"]+)\".*/\\1/') && echo \"export const VERSION = '$VERSION';\" > src/version.ts",
+    "build": "npm run update-version && tsc"
   },
   "repository": {
     "type": "git",