Merge pull request #27 from stucampbell/master

More integration
dylanbeattie · Jun 4, 2011 · 0f28cdc · 0f28cdc
2 parents f1aabfa + adba68f
commit 0f28cdc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/public/index.html b/public/index.html
@@ -7,6 +7,15 @@
 
 	<body>
 		<a id="join" href="#">Join</a>
+
+		<div id="container">
+			<div id="arena"></div>
+			<div id="playerLayer"></div>
+			<div id="holding"></div>
+		</div>
+
+
+
 		<script src="js/libs/jquery-1.6.1.js"></script>
 		<script src="js/libs/socket.io.min.js"></script>
 		<script src="js/libs/jquery.hotkeys.js"></script>
@@ -16,6 +25,7 @@
 		<script src="js/game/kaboom.socket.js"></script>
 		<script src="js/game/kaboom.game.js"></script>
 		<script src="js/game/kaboom.player.js"></script>
+		<script src="js/game/kaboom.renderer.js"></script>
 		<script src="js/game/level.js"></script>
 		<script type="text/javascript">
 		$(function(){

diff --git a/public/js/game/client.js b/public/js/game/client.js
@@ -12,12 +12,8 @@ KaboomClient.prototype = {
 		var that = this;
 
 
-		/*
-		setInterval(function(){
-			game.update();
-			that.draw(game);
-		}, 1000/this.fps);
-		*/		
+
+
 
 
     },
@@ -96,6 +92,21 @@ KaboomClient.prototype = {
 
 		$(document).bind('keydown', this.onKeyDown.bind(this));
 		$(document).bind('keyup', this.onKeyUp.bind(this));
+
+		var renderingTargets = {
+		  arena: $('#arena'),
+		  playerLayer: $('#playerLayer'),
+		  holding: $('#holding')
+		};
+
+	  var renderer = new KaboomRenderer(renderingTargets, window.game);
+
+		setInterval(function(){
+			window.game.update();
+			renderer.update();
+		}, 1000/this.fps);
+
+
 
 	}
 };

diff --git a/public/js/game/kaboom.game.js b/public/js/game/kaboom.game.js
@@ -24,9 +24,8 @@ KaboomGame.prototype = {
     copyStateFrom : function(gameState) {
         this.DISTANCE = gameState.DISTANCE;
         this.TILE_SIZE = gameState.TILE_SIZE;
-        if (this.level && gameState.level && this.level.copyStateFrom) {
-            this.level.copyStateFrom(gameState.level);
-        }
+		this.level = this.level || new Level();
+        this.level.copyStateFrom(gameState.level);
         for (var i = 0; i < gameState.players.length; i++) {
             this.findPlayer(gameState.players[i]).copyStateFrom(gameState.players[i]);
         }