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

refactoring

Browse source
This commit is contained in:
Logsol 2013-01-05 06:16:42 +01:00
parent 39af52dd14
commit c256f8a729
8 changed files with 87 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

47
app/Game/Client/GameController.js
View file

@ -50,37 +50,30 @@ function (Parent, PhysicsEngine, ViewController, KeyboardController, Notificatio
GameController.prototype.userJoined = function (user) {
var player = Parent.prototype.userJoined.call(this, user);
player.spawn(50, 50);
//player.spawn(50, 50);
return player;
}
/*
GameController.prototype.userLeft = function (user) {
Parent.prototype.userLeft.call(user);
GameController.prototype.onWorldUpdate = function (updateData) {
var body = this.physicsEngine.world.GetBodyList();
do {
var bodyName = body.GetUserData();
if(bodyName && updateData[bodyName]) {
var update = updateData[bodyName];
body.SetAwake(true);
body.SetPosition(update.p);
body.SetAngle(update.a);
body.SetLinearVelocity(update.lv);
body.SetAngularVelocity(update.av);
}
} while (body = body.GetNext());
}
*/
GameController.prototype.processGameCommand = function (command, options) {
GameController.prototype.onPlayerSpawn = function(user) {
if (command == "worldUpdate") {
var body = this.physicsEngine.world.GetBodyList();
do {
var userData = body.GetUserData();
if(userData && options[userData]) {
var update = options[userData];
//console.log('position difference:', (body.GetPosition().y - update.p.y) * 30, body.GetLinearVelocity().y);
body.SetAwake(true);
body.SetPosition(update.p);
body.SetAngle(update.a);
body.SetLinearVelocity(update.lv);
body.SetAngularVelocity(update.av);
}
} while (body = body.GetNext());
}
}
};
return GameController;
});

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

@ -10,32 +10,29 @@ function (ProtocolHelper, GameController, User, NotificationCenter) {
function Networker (socketLink) {
this.socketLink = socketLink;
this.gameController = null;
this.users = {};
this.init();
}
Networker.prototype.init = function () {
this.socketLink.on('connect', this.onConnect.bind(this));
this.socketLink.on('disconnect', this.onDisconnect.bind(this));
var self = this;
this.socketLink.on('connect', function () {
self.onConnect();
});
this.socketLink.on('message', function (message) {
self.onMessage(message);
});
this.socketLink.on('disconnect', function () {
self.onDisconnect();
ProtocolHelper.applyCommand(message, self);
});
NotificationCenter.on("sendGameCommand", this.sendGameCommand, this);
}
// Socket callbacks
Networker.prototype.onConnect = function () {
console.log('connected.')
this.join('dungeon');
this.sendCommand('join', 'dungeon');
}
Networker.prototype.onDisconnect = function () {
@ -45,30 +42,24 @@ function (ProtocolHelper, GameController, User, NotificationCenter) {
document.body.style.backgroundColor = '#aaaaaa';
}
Networker.prototype.join = function (channelName) {
this.sendCommand('join', channelName);
}
Networker.prototype.onJoinSuccess = function (options) {
this.gameController = new GameController();
this.gameController.loadLevel("default.json");
var user = new User(options.userId);
this.gameController.meJoined(user);
console.log("Joined ", options);
console.log("Joined Success", options);
// -> replace with decent command
if (options.others && options.others.length > 0) {
if (options.others) {
for(var i = 0; i < options.others.length; i++) {
var user = {id: options.others[i]};
this.gameController.userJoined(user);
this.users[userId] = new User(options.others[i]);
}
}
}
// Sending commands
Networker.prototype.sendCommand = function (command, options) {
var message = ProtocolHelper.encodeCommand(command, options);
this.socketLink.send(message);
@ -79,53 +70,18 @@ function (ProtocolHelper, GameController, User, NotificationCenter) {
this.sendCommand('gameCommand', message);
}
Networker.prototype.onMessage = function (message) {
var self = this;
ProtocolHelper.runCommands(message, function (command, options) {
self.processControlCommand(command, options);
});
}
// Commands from server
Networker.prototype.onUserJoined = function (userId) {
// -> replace with game command
var user = {id: userId};
this.gameController.userJoined(user);
console.log("User " + userId + " joined");
this.users[userId] = new User(userId);
}
Networker.prototype.onUserLeft = function (userId) {
// -> replace with game command
var user = {id: userId};
this.gameController.userLeft(user);
console.log("User " + userId + " left");
delete this.users[userId];
}
Networker.prototype.processControlCommand = function (command, options) {
switch(command) {
case 'joinSuccess':
this.onJoinSuccess(options);
break;
case 'gameCommand':
for(var gameCommand in options) {
this.gameController.processGameCommand(gameCommand, options[gameCommand]);
}
break;
case 'userJoined':
this.onUserJoined(options);
break;
case 'userLeft':
this.onUserLeft(options);
break;
default:
break;
}
Networker.prototype.onGameCommand = function(message) {
ProtocolHelper.applyCommand(message, this.gameController);
}
return Networker;