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

removed collisionDetector for every player again, because box2d can only have one - userData solution instead

Browse source
This commit is contained in:
Logsol 2013-01-06 03:02:34 +01:00
parent f07505bc20
commit a59a258ad6
5 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,8 @@ function (Parent, PhysicsEngine, ViewController, KeyboardController, Notificatio
Parent.call(this, new PhysicsEngine()); Parent.call(this, new PhysicsEngine());
this.physicsEngine.setCollisionDetector();
this.me = null; this.me = null;
this.keyboardController = null; this.keyboardController = null;
@ -65,8 +67,6 @@ function (Parent, PhysicsEngine, ViewController, KeyboardController, Notificatio
//this.onSpawnPlayer(options); //this.onSpawnPlayer(options);
this.me = this.players[playerId]; this.me = this.players[playerId];
this.keyboardController = new KeyboardController(this.me, this); this.keyboardController = new KeyboardController(this.me, this);
this.physicsEngine.setCollisionDetector(this.me);
} }
GameController.prototype.onSpawnPlayer = function(options) { GameController.prototype.onSpawnPlayer = function(options) {

16
app/Game/Core/Collision/Detector.js
View file

@ -5,14 +5,12 @@ define([
function (Box2D, Parent) { function (Box2D, Parent) {
function Detector (player) { // FIXME evtl.bind(this) ? function Detector () { // FIXME evtl.bind(this) ?
this.listener = new Box2D.Dynamics.b2ContactListener(); this.listener = new Box2D.Dynamics.b2ContactListener();
this.listener.chuckDetector = this; this.listener.chuckDetector = this;
this.listener.BeginContact = this.BeginContact; this.listener.BeginContact = this.BeginContact;
this.listener.PostSolve = this.PostSolve; //this.listener.PostSolve = this.PostSolve;
this.listener.EndContact = this.EndContact; this.listener.EndContact = this.EndContact;
this.player = player;
} }
Detector.IDENTIFIER = { Detector.IDENTIFIER = {
@ -30,10 +28,10 @@ function (Box2D, Parent) {
Detector.prototype.handleStand = function (point, isColliding) { Detector.prototype.handleStand = function (point, isColliding) {
if (point.GetFixtureA().GetUserData() == Detector.IDENTIFIER.PLAYER_FOOT_SENSOR + '-' + this.player.id if (point.GetFixtureA().GetUserData().identifier == Detector.IDENTIFIER.PLAYER_FOOT_SENSOR) {
|| point.GetFixtureB().GetUserData() == Detector.IDENTIFIER.PLAYER_FOOT_SENSOR + '-' + this.player.id) { point.GetFixtureA().GetUserData().player.onFootSensorDetection(isColliding);
} else if (point.GetFixtureB().GetUserData().identifier == Detector.IDENTIFIER.PLAYER_FOOT_SENSOR) {
this.player.onFootSensorDetection(isColliding); point.GetFixtureB().GetUserData().player.onFootSensorDetection(isColliding);
} }
} }
@ -44,7 +42,7 @@ function (Box2D, Parent) {
} }
Detector.prototype.PostSolve = function (point, impulse) { Detector.prototype.PostSolve = function (point, impulse) {
this.chuckDetector.handleStand(point, true); //this.chuckDetector.handleStand(point, true);
} }
Detector.prototype.EndContact = function (point) { Detector.prototype.EndContact = function (point) {

13
app/Game/Core/Physics/Doll.js
View file

@ -6,8 +6,8 @@ define([
function (Box2D, Settings, CollisionDetector) { function (Box2D, Settings, CollisionDetector) {
function Doll (physicsEngine, id) { function Doll (physicsEngine, player) {
this.id = id; this.player = player;
this.physicsEngine = physicsEngine; this.physicsEngine = physicsEngine;
this.body; this.body;
this.legs; this.legs;
@ -24,7 +24,7 @@ function (Box2D, Settings, CollisionDetector) {
bodyDef.fixedRotation = true; bodyDef.fixedRotation = true;
bodyDef.linearDamping = Settings.PLAYER_LINEAR_DAMPING; bodyDef.linearDamping = Settings.PLAYER_LINEAR_DAMPING;
bodyDef.type = Box2D.Dynamics.b2Body.b2_dynamicBody; bodyDef.type = Box2D.Dynamics.b2Body.b2_dynamicBody;
bodyDef.userData = CollisionDetector.IDENTIFIER.PLAYER + '-' + this.id; bodyDef.userData = CollisionDetector.IDENTIFIER.PLAYER + '-' + this.player.id;
this.body = world.CreateBody(bodyDef); this.body = world.CreateBody(bodyDef);
@ -63,7 +63,12 @@ function (Box2D, Settings, CollisionDetector) {
feetShape.SetLocalPosition(new Box2D.Common.Math.b2Vec2(0 / Settings.RATIO, 0 / Settings.RATIO)); feetShape.SetLocalPosition(new Box2D.Common.Math.b2Vec2(0 / Settings.RATIO, 0 / Settings.RATIO));
fixtureDef.shape = feetShape; fixtureDef.shape = feetShape;
fixtureDef.isSensor = true; fixtureDef.isSensor = true;
fixtureDef.userData = CollisionDetector.IDENTIFIER.PLAYER_FOOT_SENSOR + '-' + this.id;
fixtureDef.userData = {
identifier: CollisionDetector.IDENTIFIER.PLAYER_FOOT_SENSOR,
player: this.player
}
this.body.CreateFixture(fixtureDef); this.body.CreateFixture(fixtureDef);
this.body.SetActive(false); this.body.SetActive(false);

2
app/Game/Core/Player.js
View file

@ -19,7 +19,7 @@ function (Doll, Settings) {
} }
Player.prototype.spawn = function (x, y) { Player.prototype.spawn = function (x, y) {
this.doll = new Doll(this.physicsEngine, this.id); this.doll = new Doll(this.physicsEngine, this);
this.doll.spawn(x, y); this.doll.spawn(x, y);
this.isSpawned = true; this.isSpawned = true;
} }

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

@ -13,6 +13,8 @@ function (Parent, PhysicsEngine, Settings, InputController, requestAnimFrame, No
function GameController (channel) { function GameController (channel) {
Parent.call(this, new PhysicsEngine()); Parent.call(this, new PhysicsEngine());
this.physicsEngine.setCollisionDetector();
this.channel = channel; this.channel = channel;
this.update(); this.update();
@ -62,8 +64,6 @@ function (Parent, PhysicsEngine, Settings, InputController, requestAnimFrame, No
var player = new Player(user.id, this.physicsEngine); var player = new Player(user.id, this.physicsEngine);
player.setInputController(new InputController(player)) player.setInputController(new InputController(player))
this.physicsEngine.setCollisionDetector(player);
return player; return player;
}; };