Skip to content

Commit

Permalink
updated communitcatipon w/ frontend.
Browse files Browse the repository at this point in the history
  • Loading branch information
Seye Ojumu committed Aug 27, 2011
1 parent fe3b15f commit f894fd9
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 20 deletions.
9 changes: 6 additions & 3 deletions app.coffee
Expand Up @@ -26,8 +26,10 @@ game.init()


io.sockets.on "connection", (socket) -> io.sockets.on "connection", (socket) ->


console.log "connected"

player = game.create_player() player = game.create_player()
game.add_player player.id game.add_player player
socket.emit "gamestate", game.get_state() socket.emit "gamestate", game.get_state()


socket.on "update", (data) -> socket.on "update", (data) ->
Expand All @@ -37,8 +39,9 @@ io.sockets.on "connection", (socket) ->
game.rem_player player.id game.rem_player player.id


loopt = () -> loopt = () ->
console.log "loopt" state = game.tick()
io.sockets.emit "gamestate", game.tick() console.log "loopt", state
io.sockets.emit "gamestate", state


setInterval loopt, game.SPEED setInterval loopt, game.SPEED


Expand Down
9 changes: 6 additions & 3 deletions app.js
Expand Up @@ -19,8 +19,9 @@
game.init(); game.init();
io.sockets.on("connection", function(socket) { io.sockets.on("connection", function(socket) {
var player; var player;
console.log("connected");
player = game.create_player(); player = game.create_player();
game.add_player(player.id); game.add_player(player);
socket.emit("gamestate", game.get_state()); socket.emit("gamestate", game.get_state());
socket.on("update", function(data) { socket.on("update", function(data) {
return console.log(data); return console.log(data);
Expand All @@ -30,8 +31,10 @@
}); });
}); });
loopt = function() { loopt = function() {
console.log("loopt"); var state;
return io.sockets.emit("gamestate", game.tick()); state = game.tick();
console.log("loopt", state);
return io.sockets.emit("gamestate", state);
}; };
setInterval(loopt, game.SPEED); setInterval(loopt, game.SPEED);
app.listen(8000); app.listen(8000);
Expand Down
9 changes: 6 additions & 3 deletions game.coffee
Expand Up @@ -4,7 +4,7 @@ _ = require("underscore")
players = {} players = {}
directions = {} directions = {}


FPS = 1 FPS = .5
SPEED = 1000 / FPS SPEED = 1000 / FPS


defaults = defaults =
Expand Down Expand Up @@ -32,7 +32,7 @@ rem_player = (pid) ->
delete players[pid] delete players[pid]


get_state = () -> get_state = () ->
_.values players (x.coords for x in _.values players)


tick = () -> tick = () ->
for pid, player in players for pid, player in players
Expand All @@ -51,4 +51,7 @@ set_direction = (player) ->
exports.init = init exports.init = init
exports.SPEED = SPEED exports.SPEED = SPEED
exports.tick = tick exports.tick = tick

exports.create_player = create_player
exports.add_player = add_player
exports.rem_player = rem_player
exports.get_state = get_state
15 changes: 13 additions & 2 deletions game.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions static/js/client.coffee
Expand Up @@ -16,9 +16,7 @@ $ ->




# Start socket.io # Start socket.io
#socket = io.connect() socket = io.connect()
#io.sockets.on 'connection', (socket) ->
# console.log 'connected'


#socket.on 'news', (data) -> socket.on "gamestate", (data) ->
# console.log data console.log data
10 changes: 6 additions & 4 deletions static/js/client.js
@@ -1,9 +1,8 @@
(function() { (function() {
$(function() { $(function() {
var box, height, row, width, x, y, _results; var box, height, row, socket, width, x, y;
width = 20; width = 20;
height = 10; height = 10;
_results = [];
for (x = 1; 1 <= height ? x <= height : x >= height; 1 <= height ? x++ : x--) { for (x = 1; 1 <= height ? x <= height : x >= height; 1 <= height ? x++ : x--) {
row = $("#row-template").clone(); row = $("#row-template").clone();
for (y = 1; 1 <= width ? y <= width : y >= width; 1 <= width ? y++ : y--) { for (y = 1; 1 <= width ? y <= width : y >= width; 1 <= width ? y++ : y--) {
Expand All @@ -14,8 +13,11 @@
} }
row.removeAttr('id'); row.removeAttr('id');
row.show(); row.show();
_results.push($(".game-board").append(row)); $(".game-board").append(row);
} }
return _results; socket = io.connect();
return socket.on("gamestate", function(data) {
return console.log(data);
});
}); });
}).call(this); }).call(this);

0 comments on commit f894fd9

Please sign in to comment.