From 976118d1aad1e5049489e471dadf3de6bd8c5d4d Mon Sep 17 00:00:00 2001
From: Jeremiah Billmann <jcbillmann@yahoo.com>
Date: Fri, 2 Aug 2013 21:53:48 -0400
Subject: [PATCH] Random ships for the example

---
 client/garageserver.io.js          |  1 -
 example/public/javascripts/game.js | 24 ++++++++++++++----------
 example/shared/core.js             |  2 ++
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/client/garageserver.io.js b/client/garageserver.io.js
index 9805ea3..40606b7 100644
--- a/client/garageserver.io.js
+++ b/client/garageserver.io.js
@@ -201,7 +201,6 @@ var GarageServerIO = (function (socketio) {
 
                 _playerController = new PlayerController(_stateController.maxUpdateBuffer);
                 _entityController = new EntityController(_stateController.maxUpdateBuffer);
-                _playerController.add(_stateController.id);
 
                 _stateController.physicsDelta = data.physicsDelta;
                 _stateController.interpolation = data.interpolation;
diff --git a/example/public/javascripts/game.js b/example/public/javascripts/game.js
index e7e6c24..07eced5 100644
--- a/example/public/javascripts/game.js
+++ b/example/public/javascripts/game.js
@@ -2,11 +2,7 @@ $(function () {
 
     "use strict";
 
-    var canvas = document.getElementById('gameCanvas'), ctxCanvas = canvas.getContext('2d'), keyboard = new THREEx.KeyboardState(),
-        playerSize = 0, entitySize = 0, 
-        image = new Image(),
-        shipNumber = Math.floor(Math.random() * 9) + 1;
-        image.src = '../images/' + shipNumber + '.png';
+    var canvas = document.getElementById('gameCanvas'), ctxCanvas = canvas.getContext('2d'), keyboard = new THREEx.KeyboardState(), ships = preloadShips();
 
     window.addEventListener('resize', resizeCanvas, false);
 
@@ -17,8 +13,6 @@ $(function () {
         onInterpolation: GamePhysics.getInterpolatedState,
         onWorldState: function (state) {
             //TODO THIS FOR DEMO AND DOCUMENTATION
-            playerSize = state.playerSize;
-            entitySize = state.entitySize;
         }
     });
 
@@ -37,10 +31,10 @@ $(function () {
                 var playerStates = GarageServerIO.getPlayerStates(),
                     entityStates = GarageServerIO.getEntityStates();
                 playerStates.forEach(function (player) {
-                    drawRotatedImage(player.state.ang, player.state.x, player.state.y, image);
+                    drawRotatedImage(player.state.ang, player.state.x, player.state.y, ships[player.state.ship]);
                 });
                 entityStates.forEach(function (entity) {
-                    ctxCanvas.fillRect(entity.state.x, entity.state.y, entitySize, entitySize);
+                    ctxCanvas.fillRect(entity.state.x, entity.state.y, 5, 5);
                 });
             },
             //Update Loop
@@ -63,7 +57,7 @@ $(function () {
             }
         );
     }
-    
+
     function drawRotatedImage(angle, x, y, img) {
         ctxCanvas.save();
         ctxCanvas.translate(x + img.width / 2, y + img.height / 2);
@@ -71,4 +65,14 @@ $(function () {
         ctxCanvas.drawImage(img, 0, 0, img.width, img.height, -img.width / 2, -img.height / 2, img.width, img.height);
         ctxCanvas.restore();
     }
+
+    function preloadShips() {
+        var ships = [];
+        for(var i = 0; i < 10; i ++) {
+            var img = new Image();
+            img.src = '../images/' + i + '.png';
+            ships.push(img);
+        }
+        return ships;
+    }
 });
\ No newline at end of file
diff --git a/example/shared/core.js b/example/shared/core.js
index ba81fc6..0196c05 100644
--- a/example/shared/core.js
+++ b/example/shared/core.js
@@ -8,6 +8,7 @@
            state.ang = 0;
            state.x = 0;
            state.y = 0;
+           state.ship = Math.floor(Math.random() * 9) + 1;
         }
 
         for (i = 0; i < inputs.length; i ++) {
@@ -59,6 +60,7 @@
         interpolationState.x = (previousState.x + amount * (targetState.x - previousState.x));
         interpolationState.y = (previousState.y + amount * (targetState.y - previousState.y));
         interpolationState.ang = (previousState.ang + amount * (targetState.ang - previousState.ang));
+        interpolationState.ship = targetState.ship;
         return interpolationState;
     };