Merge pull request #51 from fallingleaflun/master

Add "D" and change to 15 red balls in snooker mode

src/controller/placeball.ts

@@ -47,10 +47,26 @@ export class PlaceBall extends ControllerBase {
       case "ArrowRight":
         this.moveTo(0, -input.t * this.placescale)
         break
+      // use cursor movement for placing cueball
       case "movementXUp":
         this.moveTo(0, -input.t * this.placescale * 2)
         break
-
+      case "movementYUp":
+        this.moveTo(-input.t * this.placescale * 2, 0)
+        break
+      // use IJKL for placing cueball
+      case "KeyI":
+        this.moveTo(0, input.t * this.placescale)
+        break
+      case "KeyK":
+        this.moveTo(0, -input.t * this.placescale)
+        break
+      case "KeyJ":
+        this.moveTo(-input.t * this.placescale, 0)
+        break
+      case "KeyL":
+        this.moveTo(input.t * this.placescale, 0)
+        break
       case "SpaceUp":
         return this.placed()
       default:

src/controller/rules/snooker.ts

@@ -29,7 +29,8 @@ export class Snooker implements Rules {
   score = 0
   rulename = "snooker"
 
-  static readonly tablemodel = "models/snooker.min.gltf"
+  // add "D" in snooker model
+  static readonly tablemodel = "models/d-snooker.gltf"
 
   readonly container: Container
 
@@ -221,10 +222,20 @@ export class Snooker implements Rules {
 
   placeBall(target?: Vector3): Vector3 {
     if (target) {
-      // constrain to "D" in the future
-      const max = new Vector3(Rack.baulk, Rack.sixth)
-      const min = new Vector3(Rack.baulk - Rack.sixth, -Rack.sixth)
-      return target.clamp(min, max)
+      // constrain to "D"
+      const centre = new Vector3(Rack.baulk, 0, 0)
+      const radius = Rack.sixth
+      const distance = target.distanceTo(centre)
+      if (target.x >= Rack.baulk) {
+        target.x = Rack.baulk
+      }
+      if (distance > radius) {
+        const direction = target.clone().sub(centre).normalize()
+        return centre.add(direction.multiplyScalar(radius))
+      }
+      else {
+        return target;
+      }
     }
     return new Vector3(Rack.baulk, -Rack.sixth / 2.6, 0)
   }

src/utils/rack.ts

@@ -150,7 +150,8 @@ export class Rack {
     balls.push(new Ball(Rack.jitter(colours[4]), 0xffaacc))
     balls.push(new Ball(Rack.jitter(colours[5]), 0x010101))
 
-    const triangle = Rack.trianglePositions().slice(0, 6)
+    // change to 15 red balls
+    const triangle = Rack.trianglePositions().slice(0, 15)
     triangle.forEach((p) => {
       balls.push(new Ball(Rack.jitter(p.add(Rack.down)), 0xee0000))
     })

test/rules/snooker.spec.ts

@@ -90,8 +90,8 @@ describe("Snooker", () => {
     container.processEvents()
   }
 
-  it("Snooker has 6 colours and 6 reds", (done) => {
-    expect(table.balls).to.be.length(13)
+  it("Snooker has 6 colours and 15 reds", (done) => {
+    expect(table.balls).to.be.length(22)
     done()
   })