Update Basketball game

demos/basketball/src/core/game.js

@@ -228,7 +228,7 @@ export class BasketballGame extends ARDemo
             this.spawn(TutorialOverlay),
             this.spawn(GameOverOverlay),
 
-        ]);
+        ]).then(() => void 0);
     }
 
     /**

demos/basketball/src/core/globals.js

@@ -11,7 +11,7 @@
 export const NUMBER_OF_BALLS = 5;
 
 /** The minimum score for each rank */
-export const SCORE_TABLE = Object.freeze({
+export const RANK_TABLE = Object.freeze({
     'S':  15,
     'A+': 12,
     'A':  11,

demos/basketball/src/entities/ball.js

@@ -50,11 +50,11 @@ export class Ball extends Entity
 {
     /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        super(demo);
+        super(game);
 
         this._state = 'ready';
         this._runState = {
@@ -77,7 +77,7 @@ export class Ball extends Entity
      */
     async init()
     {
-        const file = this._demo.assetManager.file('ball.glb');
+        const file = this._game.assetManager.file('ball.glb');
         const gltf = await BABYLON.SceneLoader.ImportMeshAsync('', '', file);
         const mesh = this._createPhysicsRoot(gltf.meshes[0]); // gltf.meshes[0] is __root__
 

demos/basketball/src/entities/entity.js

@@ -14,11 +14,11 @@ export class Entity
 {
     /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        this._demo = demo;
+        this._game = game;
     }
 
     /**
@@ -62,7 +62,7 @@ export class Entity
      */
     _broadcast(event)
     {
-        this._demo.broadcast(event);
+        this._game.broadcast(event);
     }
 
     /**
@@ -71,7 +71,7 @@ export class Entity
      */
     get ar()
     {
-        return this._demo.ar;
+        return this._game.ar;
     }
 }
 
@@ -83,11 +83,11 @@ export class PhysicsEntity extends Entity
 {
     /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        super(demo);
+        super(game);
         this._physicsAnchor = null;
     }
 

demos/basketball/src/entities/game-controller.js

@@ -9,7 +9,7 @@
 
 import { Entity } from './entity.js';
 import { GameEvent } from '../core/events.js';
-import { NUMBER_OF_BALLS, SCORE_TABLE } from '../core/globals.js';
+import { NUMBER_OF_BALLS, RANK_TABLE } from '../core/globals.js';
 
 /**
  * The Game Controller manages the state of the game
@@ -18,11 +18,11 @@ export class GameController extends Entity
 {
     /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        super(demo);
+        super(game);
 
         this._ballsLeft = NUMBER_OF_BALLS;
         this._score = 0;
@@ -81,7 +81,7 @@ export class GameController extends Entity
      */
     _computeRank(score)
     {
-        const entries = Object.entries(SCORE_TABLE).sort((a, b) => b[1] - a[1]);
+        const entries = Object.entries(RANK_TABLE).sort((a, b) => b[1] - a[1]);
 
         for(const [rank, minScore] of entries) {
             if(score >= minScore)

demos/basketball/src/entities/goal.js

@@ -20,11 +20,11 @@ export class Goal extends PhysicsEntity
 {
     /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        super(demo);
+        super(game);
         this._physicsRoot = null;
     }
 
@@ -34,7 +34,7 @@ export class Goal extends PhysicsEntity
      */
     async init()
     {
-        const file = this._demo.assetManager.file('goal.glb');
+        const file = this._game.assetManager.file('goal.glb');
         const gltf = await BABYLON.SceneLoader.ImportMeshAsync('', '', file);
         this._physicsRoot = this._createPhysicsRoot(gltf.meshes);
         this._physicsRoot.position.y = Y_OFFSET;

demos/basketball/src/entities/gravity.js

@@ -19,11 +19,11 @@ export class Gravity extends Entity
 {
     /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        super(demo);
+        super(game);
         this._gravity = new BABYLON.Vector3();
         this._isTracking = false;
     }

demos/basketball/src/entities/gui/ball-counter.js

@@ -22,7 +22,7 @@ class BallIcon extends GUIControl
      */
     _createControl()
     {
-        const url = this._demo.assetManager.url('atlas.png');
+        const url = this._game.assetManager.url('atlas.png');
         const icon = new BABYLON.GUI.Image('ballIcon', url);
 
         icon.sourceLeft = 896;
@@ -103,10 +103,10 @@ export class BallCounter extends Entity
         const icons = [];
 
         for(let i = 0; i < NUMBER_OF_BALLS; i++) {
-            const icon = this._demo.spawn(BallIcon).then(icon => icon.setId(i));
+            const icon = this._game.spawn(BallIcon).then(icon => icon.setId(i));
             icons.push(icon);
         }
 
-        return Promise.all(icons);
+        return Promise.all(icons).then(() => void 0);
     }
 }

demos/basketball/src/entities/gui/gameover-overlay.js

@@ -17,11 +17,11 @@ export class GameOverOverlay extends GUIControl
 {
     /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        super(demo);
+        super(game);
 
         this._messages = {
             'S' : 'YOU ARE A\nLEGEND!!!!!',

demos/basketball/src/entities/gui/gui-control.js

@@ -17,11 +17,11 @@ export class GUIControl extends Entity
 {
     /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        super(demo);
+        super(game);
         this._parent = demo.gui;
         this._control = null;
     }

demos/basketball/src/entities/gui/mute-button.js

@@ -22,7 +22,7 @@ export class MuteButton extends GUIControl
      */
     _createControl()
     {
-        const url = this._demo.assetManager.url('atlas.png');
+        const url = this._game.assetManager.url('atlas.png');
         const button = BABYLON.GUI.Button.CreateImageOnlyButton('muteButton', url);
         const offset = 1.5 + ((NUMBER_OF_BALLS / 2) | 0);
 

demos/basketball/src/entities/gui/tutorial-overlay.js

@@ -19,11 +19,11 @@ export class TutorialOverlay extends GUIControl
 {
     /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        super(demo);
+        super(game);
         this._timer = 0;
         this._enabled = true;
     }
@@ -34,7 +34,7 @@ export class TutorialOverlay extends GUIControl
      */
     _createControl()
     {
-        const url = this._demo.assetManager.url('atlas.png');
+        const url = this._game.assetManager.url('atlas.png');
         const container = new BABYLON.GUI.Container();
         const text = new BABYLON.GUI.TextBlock();
         const hand = new BABYLON.GUI.Image('hand', url);

demos/basketball/src/entities/jukebox.js

@@ -18,11 +18,11 @@ export class Jukebox extends Entity
 {
      /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        super(demo);
+        super(game);
         this._sound = new Map();
     }
 
@@ -35,7 +35,7 @@ export class Jukebox extends Entity
         const soundFiles = ASSET_LIST.filter(asset => asset.endsWith('.wav'));
 
         for(const filepath of soundFiles) {
-            const url = this._demo.assetManager.url(filepath);
+            const url = this._game.assetManager.url(filepath);
             const soundName = filepath.substring(0, filepath.length - 4);
             const sound = new BABYLON.Sound(soundName, url);
 

demos/basketball/src/entities/net.js

@@ -29,11 +29,11 @@ export class BasketballNet extends PhysicsEntity
 {
     /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        super(demo);
+        super(game);
 
         this._physicsRoot = null;
         this._mesh = null;
@@ -144,7 +144,7 @@ export class BasketballNet extends PhysicsEntity
     _createMaterial()
     {
         const material = new BABYLON.StandardMaterial('BasketballNetMaterial');
-        const url = this._demo.assetManager.url('atlas.png');
+        const url = this._game.assetManager.url('atlas.png');
 
         material.diffuseTexture = new BABYLON.Texture(url);
         material.diffuseTexture.hasAlpha = true;

demos/basketball/src/entities/score-text.js

@@ -26,11 +26,11 @@ export class ScoreText extends Entity
 {
      /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        super(demo);
+        super(game);
         this._score = 0;
         this._mesh = null;
         this._initialPosition = new BABYLON.Vector3();
@@ -48,7 +48,7 @@ export class ScoreText extends Entity
             height: 0.5,
         });
 
-        const url = this._demo.assetManager.url('atlas.png');
+        const url = this._game.assetManager.url('atlas.png');
         const material = new BABYLON.StandardMaterial('ScoreTextMaterial');
 
         material.diffuseTexture = new BABYLON.Texture(url);

demos/basketball/src/entities/scoreboard.js

@@ -17,11 +17,11 @@ class ScoreboardDigit extends Entity
 {
      /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        super(demo);
+        super(game);
         this._mesh = null;
     }
 
@@ -94,7 +94,7 @@ class ScoreboardDigit extends Entity
             height: 1.0,
         });
 
-        const url = this._demo.assetManager.url('atlas.png');
+        const url = this._game.assetManager.url('atlas.png');
         const material = new BABYLON.StandardMaterial('ScoreboardDigitMaterial');
 
         material.diffuseTexture = new BABYLON.Texture(url);
@@ -118,11 +118,11 @@ export class Scoreboard extends PhysicsEntity
 {
      /**
      * Constructor
-     * @param {BasketballDemo} demo
+     * @param {BasketballGame} game
      */
-    constructor(demo)
+    constructor(game)
     {
-        super(demo);
+        super(game);
         this._mesh = null;
         this._units = null;
         this._tens = null;
@@ -148,11 +148,11 @@ export class Scoreboard extends PhysicsEntity
         this._mesh.material = new BABYLON.StandardMaterial('ScoreboardMaterial');
         this._mesh.material.diffuseColor = BABYLON.Color3.FromHexString('#110d7c');
 
-        this._units = await this._demo.spawn(ScoreboardDigit);
+        this._units = await this._game.spawn(ScoreboardDigit);
         this._units.mesh.position = new BABYLON.Vector3(x, y, z);
         this._units.mesh.parent = this._mesh;
 
-        this._tens = await this._demo.spawn(ScoreboardDigit);
+        this._tens = await this._game.spawn(ScoreboardDigit);
         this._tens.mesh.position = new BABYLON.Vector3(-x, y, z);
         this._tens.mesh.parent = this._mesh;