jeena/chuck.js
1
0
Fork 0
mirror of https://github.com/logsol/chuck.js.git synced 2026-05-11 10:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed worm

Browse source
This commit is contained in:
Logsol 2013-01-03 23:44:25 +01:00
parent 69fd43a900
commit 0adbc2a10a
4 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/Game/Client/Networker.js
View file

@ -48,8 +48,8 @@ function (ProtocolHelper, GameController) {
Networker.prototype.onJoinSuccess = function (options) { Networker.prototype.onJoinSuccess = function (options) {
//this.gameController = new GameController(); this.gameController = new GameController();
//this.gameController.loadLevel("default.json"); this.gameController.loadLevel("default.json");
@ -79,7 +79,7 @@ function (ProtocolHelper, GameController) {
} }
Networker.prototype.onUserJoined = function (userId) { Networker.prototype.onUserJoined = function (userId) {
//this.gameController.userJoined(userId); //this.gameController.userJoined(userId); -> replace with game command
console.log("User " + userId + " joined"); console.log("User " + userId + " joined");
} }
/* /*
@ -88,7 +88,7 @@ function (ProtocolHelper, GameController) {
} }
*/ */
Networker.prototype.onUserLeft = function (userId) { Networker.prototype.onUserLeft = function (userId) {
//this.gameController.userLeft(userId); //this.gameController.userLeft(userId); -> replace with game command
console.log("User " + userId + " left"); console.log("User " + userId + " left");
} }

5
app/Game/Core/GameController.js
View file

@ -29,16 +29,12 @@ function (Engine, Level, Player) {
this.level.loadLevelInToEngine(); this.level.loadLevelInToEngine();
} }
/*
GameController.prototype.destroy = function () { GameController.prototype.destroy = function () {
for(var player in this.players) { for(var player in this.players) {
this.players[player].destroy(); this.players[player].destroy();
} }
} }
GameController.prototype.userJoined = function (user) { GameController.prototype.userJoined = function (user) {
var player = new Player(user.id, this.physicsEngine); var player = new Player(user.id, this.physicsEngine);
this.players[user.id] = player; this.players[user.id] = player;
@ -51,7 +47,6 @@ function (Engine, Level, Player) {
delete this.players[user.id]; delete this.players[user.id];
} }
*/
return GameController; return GameController;
}); });

13
app/Game/Server/Channel.js
View file

@ -15,25 +15,18 @@
this.users = {}; this.users = {};
this.pipeToLobby = pipeToLobby; this.pipeToLobby = pipeToLobby;
this.gameController = new GameController(this); this.gameController = new GameController(this);
this.gameController.loadLevel("default.json"); this.gameController.loadLevel("default.json");
//this.pipeToLobby.receive = function (message) { self.onMessage(message) };
// !!! This should be done differently - use NotificationCenter.on('channel/dungeon/message') instead
/* /*
var self = this; var self = this;
NotificationCenter.on("processGameCommandFromUser", function (topic, args) { NotificationCenter.on("processGameCommandFromUser", function (topic, args) {
self.processGameCommandFromUser.apply(self, args); self.processGameCommandFromUser.apply(self, args);
}); });
*/
*/
// Messages look like:
// {channel: {setName: 'foo'}}
// {user: {jupm: null}, id: 12}
NotificationCenter.on('channel/message', function (message) { NotificationCenter.on('channel/message', function (message) {
switch(message.recipient) { switch(message.recipient) {
@ -60,7 +53,7 @@
} }
}); });
NotificationCenter.on('channel/users/all', this.sendControlCommandToAllUsers, this); NotificationCenter.on('sendControlCommandToAllUsers', this.sendControlCommandToAllUsers, this);
NotificationCenter.on('channel/users/all/except', this.sendControlCommandToAllUsersExcept, this); NotificationCenter.on('channel/users/all/except', this.sendControlCommandToAllUsersExcept, this);
console.checkpoint('channel ' + name + ' created'); console.checkpoint('channel ' + name + ' created');

16
app/Game/Server/GameController.js
View file

@ -15,17 +15,17 @@ function (Parent, PhysicsEngine, Settings, InputController, requestAnimFrame, No
this.inputControllers = {}; this.inputControllers = {};
this.channel = channel; this.channel = channel;
//this.update(); this.update();
//this.updateWorld(); this.updateWorld();
//NotificationCenter.on('user/joined', this.userJoined, this); NotificationCenter.on('user/joined', this.userJoined, this);
//NotificationCenter.on('user/left', this.userLeft, this); NotificationCenter.on('user/left', this.userLeft, this);
console.checkpoint('starting game controller for channel ' + channel.name); console.checkpoint('starting game controller for channel ' + channel.name);
} }
GameController.prototype = Object.create(Parent.prototype); GameController.prototype = Object.create(Parent.prototype);
/*
GameController.prototype.update = function () { GameController.prototype.update = function () {
requestAnimFrame(this.update.bind(this)); requestAnimFrame(this.update.bind(this));
@ -37,6 +37,8 @@ function (Parent, PhysicsEngine, Settings, InputController, requestAnimFrame, No
} }
GameController.prototype.userJoined = function (user) { GameController.prototype.userJoined = function (user) {
console.log(Parent.prototype);
Parent.prototype.userJoined.call(this, user); Parent.prototype.userJoined.call(this, user);
var id = user.id; var id = user.id;
@ -77,11 +79,11 @@ function (Parent, PhysicsEngine, Settings, InputController, requestAnimFrame, No
} while (body = body.GetNext()); } while (body = body.GetNext());
if(isUpdateNeeded) { if(isUpdateNeeded) {
//NotificationCenter.trigger("sendCommandToAllUsers", ['gameCommand', {worldUpdate:update}]); NotificationCenter.trigger("sendControlCommandToAllUsers", ['gameCommand', {worldUpdate:update}]);
} }
setTimeout(this.updateWorld.bind(this), Settings.WORLD_UPDATE_BROADCAST_INTERVAL); setTimeout(this.updateWorld.bind(this), Settings.WORLD_UPDATE_BROADCAST_INTERVAL);
} }
*/
return GameController; return GameController;
}); });