Render changes to pending

Author: janza

lib/game.js

@@ -29,14 +29,13 @@ const pendingBalls = (leftLevel, rightLevel) => {
   var rotation = 0
   var position = 5
 
-  const leftBall = ball(0, 0, leftLevel)
-  const rightBall = ball(0, 0, rightLevel)
+  const left = ball(0, 0, leftLevel)
+  const right = ball(0, 0, rightLevel)
 
-  const isVertical = () => position === 1 || position === 3
-  const maxLeft = () => (isVertical() ? 0 : 1)
+  const isVertical = () => rotation === 1 || rotation === 3
 
   function moveLeft () {
-    position = Math.max(maxLeft(), position - 1)
+    position = Math.max(0, position - 1)
   }
 
   function moveRight () {
@@ -45,30 +44,31 @@ const pendingBalls = (leftLevel, rightLevel) => {
 
   function rotate () {
     rotation = (rotation + 1) % 4
-    position = Math.max(maxLeft(), position)
   }
 
   function toArray () {
+    const x = Math.max(isVertical() ? 0 : 1, position)
+    const y = -1
     switch (rotation) {
       case 0:
         return [
-          { ...leftBall, x: position - 1, y: -1 },
-          { ...rightBall, x: position, y: -1 }
+          { ...left, x: x - 1, y },
+          { ...right, x, y }
         ]
       case 2:
         return [
-          { ...leftBall, x: position, y: -1 },
-          { ...rightBall, x: position - 1, y: -1 }
+          { ...left, x, y },
+          { ...right, x: x - 1, y }
         ]
       case 1:
         return [
-          { ...leftBall, x: position, y: -2 },
-          { ...rightBall, x: position, y: -1 }
+          { ...left, x, y: y - 1 },
+          { ...right, x, y }
         ]
       case 3:
         return [
-          { ...leftBall, x: position, y: -1 },
-          { ...rightBall, x: position, y: -2 }
+          { ...left, x, y },
+          { ...right, x, y: y - 1 }
         ]
     }
   }
@@ -105,25 +105,32 @@ module.exports = (getBallLevel, sleepFunction) => {
     level: 2
   }
 
-  function setState (newState) {
-    state = Object.assign({}, state, newState)
+  function queueUpdate () {
     if (queuedUpdate) return
     queuedUpdate = setTimeout(() => {
       updateCallback(state)
       queuedUpdate = null
     })
   }
 
+  function setState (newState) {
+    state = Object.assign({}, state, newState)
+    queueUpdate()
+  }
+
   function moveDotsLeft () {
     if (pending) pending.moveLeft()
+    queueUpdate()
   }
 
   function moveDotsRight () {
     if (pending) pending.moveRight()
+    queueUpdate()
   }
 
   function rotateDots () {
     if (pending) pending.rotate()
+    queueUpdate()
   }
 
   function pushDots () {

tests/game.test.js

@@ -141,6 +141,21 @@ test('it executes commands correctly', t => {
 `
   )
 
+  executeCommands(
+    'lllllllll',
+    `
+.......
+10.....
+.......
+.......
+.......
+.......
+.......
+.......
+.......
+`
+  )
+
   executeCommands(
     'llllllll',
     `