Merge branch 'master' of github.com:coryt/lightcycle-hackathon

Author: tobes31415

Client/js/brushes/lightTrail.js

@@ -6,7 +6,7 @@
  * To change this template use File | Settings | File Templates.
  */
 
-var BRUSH_SIZE = 1,
+var BRUSH_SIZE = 3,
     BRUSH_PRESSURE = 1;
 
 function lightTrail( context, color )
@@ -18,26 +18,28 @@ lightTrail.prototype =
 {
 	context: null,
 
-	mouseX: null, mouseY: null,
+	positionX: null, positionY: null,
 
 	painters: null,
 
 	interval: null,
 
     color:[0,0,0],
 
+    lightCycle: new Image() ,
+
 	init: function( context, color )
 	{
 		var scope = this;
-
+        scope.lightCycle.src = "images/lightcycle.png";
 		this.context = context;
 		this.context.globalCompositeOperation = 'source-over';
 
-        this.mouseX = 400;
-		this.mouseY = 400;
+        this.positionX = 400;
+		this.positionY = 400;
 
         if (!color && color.length != 0){
-            this.color = color;
+            scope.color = color;
         }// else defaults to RGB 0,0,0
 
 		this.painters = new Array();
@@ -56,16 +58,18 @@ lightTrail.prototype =
 			scope.context.lineWidth = BRUSH_SIZE;
 			scope.context.strokeStyle = "rgba(" + scope.color[0] + ", " + scope.color[1] + ", " + scope.color[2] + ", " + 0.05 * BRUSH_PRESSURE + ")";
 
-			for (i = 0; i < scope.painters.length; i++)
+            for (i = 0; i < scope.painters.length; i++)
 			{
 				scope.context.beginPath();
 				scope.context.moveTo(scope.painters[i].dx, scope.painters[i].dy);
 
-				scope.painters[i].dx -= scope.painters[i].ax = (scope.painters[i].ax + (scope.painters[i].dx - scope.mouseX) * scope.painters[i].div) * scope.painters[i].ease;
-				scope.painters[i].dy -= scope.painters[i].ay = (scope.painters[i].ay + (scope.painters[i].dy - scope.mouseY) * scope.painters[i].div) * scope.painters[i].ease;
+				scope.painters[i].dx -= scope.painters[i].ax = (scope.painters[i].ax + (scope.painters[i].dx - scope.positionX) * scope.painters[i].div) * scope.painters[i].ease;
+				scope.painters[i].dy -= scope.painters[i].ay = (scope.painters[i].ay + (scope.painters[i].dy - scope.positionY) * scope.painters[i].div) * scope.painters[i].ease;
 				scope.context.lineTo(scope.painters[i].dx, scope.painters[i].dy);
 				scope.context.stroke();
 			}
+
+            scope.context.drawImage(scope.lightCycle, scope.painters[i-1].dx,  scope.painters[i-1].dy, 33.33, 12.66);
 		}
 	},
 
@@ -75,25 +79,25 @@ lightTrail.prototype =
 	},
 
     //coordinates where the player starts
-	strokeStart: function( mouseX, mouseY )
+	strokeStart: function( positionX, positionY )
 	{
-		this.mouseX = mouseX;
-		this.mouseY = mouseY
+		this.positionX = positionX;
+		this.positionY = positionY;
 
 		for (var i = 0; i < this.painters.length; i++)
 		{
-			this.painters[i].dx = mouseX;
-			this.painters[i].dy = mouseY;
+			this.painters[i].dx = positionX;
+			this.painters[i].dy = positionY;
 		}
 
 		this.shouldDraw = true;
 	},
 
     //new coordinates moved to
-	stroke: function( mouseX, mouseY )
+	stroke: function( positionX, positionY )
 	{
-		this.mouseX = mouseX;
-		this.mouseY = mouseY;
+		this.positionX = positionX;
+		this.positionY = positionY;
 	},
 
     //end

Client/js/serverConn.js

@@ -68,7 +68,27 @@ ServerConn.prototype.parseMessage_ = function(data) {
                     for (var i = 0; i < players.length; i ++) {
                         var player = players[i];
                         if (player) {
-                            state.addPlayer(player);
+                            var pos = player.position;
+                            var x = null;
+                            var y = null;
+                            if (pos) {
+                                var split = pos.split(',');
+                                if (split && split.length == 2) {
+                                    x = split[0];
+                                    y = split[1];
+                                }
+                            }
+                            var p = this.getPlayer({
+                                ID : player.id,
+                                Nickname : player.name,
+                                Colour : player.color,
+                                StartX : x,
+                                StartY : y,
+                                Direction : player.direction,
+                                Status : player.status
+                            });
+
+                            state.addPlayer(p);
                         }
                     }
                 }
@@ -115,4 +135,10 @@ ServerConn.prototype.notifyLeft = function() {
 /** Send RIGHT event to server */
 ServerConn.prototype.notifyRight = function() {
     this.notify_(Action.RIGHT);
+}
+
+/** Function to get or create a player given a set of properties. Can be overwritten. */
+ServerConn.prototype.getPlayer = function(props) {
+    var player = new Player(props);
+    return player;
 }