From 3b66c2e960fe6397c3e2fa57461c9a877f78c996 Mon Sep 17 00:00:00 2001
From: Jeremiah Billmann <jcbillmann@yahoo.com>
Date: Fri, 2 Aug 2013 23:45:26 -0400
Subject: [PATCH] Added laser beams for entity

---
 example/game.js                    |   4 +---
 example/public/images/entity.png   | Bin 0 -> 2724 bytes
 example/public/javascripts/game.js |   9 +++++----
 example/shared/core.js             |   7 ++++---
 4 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 example/public/images/entity.png

diff --git a/example/game.js b/example/game.js
index 37b47f9..acd27db 100644
--- a/example/game.js
+++ b/example/game.js
@@ -7,14 +7,12 @@ function Game (sockets) {
     this.physicsInterval = 15;
     this.physicsDelta = this.physicsInterval / 1000;
     this.physicsIntervalId = 0;
-    this.worldState = { playerSize: 40, entitySize: 15 };
 
     this.server = garageServer.createGarageServer(sockets, 
         {
             logging: true,
             interpolation: true,
             clientSidePrediction: true,
-            worldState: this.worldState,
             smoothingFactor: 0.2
         });
 }
@@ -39,7 +37,7 @@ Game.prototype.update = function () {
         var entity = entities[i],
             newState = gamePhysics.getNewEntityState(entity.state, self.physicsDelta);
 
-        if (newState.x < 0 - self.worldState.playerSize || newState.y < 0 - self.worldState.playerSize || newState.x > self.worldState.width || newState.y > self.worldState.height) {
+        if (newState.x < -200 || newState.y < -200 || newState.x > 2000 || newState.y > 2000) {
             self.server.removeEntity(entity.id);
         } else {
             self.server.updateEntityState(entity.id, newState);
diff --git a/example/public/images/entity.png b/example/public/images/entity.png
new file mode 100644
index 0000000000000000000000000000000000000000..85370bd68f2964c5f3941310c92df1b18ab607f0
GIT binary patch
literal 2724
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

literal 0
HcmV?d00001

diff --git a/example/public/javascripts/game.js b/example/public/javascripts/game.js
index bc37728..d5c03c6 100644
--- a/example/public/javascripts/game.js
+++ b/example/public/javascripts/game.js
@@ -2,7 +2,8 @@ $(function () {
 
     "use strict";
 
-    var canvas = document.getElementById('gameCanvas'), ctxCanvas = canvas.getContext('2d'), keyboard = new THREEx.KeyboardState(), ships = preloadShips();
+    var canvas = document.getElementById('gameCanvas'), ctxCanvas = canvas.getContext('2d'), keyboard = new THREEx.KeyboardState(), ships = preloadShips(), entityImage = new Image();
+    entityImage.src = '../images/entity.png';
 
     window.addEventListener('resize', resizeCanvas, false);
 
@@ -30,12 +31,12 @@ $(function () {
                 ctxCanvas.fillStyle = 'white';
                 var playerStates = GarageServerIO.getPlayerStates(),
                     entityStates = GarageServerIO.getEntityStates();
+                entityStates.forEach(function (entity) {
+                    drawRotatedImage(entity.state.ang, entity.state.x, entity.state.y, entityImage);
+                });
                 playerStates.forEach(function (player) {
                     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, 5, 5);
-                });
             },
             //Update Loop
             function () {
diff --git a/example/shared/core.js b/example/shared/core.js
index aa4f592..3b45395 100644
--- a/example/shared/core.js
+++ b/example/shared/core.js
@@ -1,13 +1,14 @@
 (function(exports){
 
     exports.getNewPlayerState = function (state, inputs, deltaTime, garageServer) {
-        var i = 0, distance = 0, notLaunched = false;
+        var i = 0, distance = 0;
 
         if (!state.ang && state.ang !== 0) {
            state.ang = 0;
            state.x = 0;
            state.y = 0;
            state.ship = Math.floor(Math.random() * 9) + 1;
+           state.lastFire = new Date().getTime();
         }
 
         for (i = 0; i < inputs.length; i ++) {
@@ -18,11 +19,11 @@
             } else if (inputs[i].input === 'up') {
                 distance += (125 * deltaTime);
             } else if (inputs[i].input === 'space') {
-                if (garageServer && !notLaunched) {
+                if (garageServer && (new Date().getTime() - state.lastFire) > 1000) {
                     var newId = guid();
                     garageServer.addEntity(newId);
                     garageServer.updateEntityState(newId, { x: state.x, y: state.y, ang: state.ang } );
-                    notLaunched = true;
+                    state.lastFire = new Date().getTime();
                 }
             }
         }