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

fixed drop error. added carrier velocity

Browse source
This commit is contained in:
logsol 2014-12-25 15:00:10 +01:00
parent 7aa417dfc8
commit 197c4072c1
3 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/Game/Client/Control/Swiper.js
View file

@ -77,6 +77,15 @@ function (Nc) {
Swiper.prototype.swipeEnd = function(x, y) { Swiper.prototype.swipeEnd = function(x, y) {
var angularVelocity = this.angleSum; var angularVelocity = this.angleSum;
var length = this.lengthSum; var length = this.lengthSum;
if (this.points.length < 1) {
return {
x: 0,
y: 0,
av: 0
}
}
var p0x = this.points[0].x; var p0x = this.points[0].x;
var p0y = this.points[0].y; var p0y = this.points[0].y;
var sumx = 0; var sumx = 0;
@ -103,11 +112,11 @@ function (Nc) {
this.lengthSum = 0; this.lengthSum = 0;
this.points = []; this.points = [];
return { return {
x: direction.x * length / 100, x: direction.x * length / 100,
y: direction.y * length / 100, y: direction.y * length / 100,
av: angularVelocity / 100 av: angularVelocity / 100
} }
} }
Swiper.prototype.destroy = function() { Swiper.prototype.destroy = function() {

7
app/Game/Core/GameObjects/Doll.js
View file

@ -359,7 +359,12 @@ function (Parent, Box2D, Settings, CollisionDetector, Item, Nc) {
this.holdingJoint = null; this.holdingJoint = null;
this.holdingItem = null; this.holdingItem = null;
item.throw(options); var dollVelocity = {
x: this.body.GetLinearVelocity().x
y: this.body.GetLinearVelocity().y
};
item.throw(options, dollVelocity);
}; };
Doll.prototype.isAnotherPlayerNearby = function() { Doll.prototype.isAnotherPlayerNearby = function() {

6
app/Game/Core/GameObjects/Item.js
View file

@ -129,13 +129,13 @@ function (Parent, Box2D, Options, Settings, Exception, Nc) {
return this.body.GetWorldCenter(); return this.body.GetWorldCenter();
}; };
Item.prototype.throw = function(options) { Item.prototype.throw = function(options, carrierVelocity) {
var body = this.body; var body = this.body;
body.SetAwake(true); body.SetAwake(true);
var vector = new Box2D.Common.Math.b2Vec2( var vector = new Box2D.Common.Math.b2Vec2(
options.x * Settings.MAX_THROW_FORCE / this.options.weight, options.x * Settings.MAX_THROW_FORCE / this.options.weight + carrierVelocity.x,
-options.y * Settings.MAX_THROW_FORCE / this.options.weight -options.y * Settings.MAX_THROW_FORCE / this.options.weight + carrierVelocity.y
); );
this.body.SetLinearVelocity(vector); this.body.SetLinearVelocity(vector);