Update Basketball game

demos/basketball/src/core/asset-list.js

@@ -23,7 +23,7 @@ export const ASSET_LIST = Object.freeze([
     // sounds
     'backboard.wav',
     'bounce.wav',
-    'net.wav',
+    'basket.wav',
     'bonus.wav',
     'win.wav',
     'lose.wav',

demos/basketball/src/entities/ball.js

@@ -14,13 +14,13 @@ import { GameEvent } from '../core/events.js';
 const BALL_RADIUS = 0.27;
 
 /** Minimum distance for scoring 3 points */
-const THREE_POINT_THRESHOLD = 5.0;
+const THREE_POINT_THRESHOLD = 6.0;
 
 /** Shoot angle */
 const SHOOT_ANGLE = Math.PI / 4;
 
 /** Shoot sensitivity multiplier (y and z axes) */
-const SHOOT_SENSITIVITY = 1.65;
+const SHOOT_SENSITIVITY = 1.5;
 
 /** Shoot sensitivity multiplier (x-axis) */
 const SHOOT_HORIZONTAL_SENSITIVITY = 0.5;
@@ -128,7 +128,7 @@ export class Ball extends Entity
 
         if(ar.pointers.length > 0) {
             const pointer = ar.pointers[0];
-            const position = ar.session.viewport.convertToPixels(pointer.position, 'adjusted');
+            const position = ar.session.viewport.convertToPixels(pointer.position, pointer.tracker.space);
 
             if(position.x > 60) {
                 impostor.mass = 1; // enable gravity
@@ -167,11 +167,12 @@ export class Ball extends Entity
     _onThrownState()
     {
         const ar = this.ar;
+        const rootPosition = ar.root.absolutePosition;
         const cameraPosition = ar.camera.globalPosition;
         const ballPosition = this._mesh.absolutePosition;
         const distance = BABYLON.Vector3.Distance(cameraPosition, ballPosition);
 
-        if(distance > MAX_DISTANCE || ballPosition.y < cameraPosition.y - MAX_Y_DISTANCE) {
+        if(distance > MAX_DISTANCE || ballPosition.y < rootPosition.y - MAX_Y_DISTANCE) {
             this._broadcast(new GameEvent('lostball'));
             this._state = 'ready';
         }
@@ -185,11 +186,10 @@ export class Ball extends Entity
     _throw(v)
     {
         const magnitude = SHOOT_SENSITIVITY * v.y;
-        const angle = SHOOT_ANGLE;
         const impulse = new BABYLON.Vector3(
             v.x * SHOOT_HORIZONTAL_SENSITIVITY,
-            magnitude * Math.sin(angle),
-            -magnitude * Math.cos(angle)
+            magnitude * Math.sin(SHOOT_ANGLE),
+            -magnitude * Math.cos(SHOOT_ANGLE)
         );
 
         this._positionWhenThrown.copyFrom(this._mesh.absolutePosition);
@@ -204,17 +204,13 @@ export class Ball extends Entity
      */
     _findVelocity(pointer)
     {
-        // we could return pointer.velocity, but that's not always
-        // user-friendly when it comes to throwing the ball!
-        const currentSpeed = pointer.velocity.length();
-        const averageSpeed = pointer.totalDistance / pointer.elapsedTime;
-        const speed = Math.max(currentSpeed, averageSpeed);
+        if(pointer.movementDuration == 0)
+            return pointer.velocity.times(0);
 
-        let direction = pointer.initialPosition.directionTo(pointer.position);
-        if(direction.y < 0)
-            direction = pointer.deltaPosition.normalized();
+        const averageSpeed = pointer.movementLength / pointer.movementDuration;
+        const direction = pointer.initialPosition.directionTo(pointer.position);
 
-        return direction.times(speed);
+        return direction.times(averageSpeed);
     }
 
     /**

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

@@ -22,7 +22,7 @@ export class GUIControl extends Entity
     constructor(game)
     {
         super(game);
-        this._parent = demo.gui;
+        this._parent = game.gui;
         this._control = null;
     }
 

demos/basketball/src/entities/jukebox.js

@@ -54,7 +54,7 @@ export class Jukebox extends Entity
     {
         switch(event.type) {
             case 'scored':
-                this._play('net', event.detail.position);
+                this._play('basket', event.detail.position);
                 if(event.detail.score == 3)
                     this._play('bonus');
                 break;

demos/basketball/src/entities/lights.js

@@ -24,13 +24,13 @@ export class Lights extends Entity
         const dlight = new BABYLON.DirectionalLight('dlight', BABYLON.Vector3.Down());
 
         light.intensity = 1.0;
-        light.diffuse.set(1, 1, 1);
-        light.groundColor.set(1, 1, 1);
-        light.specular.set(0, 0, 0);
+        light.diffuse = new BABYLON.Color3(1, 1, 1);
+        light.groundColor = new BABYLON.Color3(1, 1, 1);
+        light.specular = new BABYLON.Color3(0, 0, 0);
 
         dlight.intensity = 1.0;
-        dlight.diffuse.set(1, 1, 1);
-        dlight.specular.set(1, 1, 1);
+        dlight.diffuse = new BABYLON.Color3(1, 1, 1);
+        dlight.specular = new BABYLON.Color3(1, 1, 1);
 
         const ar = this.ar;
         dlight.parent = ar.root;

demos/basketball/src/entities/scoreboard.js

@@ -142,7 +142,7 @@ export class Scoreboard extends PhysicsEntity
             depth: 1.0,
         });
 
-        this._mesh.position = new BABYLON.Vector3(2.5, 0.5, 0);
+        this._mesh.position = new BABYLON.Vector3(2.0, 0.35, 0.5);
         this._mesh.rotate(BABYLON.Axis.Y, -Math.PI / 6);
 
         this._mesh.material = new BABYLON.StandardMaterial('ScoreboardMaterial');