Flatten ball.pos struct

game/game.coffee

@@ -37,7 +37,6 @@ module.exports = class Game extends GameCore
   sendMove: (sid) ->
     g = @gamers[sid]
     @gs[g.side].updates = g.updates
-    @ball.t = @updateTime
     g.socket.emit 'move', {gamers: @gs, ball: @ball}
 
   sendMoveAll: ->
@@ -52,15 +51,15 @@ module.exports = class Game extends GameCore
       @sendScore sid
 
   updateState: (sid, dir, seq) ->
-    @gamers[sid].updates.push {dir: dir, seq: seq, t: @time()}
+    @gamers[sid].updates.push {dir: dir, seq: seq, t: @time()} # FIXME not serverTime this should be
 
   placeBall: (side) ->
-    @ball.pos.y = @gs[side].pos + @racketHeight / 2 - @ballSize / 2
+    @ball.y = @gs[side].pos + @racketHeight / 2 - @ballSize / 2
     if side == 0
-      @ball.pos.x = @ballResetOffset
+      @ball.x = @ballResetOffset
       @ball.angle = Math.asin((@gs[1].pos - @gs[0].pos) / (@canvasWidth - 2 * @xOffset))
     else
-      @ball.pos.x = @canvasWidth - @ballResetOffset - @ballSize
+      @ball.x = @canvasWidth - @ballResetOffset - @ballSize
       @ball.angle = Math.PI + Math.asin((@gs[1].pos - @gs[0].pos) / (@canvasWidth - 2 * @xOffset))
     @ball.v = @initBallV
 
@@ -76,12 +75,12 @@ module.exports = class Game extends GameCore
       @gs[gamer.side].updates = [] # FIXME seems wrong, clear after updates sent only
 
   checkScoreUpdate: ->
-    if @ball.pos.x < 0 or @ball.pos.x > @canvasWidth - @ballSize
+    if @ball.x < 0 or @ball.x > @canvasWidth - @ballSize
       side = -1
-      if @ball.pos.x < 0
+      if @ball.x < 0
         @scores[1] += 1
         side = 0
-      if @ball.pos.x > @canvasWidth - @ballSize
+      if @ball.x > @canvasWidth - @ballSize
         @scores[0] += 1
         side = 1
       @placeBall side 
@@ -105,6 +104,7 @@ module.exports = class Game extends GameCore
     @moveRackets time
     @ball.t = @updateTime
     @ball = @moveBall [@ball], time, (time - @updateTime)
+    @ball.t = time
     @checkScoreUpdate()
     @sendMoveAll()
     @updateTime = time

game/game.core.coffee

@@ -22,9 +22,8 @@ class GameCore
     @speedUp = 0.9 # ball speed up coefficient, should be lte than 1
 
     @ball =
-      pos:
-        x: (@canvasWidth / 2 - @ballSize / 2)
-        y: (@canvasHeight / 2 - @ballSize / 2)
+      x: (@canvasWidth / 2 - @ballSize / 2)
+      y: (@canvasHeight / 2 - @ballSize / 2)
       angle: ((20 + Math.random()*50)*Math.PI/180)
       v: 0.2 # speed in px per ms
       t: 0
@@ -67,34 +66,34 @@ class GameCore
 
   moveBallBit: (ball, dt) ->
     ds = ball.v * dt
-    ball.pos.x += ds * Math.cos(ball.angle)
-    ball.pos.y += ds * Math.sin(ball.angle)
+    ball.x += ds * Math.cos(ball.angle)
+    ball.y += ds * Math.sin(ball.angle)
     ball.t += dt
     return @checkBallCollision ball
 
   checkBallCollision: (ball) ->
-    if ball.pos.y < 0
-      ball.pos.y = 0
+    if ball.y < 0
+      ball.y = 0
       ball.angle = - ball.angle
-    else if ball.pos.y > @canvasHeight - @ballSize
-      ball.pos.y = @canvasHeight - @ballSize
+    else if ball.y > @canvasHeight - @ballSize
+      ball.y = @canvasHeight - @ballSize
       ball.angle = - ball.angle
-    else if ball.pos.x <= @xOffset
-      if ball.pos.y >= @gs[0].pos && ball.pos.y <= @gs[0].pos + @racketHeight - @ballSize
-        ball.pos.x = @xOffset
+    else if ball.x <= @xOffset
+      if ball.y >= @gs[0].pos && ball.y <= @gs[0].pos + @racketHeight - @ballSize
+        ball.x = @xOffset
         ball.angle = Math.PI - ball.angle
-        ball.v = ball.v * (@speedUp + Math.abs(ball.pos.y - @gs[0].pos + @racketHeight / 2) / (@gs[0].pos + @racketHeight / 2))
+        ball.v = ball.v * (@speedUp + Math.abs(ball.y - @gs[0].pos + @racketHeight / 2) / (@gs[0].pos + @racketHeight / 2))
         if ball.v >= @maxBallV
           ball.v = @maxBallV
         else if ball.v <= @minBallV
           ball.v = @minBallV
         else
-          ball.v = ball.v * (@speedUp + Math.abs(ball.pos.y - @gs[0].pos + @racketHeight / 2) / (@gs[0].pos + @racketHeight / 2))
-    else if ball.pos.x >= @canvasWidth - @xOffset - @ballSize
-      if ball.pos.y >= @gs[1].pos && ball.pos.y <= @gs[1].pos + @racketHeight - @ballSize
-        ball.pos.x = @canvasWidth - @xOffset - @ballSize
+          ball.v = ball.v * (@speedUp + Math.abs(ball.y - @gs[0].pos + @racketHeight / 2) / (@gs[0].pos + @racketHeight / 2))
+    else if ball.x >= @canvasWidth - @xOffset - @ballSize
+      if ball.y >= @gs[1].pos && ball.y <= @gs[1].pos + @racketHeight - @ballSize
+        ball.x = @canvasWidth - @xOffset - @ballSize
         ball.angle = Math.PI - ball.angle
-        ball.v = ball.v * (@speedUp + Math.abs(ball.pos.y - @gs[0].pos + @racketHeight / 2) / (@gs[0].pos + @racketHeight / 2))
+        ball.v = ball.v * (@speedUp + Math.abs(ball.y - @gs[0].pos + @racketHeight / 2) / (@gs[0].pos + @racketHeight / 2))
         if ball.v >= @maxBallV
           ball.v = @maxBallV
         else if ball.v <= @minBallV

public/javascripts/pong.coffee

@@ -36,7 +36,7 @@ window.Game = class Game extends GameCore
 
   drawBall: (ball, color) ->
     @ctx.fillStyle = color
-    @ctx.fillRect ball.pos.x, ball.pos.y, @ballSize, @ballSize
+    @ctx.fillRect ball.x, ball.y, @ballSize, @ballSize
 
   drawBoard: ->
     @ctx.clearRect 0, 0, @canvasWidth, @canvasHeight