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

fixes for animations with head and jump, etc.

Browse source
This commit is contained in:
jeena 2013-12-25 00:28:28 +01:00
parent 142964938c
commit 283a1ef48b
16 changed files with 147 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,10 +7,12 @@ define([
"Game/Core/NotificationCenter",
"Lib/Utilities/RequestAnimFrame",
"Game/Config/Settings",
"Lib/Vendor/Stats"
"Lib/Vendor/Stats",
"Game/Client/GameObjects/GameObject",
"Game/Client/Physics/Doll"
],
function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, NotificationCenter, requestAnimFrame, Settings, Stats) {
function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, NotificationCenter, requestAnimFrame, Settings, Stats, GameObject, Doll) {
function GameController () {
this.view = ViewManager.createView();
@ -85,41 +87,21 @@ function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Notificat
var body = this.physicsEngine.world.GetBodyList();
do {
var bodyName = body.GetUserData();
if(bodyName && updateData[bodyName]) {
var update = updateData[bodyName];
body.SetAwake(true);
if(false && this.me && this.me.getBody() == body) {
var p = body.GetPosition();
var x = update.p.x - p.x;
var y = update.p.y - p.y;
var max = 0.5;
var factor = 0.2;
//if(x > max || x < -max || y > max || y < -max) {
if(!this.mouse_joint) this.makeMouseJoint(update.p);
else this.mouse_joint.SetTarget(update.p);
var self = this;
/*setTimeout(function() {
self.physicsEngine.world.DestroyJoint(self.mouse_joint);
self.mouse_joint = null;
}, Settings.WORLD_UPDATE_BROADCAST_INTERVAL / 2)*/
//} else {
//this.physicsEngine.world.DestroyJoint(this.mouse_joint);
//this.mouse_joint = null;
//}
// NEXT TIME, try to create a simple body, that gets position and velocities from server doll
// and connect the joint to that.
} else {
var userData = body.GetUserData();
if (userData instanceof GameObject) {
var gameObject = userData;
if(updateData[gameObject.uid]) {
var update = updateData[gameObject.uid];
body.SetAwake(true);
body.SetPosition(update.p);
body.SetAngle(update.a);
body.SetLinearVelocity(update.lv);
body.SetAngularVelocity(update.av);
body.SetAngularVelocity(update.av);
if (gameObject instanceof Doll) {
gameObject.setActionState(update.as);
gameObject.lookAt(update.laxy.x, update.laxy.y);
}
}
}
} while (body = body.GetNext());