From 7e66be0ac0c1aa8c22b792141d2d62ecc7554d57 Mon Sep 17 00:00:00 2001
From: Jeremiah Billmann <jcbillmann@yahoo.com>
Date: Mon, 1 Jul 2013 20:41:58 -0400
Subject: [PATCH] Adding delta and fix physics step

---
 client/garageserver.io.js      | 17 ++++++++++-------
 lib/server/garageserver.io.js  |  6 ++++--
 lib/server/garageservergame.js |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/client/garageserver.io.js b/client/garageserver.io.js
index 52cd99e..f14b0a0 100644
--- a/client/garageserver.io.js
+++ b/client/garageserver.io.js
@@ -5,6 +5,7 @@ options = {
     onPlayerReconnect: function (),
     onPlayerUpdate: function (state),
     onPlayerRemove: function (id),
+    onGameState: function (),
     onPing: function (pingDelay),
     onUpdatePlayerPhysics: function (state, inputs),
     onInterpolation: function(currentState, previousState, targetState, amount)
@@ -22,10 +23,9 @@ window.GarageServerIO = (function (window, socketio) {
         this.state = {};
         this.clientTime;
         this.renderTime;
-        this.renderDelta = 0;
+        this.deltaTime = 0;
         this.tickerTime = new Date().getTime(),
         this.physicsDelta;
-        this.stateDelta;
         this.playerId;
         this.pingDelay = 100;
         this.interpolationDelay = 100;
@@ -37,7 +37,6 @@ window.GarageServerIO = (function (window, socketio) {
         setTime: function (serverTime) {
             this.clientTime = serverTime;
             this.renderTime = this.clientTime - this.interpolationDelay;
-            this.renderDelta = 0;
         }
     };
 
@@ -162,6 +161,12 @@ window.GarageServerIO = (function (window, socketio) {
                     console.log('garageserver.io:: socket connect');
                 }
             });
+            _socket.on('state', function(data) {
+                if (_options.onGameState) {
+                    _options.onGameState(); 
+                }
+                _stateController.physicsDelta = data.physicsDelta;
+            });
             _socket.on('disconnect', function () {
                 if (_options.onPlayerDisconnect) {
                     _options.onPlayerDisconnect();
@@ -213,7 +218,7 @@ window.GarageServerIO = (function (window, socketio) {
         },
 
         setPlayerState = function (state) {
-            _socket.emit('state', state);
+            _socket.emit('playerState', state);
         },
 
         removePlayer = function (id) {
@@ -234,8 +239,6 @@ window.GarageServerIO = (function (window, socketio) {
         },
 
         updateState = function (data) {
-            _stateController.stateDelta = data.stateDelta;
-            _stateController.physicsDelta = data.physicsDelta;
             _stateController.setTime(data.time);
 
             updatePlayersState(data);
@@ -286,7 +289,7 @@ window.GarageServerIO = (function (window, socketio) {
 
         getPlayerStates = function (stateCallback) {
             var newTickTime = new Date().getTime();
-            _stateController.renderDelta += (newTickTime - _stateController.tickerTime);
+            _stateController.deltaTime = newTickTime - _stateController.tickerTime;
             _stateController.tickerTime = newTickTime;
 
             if(_options.interpolation && _options.onInterpolation) {
diff --git a/lib/server/garageserver.io.js b/lib/server/garageserver.io.js
index e83bf71..7fa49f2 100644
--- a/lib/server/garageserver.io.js
+++ b/lib/server/garageserver.io.js
@@ -16,6 +16,7 @@ options = {
 
 function GarageServer (socketio, options) {
     this.io = socketio;
+    this.physicsInterval = options.physicsInterval ? options.physicsInterval : 15;
     this.game = new garageServerGame.createGame(options);
     this.registerSocketEvents(options);
 }
@@ -27,6 +28,7 @@ GarageServer.prototype.registerSocketEvents = function (options) {
         if (options.logging) {
             console.log('garageserver.io:: socket ' + socket.id + ' connection');
         }
+        socket.emit('state', { physicsDelta: self.physicsInterval });
         self.onPlayerConnect(socket, options);
 
         socket.on('disconnect', function () {
@@ -50,9 +52,9 @@ GarageServer.prototype.registerSocketEvents = function (options) {
             self.onPing(socket, data, options);
         });
         
-        socket.on('state', function (data) {
+        socket.on('playerState', function (data) {
             if (options.logging) {
-                console.log('garageserver.io:: socket state ' + data);
+                console.log('garageserver.io:: socket playerState ' + data);
             }
             self.onState(socket, data, options);
         });
diff --git a/lib/server/garageservergame.js b/lib/server/garageservergame.js
index 8a5cce5..504eb47 100644
--- a/lib/server/garageservergame.js
+++ b/lib/server/garageservergame.js
@@ -19,7 +19,7 @@ GarageServerGame.prototype.updateState = function (options) {
 
 GarageServerGame.prototype.updatePlayers = function (options) {
     var currentTime = new Date().getTime() - this.startTime,
-        state = { time: currentTime, physicsDelta: this.physicsInterval, stateDelta: this.stateInterval, playerStates: [] };
+        state = { time: currentTime, playerStates: [] };
 
     this.players.forEach(function (player) {
         state.playerStates.push({ id: player.client.id, state: player.state, seq: player.sequence });