From 39c8f76a1396d609b4ca330ff8c8dfaaf64b66e6 Mon Sep 17 00:00:00 2001 From: logsol Date: Mon, 20 Apr 2015 15:31:25 +0200 Subject: [PATCH 01/14] repaired debug view (offsetting) --- app/Game/Client/View/Pixi/Layers/Debug.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/Game/Client/View/Pixi/Layers/Debug.js b/app/Game/Client/View/Pixi/Layers/Debug.js index c7ae643..c5b650e 100644 --- a/app/Game/Client/View/Pixi/Layers/Debug.js +++ b/app/Game/Client/View/Pixi/Layers/Debug.js @@ -16,12 +16,5 @@ function (Parent, PIXI) { Debug.prototype = Object.create(Parent.prototype); - Debug.prototype.render = function(centerPosition, zoom) { - Parent.prototype.render.call(this, centerPosition, zoom); - - this.container.x -= 300 * zoom; - this.container.y -= 200 * zoom; - }; - return new Debug(); }); \ No newline at end of file From 8f5ee0b2476b9b8e71c7e29de32d73d95d67ea8d Mon Sep 17 00:00:00 2001 From: logsol Date: Mon, 20 Apr 2015 15:58:41 +0200 Subject: [PATCH 02/14] rebuilt skateboard without joints --- app/Game/Core/GameObjects/Items/Skateboard.js | 133 +++++++++++++++--- app/Game/Core/Loader/Level.js | 4 +- 2 files changed, 118 insertions(+), 19 deletions(-) diff --git a/app/Game/Core/GameObjects/Items/Skateboard.js b/app/Game/Core/GameObjects/Items/Skateboard.js index e6124c9..ae4e00a 100755 --- a/app/Game/Core/GameObjects/Items/Skateboard.js +++ b/app/Game/Core/GameObjects/Items/Skateboard.js @@ -12,16 +12,114 @@ function (Parent, Box2D, Settings, Assert) { function Skateboard(physicsEngine, uid, options) { Parent.call(this, physicsEngine, uid, options); + } + + Skateboard.prototype = Object.create(Parent.prototype); + + Skateboard.prototype.createFixture = function () { + Assert.number(this.options.width, this.options.height); + Assert.number(this.options.weight); + + var deckShape = new Box2D.Collision.Shapes.b2PolygonShape(); + var w = this.options.width / Settings.RATIO; + var h = 2 / Settings.RATIO; + deckShape.SetAsOrientedBox(w / 2, h / 2, new Box2D.Common.Math.b2Vec2(0, -(4.5 / Settings.RATIO))); + + var fixtureDef = new Box2D.Dynamics.b2FixtureDef(); + fixtureDef.shape = deckShape; + + var offset = 4, + factor = 80; + var density = ((this.options.weight + offset) / this.options.width / this.options.height) * factor; + fixtureDef.density = density; + fixtureDef.friction = Settings.ITEM_FRICTION; + fixtureDef.restitution = 0.2; + fixtureDef.isSensor = false; + + this.body.CreateFixture(fixtureDef); + + + this.addWheel( + -8, + -2.5 + ); + + this.addWheel( + 7, + -2.5 + ); + + }; + + + + Skateboard.prototype.addWheel = function(x, y) { + Assert.number(x, y); + + var bodyDef = new Box2D.Dynamics.b2BodyDef(); + bodyDef.type = Box2D.Dynamics.b2Body.b2_dynamicBody; + bodyDef.position.x = x / Settings.RATIO; + bodyDef.position.y = y / Settings.RATIO; + bodyDef.angle = 0; + + var wheelShape = new Box2D.Collision.Shapes.b2CircleShape(); + wheelShape.SetRadius(2.5 / Settings.RATIO); + wheelShape.SetLocalPosition(new Box2D.Common.Math.b2Vec2(x / Settings.RATIO, y / Settings.RATIO)); + + + var fixtureDef = new Box2D.Dynamics.b2FixtureDef(); + var offset = 4, + factor = 80; + var density = ((0.1 + offset) / 3 / 3) * factor; + fixtureDef.density = density; + fixtureDef.shape = wheelShape; + fixtureDef.restitution = 0.2; + fixtureDef.isSensor = false; + fixtureDef.friction = 0.0005; + + this.body.CreateFixture(fixtureDef); + }; + + + + Skateboard.prototype.flip = function(direction) { + this.flipDirection = direction; + + // FIXME: implement body flip if necessary + }; + + + + return Skateboard; + +}); + + +/* +define([ + "Game/" + GLOBALS.context + "/GameObjects/Item", + "Lib/Vendor/Box2D", + "Game/Config/Settings", + "Lib/Utilities/Assert" +], + +function (Parent, Box2D, Settings, Assert) { + + "use strict"; + + function Skateboard(physicsEngine, uid, options) { + + Parent.call(this, physicsEngine, uid, options); this.wheels = [ - this.addWheel( - options.x + 8, - options.y - 1.5 - ), - this.addWheel( - options.x - 8, - options.y - 1.5 - ) + this.addWheel( + options.x + 8, + options.y - 1.5 + ), + this.addWheel( + options.x - 8, + options.y - 1.5 + ) ]; } @@ -53,13 +151,13 @@ function (Parent, Box2D, Settings, Assert) { Skateboard.prototype.addWheel = function(x, y) { Assert.number(x, y); - var bodyDef = new Box2D.Dynamics.b2BodyDef(); + var bodyDef = new Box2D.Dynamics.b2BodyDef(); bodyDef.type = Box2D.Dynamics.b2Body.b2_dynamicBody; bodyDef.position.x = x / Settings.RATIO; bodyDef.position.y = y / Settings.RATIO; bodyDef.angle = 0; - var wheelShape = new Box2D.Collision.Shapes.b2CircleShape(); + var wheelShape = new Box2D.Collision.Shapes.b2CircleShape(); wheelShape.SetRadius(1.5 / Settings.RATIO); wheelShape.SetLocalPosition(new Box2D.Common.Math.b2Vec2(0, 0)); @@ -75,18 +173,18 @@ function (Parent, Box2D, Settings, Assert) { var wheelBody = this.body.GetWorld().CreateBody(bodyDef); wheelBody.CreateFixture(fixtureDef); - //var revoluteJointDef = new Box2D.Dynamics.Joints.b2RevoluteJointDef(); + //var revoluteJointDef = new Box2D.Dynamics.Joints.b2RevoluteJointDef(); var revoluteJointDef = new Box2D.Dynamics.Joints.b2WeldJointDef(); - //revoluteJointDef.enableMotor = false; + //revoluteJointDef.enableMotor = false; - revoluteJointDef.Initialize(this.body, wheelBody, wheelBody.GetWorldCenter()); - var j = this.body.GetWorld().CreateJoint(revoluteJointDef); + revoluteJointDef.Initialize(this.body, wheelBody, wheelBody.GetWorldCenter()); + var j = this.body.GetWorld().CreateJoint(revoluteJointDef); - // FIXME this means, that we will have bodies in the world, which must not be - // updated (wheels) because they are always connected to a body which will be updated. + // FIXME this means, that we will have bodies in the world, which must not be + // updated (wheels) because they are always connected to a body which will be updated. return wheelBody; }; @@ -116,4 +214,5 @@ function (Parent, Box2D, Settings, Assert) { return Skateboard; -}); \ No newline at end of file +}); +*/ \ No newline at end of file diff --git a/app/Game/Core/Loader/Level.js b/app/Game/Core/Loader/Level.js index 84b0c68..53b43d8 100755 --- a/app/Game/Core/Loader/Level.js +++ b/app/Game/Core/Loader/Level.js @@ -46,8 +46,8 @@ define([ Level.prototype.createItem = function(uid, options) { switch(options.type) { - //case "skateboard": - // return new Skateboard(this.engine, uid, options); + case "skateboard": + return new Skateboard(this.engine, uid, options); case "ragdoll": return new RagDoll(this.engine, uid, options); case "rube": From 09eaf1a85c091d92821467143b4d62a16954f68d Mon Sep 17 00:00:00 2001 From: logsol Date: Mon, 20 Apr 2015 15:59:07 +0200 Subject: [PATCH 03/14] added skateboard to debug --- static/maps/tiled/debug.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/static/maps/tiled/debug.json b/static/maps/tiled/debug.json index a58c9ef..d8e0842 100644 --- a/static/maps/tiled/debug.json +++ b/static/maps/tiled/debug.json @@ -221,11 +221,11 @@ }, "rotation":0, - "type":"", + "type":"rube", "visible":true, "width":0, "x":236.607333333333, - "y":471.255333333333 + "y":462.255333333333 }, { "height":0, @@ -290,7 +290,7 @@ { "height":0, "id":15, - "name":"Piano", + "name":"Skateboard", "properties": { From b12bf2bb0c0e7b641409519dbbec6cf2a7ae9b27 Mon Sep 17 00:00:00 2001 From: logsol Date: Mon, 20 Apr 2015 16:00:07 +0200 Subject: [PATCH 04/14] rebuilt skateboard without joints --- app/Game/Core/GameObjects/Items/Skateboard.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/Game/Core/GameObjects/Items/Skateboard.js b/app/Game/Core/GameObjects/Items/Skateboard.js index ae4e00a..1e12df6 100755 --- a/app/Game/Core/GameObjects/Items/Skateboard.js +++ b/app/Game/Core/GameObjects/Items/Skateboard.js @@ -51,8 +51,6 @@ function (Parent, Box2D, Settings, Assert) { }; - - Skateboard.prototype.addWheel = function(x, y) { Assert.number(x, y); @@ -80,15 +78,9 @@ function (Parent, Box2D, Settings, Assert) { this.body.CreateFixture(fixtureDef); }; - - Skateboard.prototype.flip = function(direction) { this.flipDirection = direction; - - // FIXME: implement body flip if necessary }; - - return Skateboard; From c67ff78aa0bbbe7e9e6fd0dad64e2c93754e1735 Mon Sep 17 00:00:00 2001 From: logsol Date: Mon, 20 Apr 2015 21:20:56 +0200 Subject: [PATCH 05/14] implemented rubedoll level item (not after dying yet) --- app/Game/Asset/RubeDoll.json | 788 +++++++++ .../Items/{Rube.js => RubeDoll.js} | 2 +- app/Game/Client/GameObjects/Items/Rube.js | 28 - app/Game/Client/GameObjects/Items/RubeDoll.js | 187 +++ app/Game/Config/ItemSettings.js | 12 +- app/Game/Core/GameObjects/Items/Rube.js | 1412 ----------------- app/Game/Core/GameObjects/Items/RubeDoll.js | 66 + app/Game/Core/Loader/Level.js | 8 +- app/Lib/Vendor/RequireJs/Plugin/Json.js | 72 + app/Lib/Vendor/RequireJs/Plugin/Text.js | 391 +++++ channel.js | 6 +- client.js | 2 + config/build-profile.js | 2 + static/items/rube/ragdoll-full.json | 1346 ++++++++++++++++ static/items/rube/ragdoll.rube | 828 ++++------ static/maps/tiled/debug.json | 12 +- 16 files changed, 3140 insertions(+), 2022 deletions(-) create mode 100644 app/Game/Asset/RubeDoll.json rename app/Game/Channel/GameObjects/Items/{Rube.js => RubeDoll.js} (63%) delete mode 100644 app/Game/Client/GameObjects/Items/Rube.js create mode 100644 app/Game/Client/GameObjects/Items/RubeDoll.js delete mode 100644 app/Game/Core/GameObjects/Items/Rube.js create mode 100644 app/Game/Core/GameObjects/Items/RubeDoll.js create mode 100644 app/Lib/Vendor/RequireJs/Plugin/Json.js create mode 100644 app/Lib/Vendor/RequireJs/Plugin/Text.js create mode 100644 static/items/rube/ragdoll-full.json diff --git a/app/Game/Asset/RubeDoll.json b/app/Game/Asset/RubeDoll.json new file mode 100644 index 0000000..114e29f --- /dev/null +++ b/app/Game/Asset/RubeDoll.json @@ -0,0 +1,788 @@ + +{ + "allowSleep" : true, + "autoClearForces" : true, + "body" : + [ + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.04692991077899933, + 0.04692991077899933, + -0.04692997038364410, + -0.04692997038364410 + ], + "y" : + [ + -0.1895973682403564, + 0.1895966529846191, + 0.1895966529846191, + -0.1895973682403564 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0004525936674326658, + "massData-center" : + { + "x" : -2.980232238769531e-08, + "y" : -3.576278686523438e-07 + }, + "massData-mass" : 0.03559110686182976, + "name" : "upperLeftArm", + "position" : + { + "x" : -0.1362041532993317, + "y" : 0.9068759679794312 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture0", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.1402979493141174, + 0.1375417709350586, + 0.001378186047077179, + -0.1402979493141174, + -0.1402979493141174, + 0.001192390918731689 + ], + "y" : + [ + -0.3207050263881683, + 0.4018019437789917, + 0.4018019437789917, + 0.3136067390441895, + -0.3432337343692780, + -0.3689299821853638 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.01047351956367493, + "massData-center" : + { + "x" : 0.001456731930375099, + "y" : 0.01425695233047009 + }, + "massData-mass" : 0.2038488984107971, + "name" : "chest", + "position" : + { + "x" : -0.04104747623205185, + "y" : 0.7829875946044922 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "circle" : + { + "center" : + { + "x" : -0.002679032273590565, + "y" : 0.004700660705566406 + }, + "radius" : 0.2268356680870056 + }, + "density" : 0.2204959988594055, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture1" + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0009180362685583532, + "massData-center" : + { + "x" : -0.002679032273590565, + "y" : 0.004700660705566406 + }, + "massData-mass" : 0.03564291819930077, + "name" : "head", + "position" : + { + "x" : 0.009572610259056091, + "y" : 1.462979435920715 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.04693000018596649, + 0.04693000018596649, + -0.04693005979061127, + -0.04693005979061127 + ], + "y" : + [ + -0.1159216761589050, + 0.1159217953681946, + 0.1159217953681946, + -0.1159216761589050 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0001134485355578363, + "massData-center" : + { + "x" : -2.980232238769531e-08, + "y" : 5.960464477539062e-08 + }, + "massData-mass" : 0.02176084183156490, + "name" : "lowerRightArm", + "position" : + { + "x" : 0.09864036738872528, + "y" : 0.6898344159126282 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.07039503753185272, + 0.07039503753185272, + -0.07039495557546616, + -0.07039495557546616 + ], + "y" : + [ + -0.09294363856315613, + 0.1277718394994736, + 0.1277718394994736, + -0.09294363856315613 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0001869033440016210, + "massData-center" : + { + "x" : 4.097818973036738e-08, + "y" : 0.01741409860551357 + }, + "massData-mass" : 0.03107452951371670, + "name" : "lowerLeftLeg", + "position" : + { + "x" : -0.06537666171789169, + "y" : 0.1036150008440018 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.04693000763654709, + 0.04693000763654709, + -0.04692991077899933, + -0.04692991077899933 + ], + "y" : + [ + -0.1159216761589050, + 0.1159217953681946, + 0.1159217953681946, + -0.1159216761589050 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0001134483172791079, + "massData-center" : + { + "x" : 4.842877032729120e-08, + "y" : 5.960464477539062e-08 + }, + "massData-mass" : 0.02176081016659737, + "name" : "lowerLeftArm", + "position" : + { + "x" : -0.1362059414386749, + "y" : 0.6898344159126282 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.04693000018596649, + 0.04693000018596649, + -0.04693005979061127, + -0.04693005979061127 + ], + "y" : + [ + -0.1895973682403564, + 0.1895966529846191, + 0.1895966529846191, + -0.1895973682403564 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0004525946278590709, + "massData-center" : + { + "x" : -2.980232238769531e-08, + "y" : -3.576278686523438e-07 + }, + "massData-mass" : 0.03559117391705513, + "name" : "upperRightArm", + "position" : + { + "x" : 0.09864036738872528, + "y" : 0.9068759679794312 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.07039496302604675, + 0.07039496302604675, + -0.07039486616849899, + -0.07039486616849899 + ], + "y" : + [ + -0.1890522241592407, + 0.1890524625778198, + 0.1890524625778198, + -0.1890522241592407 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0007221315754577518, + "massData-center" : + { + "x" : 4.842877388000488e-08, + "y" : 1.192092895507812e-07 + }, + "massData-mass" : 0.05323329567909241, + "name" : "upperRightLeg", + "position" : + { + "x" : 0.02818956598639488, + "y" : 0.3381301760673523 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.07039505988359451, + 0.07039505988359451, + -0.07039495557546616, + -0.07039495557546616 + ], + "y" : + [ + -0.1890522241592407, + 0.1890524625778198, + 0.1890524625778198, + -0.1890522241592407 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.000722132739610970, + "massData-center" : + { + "x" : 5.215406417846680e-08, + "y" : 1.192092824453539e-07 + }, + "massData-mass" : 0.05323336645960808, + "name" : "upperLeftLeg", + "position" : + { + "x" : -0.06537666171789169, + "y" : 0.3381301760673523 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.07039496302604675, + 0.07039496302604675, + -0.07039486616849899, + -0.07039486616849899 + ], + "y" : + [ + -0.09294389933347702, + 0.1276105940341949, + 0.1276105940341949, + -0.09294389933347702 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0001864957448560745, + "massData-center" : + { + "x" : 4.842877032729120e-08, + "y" : 0.01733334921300411 + }, + "massData-mass" : 0.03105182945728302, + "name" : "lowerRightLeg", + "position" : + { + "x" : 0.02818956598639488, + "y" : 0.1036150008440018 + }, + "type" : 2 + } + ], + "collisionbitplanes" : + { + "names" : + [ + "bitplane1", + "bitplane2", + "bitplane3", + "bitplane4", + "bitplane5", + "bitplane6", + "bitplane7", + "bitplane8", + "bitplane9", + "bitplane10", + "bitplane11", + "bitplane12", + "bitplane13", + "bitplane14", + "bitplane15", + "bitplane16", + "bitplane17", + "bitplane18", + "bitplane19", + "bitplane20", + "bitplane21", + "bitplane22", + "bitplane23", + "bitplane24", + "bitplane25", + "bitplane26", + "bitplane27", + "bitplane28", + "bitplane29", + "bitplane30", + "bitplane31", + "bitplane32" + ] + }, + "continuousPhysics" : true, + "gravity" : + { + "x" : 0, + "y" : -10 + }, + "joint" : + [ + + { + "anchorA" : + { + "x" : 0.06392270326614380, + "y" : 0.4330990314483643 + }, + "anchorB" : + { + "x" : 0.01330260001122952, + "y" : -0.2468919754028320 + }, + "bodyA" : 1, + "bodyB" : 2, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -0.6981316804885864, + "maxMotorTorque" : 0, + "motorSpeed" : 0, + "name" : "joint9", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 1.221730470657349 + }, + + { + "anchorA" : + { + "x" : 0.0008554458618164062, + "y" : -0.1461489200592041 + }, + "anchorB" : + { + "x" : 0.0008557140827178955, + "y" : 0.07089227437973022 + }, + "bodyA" : 0, + "bodyB" : 5, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -1.919862151145935, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint4", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 0.01745329238474369 + }, + + { + "anchorA" : + { + "x" : 0.0003538504242897034, + "y" : 0.07107692956924438 + }, + "anchorB" : + { + "x" : 0.0003536641597747803, + "y" : -0.1459646224975586 + }, + "bodyA" : 3, + "bodyB" : 6, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -1.919862151145935, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint1", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 0.01745329238474369 + }, + + { + "anchorA" : + { + "x" : 0.001979876309633255, + "y" : -0.1506856828927994 + }, + "anchorB" : + { + "x" : 0.001979988068342209, + "y" : 0.08382888138294220 + }, + "bodyA" : 7, + "bodyB" : 9, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : 0.01745329238474369, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint8", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 2.268928050994873 + }, + + { + "anchorA" : + { + "x" : -0.0007802918553352356, + "y" : -0.1484908312559128 + }, + "anchorB" : + { + "x" : -0.0007800981402397156, + "y" : 0.08614097535610199 + }, + "bodyA" : 8, + "bodyB" : 4, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : 0.01745329238474369, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint7", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 2.268928050994873 + }, + + { + "anchorA" : + { + "x" : -0.09517393261194229, + "y" : 0.2718780040740967 + }, + "anchorB" : + { + "x" : -1.741945743560791e-05, + "y" : 0.1479903459548950 + }, + "bodyA" : 1, + "bodyB" : 0, + "enableLimit" : false, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -2.268928050994873, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint3", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 3.141592741012573 + }, + + { + "anchorA" : + { + "x" : 0.1396137326955795, + "y" : 0.2701327800750732 + }, + "anchorB" : + { + "x" : -7.455050945281982e-05, + "y" : 0.1462446451187134 + }, + "bodyA" : 1, + "bodyB" : 6, + "enableLimit" : false, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -2.268928050994873, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint2", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 3.141592741012573 + }, + + { + "anchorA" : + { + "x" : -0.06799929589033127, + "y" : -0.2890855073928833 + }, + "anchorB" : + { + "x" : -0.04493143409490585, + "y" : 0.1559127867221832 + }, + "bodyA" : 1, + "bodyB" : 8, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -0.6981316804885864, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint6", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 1.919862151145935 + }, + + { + "anchorA" : + { + "x" : 0.1116365119814873, + "y" : -0.2944114208221436 + }, + "anchorB" : + { + "x" : 0.04127830639481544, + "y" : 0.1504460573196411 + }, + "bodyA" : 1, + "bodyB" : 7, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -0.6981316804885864, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint5", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 1.919862151145935 + } + ], + "positionIterations" : 3, + "stepsPerSecond" : 60.0, + "subStepping" : false, + "velocityIterations" : 8, + "warmStarting" : true +} diff --git a/app/Game/Channel/GameObjects/Items/Rube.js b/app/Game/Channel/GameObjects/Items/RubeDoll.js similarity index 63% rename from app/Game/Channel/GameObjects/Items/Rube.js rename to app/Game/Channel/GameObjects/Items/RubeDoll.js index 455467b..3e27b2b 100644 --- a/app/Game/Channel/GameObjects/Items/Rube.js +++ b/app/Game/Channel/GameObjects/Items/RubeDoll.js @@ -1,5 +1,5 @@ define([ - "Game/Core/GameObjects/Items/Rube" + "Game/Core/GameObjects/Items/RubeDoll" ], function (Parent) { diff --git a/app/Game/Client/GameObjects/Items/Rube.js b/app/Game/Client/GameObjects/Items/Rube.js deleted file mode 100644 index 4aa825b..0000000 --- a/app/Game/Client/GameObjects/Items/Rube.js +++ /dev/null @@ -1,28 +0,0 @@ -define([ - "Game/Core/GameObjects/Items/Rube" -], - -function (Parent) { - - "use strict"; - - function Rube(physicsEngine, uid, options) { - Parent.call(this, physicsEngine, uid, options); - } - - Rube.prototype = Object.create(Parent.prototype); - - Rube.prototype.createMesh = function() { - }; - - Rube.prototype.destroy = function() { - }; - - Rube.prototype.render = function() { - } - - Rube.prototype.flip = function(direction) { - }; - - return Rube; -}); \ No newline at end of file diff --git a/app/Game/Client/GameObjects/Items/RubeDoll.js b/app/Game/Client/GameObjects/Items/RubeDoll.js new file mode 100644 index 0000000..2c76d91 --- /dev/null +++ b/app/Game/Client/GameObjects/Items/RubeDoll.js @@ -0,0 +1,187 @@ +define([ + "Game/Core/GameObjects/Items/RubeDoll", + "Game/Client/View/Abstract/Layer", + "Game/Config/Settings", + "Lib/Utilities/NotificationCenter", +], + +function (Parent, Layer, Settings, Nc) { + + "use strict"; + + function RubeDoll(physicsEngine, uid, options) { + + this.primaryColor = 0x008800; + + var limbOptions = {}; + + limbOptions.chest = { + width: 6, + height: 18, + x: 0, + y: 0 + }; + + limbOptions.head = { + width: 10, + height: 12, + x: 0, + y: - limbOptions.chest.height / 2 - 7 + }; + + limbOptions.upperLeftLeg = { + width: 5, + height: 8, + x: -2, + y: limbOptions.chest.height / 2 + }; + + limbOptions.upperRightLeg = { + width: 4, + height: 9, + x: 2, + y: limbOptions.chest.height / 2 + }; + + limbOptions.lowerLeftLeg = { + width: 4, + height: 4, + x: -2, + y: limbOptions.chest.height / 2 + limbOptions.upperLeftLeg.height + }; + + limbOptions.lowerRightLeg = { + width: 4, + height: 4, + x: 2, + y: limbOptions.chest.height / 2 + limbOptions.upperRightLeg.height + }; + + + + limbOptions.upperLeftArm = { + width: 2, + height: 8, + x: -2, + y: -limbOptions.chest.height / 2 + }; + + limbOptions.upperRightArm = { + width: 3, + height: 8, + x: 2, + y: -limbOptions.chest.height / 2 + }; + + limbOptions.lowerLeftArm = { + width: 2, + height: 5, + x: -2, + y: -limbOptions.chest.height / 2 + limbOptions.upperLeftArm.height + }; + + limbOptions.lowerRightArm = { + width: 2, + height: 5, + x: 2, + y: -limbOptions.chest.height / 2 + limbOptions.upperRightArm.height + }; + + this.limbOptions = limbOptions; + + this.layerId = Layer.ID.SPAWN; + this.limbMeshes = {}; + this.baseMeshName = "chest"; + this.characterName = "Chuck"; + + Parent.call(this, physicsEngine, uid, options); + } + + RubeDoll.prototype = Object.create(Parent.prototype); + + RubeDoll.prototype.createMesh = function() { + + + this.createLimbMesh("lowerRightLeg"); + this.createLimbMesh("upperRightLeg"); + + this.createLimbMesh("lowerRightArm"); + this.createLimbMesh("upperRightArm"); + + this.createLimbMesh("chest"); + this.createLimbMesh("head"); + + this.createLimbMesh("lowerLeftLeg"); + this.createLimbMesh("upperLeftLeg"); + + this.createLimbMesh("lowerLeftArm"); + this.createLimbMesh("upperLeftArm"); + + }; + + RubeDoll.prototype.createLimbMesh = function(name) { + var self = this; + var texturePath = Settings.GRAPHICS_PATH + + Settings.GRAPHICS_SUBPATH_CHARACTERS + "" + + this.characterName + '/'; + + + var callback = function(mesh) { + if(name == self.baseMeshName) { + self.mesh = mesh; + } + + self.limbMeshes[name] = mesh; + + Nc.trigger(Nc.ns.client.view.mesh.add, self.layerId, mesh); + + // setting shirt color + Nc.trigger(Nc.ns.client.view.mesh.addFilter, self.layerId, mesh, "colorRangeReplace", { + minColor: 0x3b4a31, + maxColor: 0x6d855d, + newColor: self.primaryColor, + brightnessOffset: 0.56 + }); + }; + + Nc.trigger(Nc.ns.client.view.mesh.create, + this.layerId, + texturePath + name + ".png", + callback, + { + width: this.limbOptions[name].width, + height: this.limbOptions[name].height, + pivot: { + x: this.limbOptions[name].width / 2, + y: this.limbOptions[name].height / 2 + } + } + ); + }; + + RubeDoll.prototype.destroy = function() { + }; + + RubeDoll.prototype.render = function() { + if(this.limbs) { + for(var name in this.limbMeshes) { + if(this.limbs[name]) { + Nc.trigger(Nc.ns.client.view.mesh.update, + this.layerId, + this.limbMeshes[name], + { + x: this.limbs[name].GetPosition().x * Settings.RATIO, + y: this.limbs[name].GetPosition().y * Settings.RATIO, + rotation: this.limbs[name].GetAngle() + } + ); + } + } + } + }; + + RubeDoll.prototype.flip = function(direction) { + }; + + return RubeDoll; +}); \ No newline at end of file diff --git a/app/Game/Config/ItemSettings.js b/app/Game/Config/ItemSettings.js index 0546123..532d6fc 100644 --- a/app/Game/Config/ItemSettings.js +++ b/app/Game/Config/ItemSettings.js @@ -411,19 +411,17 @@ function () { }, - - - "Rube": + "RubeDoll": { "category": "kitchen", "image": "banana.gif", - - // "type": "rube", - "weight": "1", + + "weight": "3", "width": "5", "height": "9", - "grabAngle": "0.5", + "type": "rubedoll", + "grabAngle": "0", } }; diff --git a/app/Game/Core/GameObjects/Items/Rube.js b/app/Game/Core/GameObjects/Items/Rube.js deleted file mode 100644 index ccc06a6..0000000 --- a/app/Game/Core/GameObjects/Items/Rube.js +++ /dev/null @@ -1,1412 +0,0 @@ -define([ - "Game/" + GLOBALS.context + "/GameObjects/Item", - "Lib/Vendor/RubeLoader", - "Lib/Vendor/Box2D", - "Game/Config/Settings", - "Lib/Utilities/Assert" -], - -function (Parent, RubeLoader, Box2D, Settings, Assert) { - - "use strict"; - - // Fixme - make this loadable - var __ragdollJson; - - function Rube(physicsEngine, uid, options) { - Assert.number(options.x, options.y); - - this.rubeLoader = null; - this.body = null; - - Parent.call(this, physicsEngine, uid, options); - var world = physicsEngine.getWorld(); - world.DestroyBody(this.body); - - var json = __ragdollJson; - - this.rubeLoader = new RubeLoader(json, world); - var scene = this.rubeLoader.getScene(); - - for (var i in scene.bodies) { - var body = scene.bodies[i]; - var position = body.GetPosition().Copy(); - position.Add(new Box2D.Common.Math.b2Vec2( - options.x / Settings.RATIO, - options.y / Settings.RATIO - )); - body.SetPosition(position); - - if(body.name == "chest"){ - this.body = body; - } - } - - var def = this.body.GetDefinition(); - def.userData = this; - this.body.SetUserData(this); - } - - Rube.prototype = Object.create(Parent.prototype); - - Rube.prototype.flip = function(direction) { - Parent.prototype.flip.call(this, direction); - // Extend - }; - - __ragdollJson = - -{ - "allowSleep" : true, - "autoClearForces" : true, - "body" : - [ - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.05748672783374786, - 0.05748672783374786, - -0.05748683214187622, - -0.05748683214187622 - ], - "y" : - [ - -0.2322469353675842, - 0.2322462797164917, - 0.2322462797164917, - -0.2322469353675842 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.001019014045596123, - "massData-center" : - { - "x" : -5.215406062575312e-08, - "y" : -3.278255462646484e-07 - }, - "massData-mass" : 0.05340443924069405, - "name" : "upperArmLeft", - "position" : - { - "x" : -0.1699507087469101, - "y" : 1.113796472549438 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture0", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.1718577891588211, - 0.1684816330671310, - 0.001688212156295776, - -0.1718577295541763, - -0.1718577295541763, - 0.001460619270801544 - ], - "y" : - [ - -0.3928470611572266, - 0.4921868443489075, - 0.4921868443489075, - 0.3841522336006165, - -0.4204435348510742, - -0.4519201517105103 - ] - } - } - }, - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture2", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.1679489463567734, - 0.1679489463567734, - -0.004204027354717255, - -0.004204027354717255 - ], - "y" : - [ - 0.4449140429496765, - 0.6170670390129089, - 0.6170670390129089, - 0.4449140429496765 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.03228222951292992, - "massData-center" : - { - "x" : 0.008858840912580490, - "y" : 0.06282533705234528 - }, - "massData-mass" : 0.3355117142200470, - "name" : "chest", - "position" : - { - "x" : -0.05338868126273155, - "y" : 0.9620395302772522 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "circle" : - { - "center" : - { - "x" : -0.007499951869249344, - "y" : 0.003749847412109375 - }, - "radius" : 0.2746430933475494 - }, - "density" : 0.2204959988594055, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture1" - }, - - { - "circle" : - { - "center" : - { - "x" : -0.03327952325344086, - "y" : -0.1384725570678711 - }, - "radius" : 0.2485582530498505 - }, - "density" : 0.2204959988594055, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture1" - } - ], - "linearVelocity" : 0, - "massData-I" : 0.004164268728345633, - "massData-center" : - { - "x" : -0.01910765282809734, - "y" : -0.06028826907277107 - }, - "massData-mass" : 0.09504657238721848, - "name" : "head", - "position" : - { - "x" : 0.04257059469819069, - "y" : 1.812389135360718 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.05748683214187622, - 0.05748683214187622, - -0.05748690664768219, - -0.05748690664768219 - ], - "y" : - [ - -0.1419981122016907, - 0.1419981718063354, - 0.1419981718063354, - -0.1419981122016907 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.0002554289239924401, - "massData-center" : - { - "x" : -3.725290298461914e-08, - "y" : 2.980232238769531e-08 - }, - "massData-mass" : 0.03265211358666420, - "name" : "lowerArmRight", - "position" : - { - "x" : 0.1177217364311218, - "y" : 0.8479318022727966 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.1415265351533890, - 0.1415265351533890, - -0.08457186818122864, - -0.08457186818122864 - ], - "y" : - [ - -0.1143886670470238, - -0.05680520832538605, - -0.05680520832538605, - -0.1143886670470238 - ] - } - } - }, - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.08623030036687851, - 0.08623030036687851, - -0.08623020350933075, - -0.08623020350933075 - ], - "y" : - [ - -0.1138511821627617, - 0.1565139442682266, - 0.1565139442682266, - -0.1138511821627617 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.0005858240183442831, - "massData-center" : - { - "x" : 0.006215983536094427, - "y" : -0.002008607611060143 - }, - "massData-mass" : 0.05964682996273041, - "name" : "lowerLegLeft", - "position" : - { - "x" : -0.08319067955017090, - "y" : 0.1298431605100632 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.05748684704303741, - 0.05748684704303741, - -0.05748672783374786, - -0.05748672783374786 - ], - "y" : - [ - -0.1419981122016907, - 0.1419981718063354, - 0.1419981718063354, - -0.1419981122016907 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.0002554284874349833, - "massData-center" : - { - "x" : 5.960464477539062e-08, - "y" : 2.980232238769531e-08 - }, - "massData-mass" : 0.03265206888318062, - "name" : "lowerArmLeft", - "position" : - { - "x" : -0.1699528992176056, - "y" : 0.8479318022727966 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.05748683214187622, - 0.05748683214187622, - -0.05748690664768219, - -0.05748690664768219 - ], - "y" : - [ - -0.2322469353675842, - 0.2322462797164917, - 0.2322462797164917, - -0.2322469353675842 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.001019015791825950, - "massData-center" : - { - "x" : -3.725290298461914e-08, - "y" : -3.278255462646484e-07 - }, - "massData-mass" : 0.05340452119708061, - "name" : "upperArmRight", - "position" : - { - "x" : 0.1177217364311218, - "y" : 1.113796472549438 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.08623021841049194, - 0.08623021841049194, - -0.08623008430004120, - -0.08623008430004120 - ], - "y" : - [ - -0.2315792292356491, - 0.2315795421600342, - 0.2315795421600342, - -0.2315792292356491 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.001625877106562257, - "massData-center" : - { - "x" : 6.705522537231445e-08, - "y" : 1.564621925354004e-07 - }, - "massData-mass" : 0.07987650483846664, - "name" : "upperLegRight", - "position" : - { - "x" : 0.03142313286662102, - "y" : 0.4171121716499329 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.08623032271862030, - 0.08623032271862030, - -0.08623017370700836, - -0.08623017370700836 - ], - "y" : - [ - -0.2315792292356491, - 0.2315795421600342, - 0.2315795421600342, - -0.2315792292356491 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.001625879434868693, - "massData-center" : - { - "x" : 7.450580596923828e-08, - "y" : 1.564621925354004e-07 - }, - "massData-mass" : 0.07987659424543381, - "name" : "upperLegLeft", - "position" : - { - "x" : -0.08319067955017090, - "y" : 0.4171121716499329 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.08623021841049194, - 0.08623021841049194, - -0.08623008430004120, - -0.08623008430004120 - ], - "y" : - [ - -0.1138515025377274, - 0.1563164740800858, - 0.1563164740800858, - -0.1138515025377274 - ] - } - } - }, - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.1415264606475830, - 0.1415264606475830, - -0.08457189798355103, - -0.08457189798355103 - ], - "y" : - [ - -0.1143886670470238, - -0.05680520832538605, - -0.05680520832538605, - -0.1143886670470238 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.0005849063745699823, - "massData-center" : - { - "x" : 0.006219535600394011, - "y" : -0.002099231118336320 - }, - "massData-mass" : 0.05961277708411217, - "name" : "lowerLegRight", - "position" : - { - "x" : 0.03142313286662102, - "y" : 0.1298431605100632 - }, - "type" : 2 - } - ], - "collisionbitplanes" : - { - "names" : - [ - "bitplane1", - "bitplane2", - "bitplane3", - "bitplane4", - "bitplane5", - "bitplane6", - "bitplane7", - "bitplane8", - "bitplane9", - "bitplane10", - "bitplane11", - "bitplane12", - "bitplane13", - "bitplane14", - "bitplane15", - "bitplane16", - "bitplane17", - "bitplane18", - "bitplane19", - "bitplane20", - "bitplane21", - "bitplane22", - "bitplane23", - "bitplane24", - "bitplane25", - "bitplane26", - "bitplane27", - "bitplane28", - "bitplane29", - "bitplane30", - "bitplane31", - "bitplane32" - ] - }, - "continuousPhysics" : true, - "gravity" : - { - "x" : 0, - "y" : -10 - }, - "image" : - [ - - { - "aspectScale" : 1, - "body" : 9, - "center" : - { - "x" : 0.02911517955362797, - "y" : -0.0009155124425888062 - }, - "corners" : - { - "x" : - [ - -0.08536797016859055, - 0.1435983330011368, - 0.1435983330011368, - -0.08536797016859055 - ], - "y" : - [ - -0.1153986603021622, - -0.1153986603021622, - 0.1135676354169846, - 0.1135676354169846 - ] - }, - "file" : "../../img/Characters/Chuck/lowerLeftLeg.png", - "filter" : 0, - "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], - "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], - "glVertexPointer" : - [ - -0.08536797016859055, - -0.1153986603021622, - 0.1435983330011368, - -0.1153986603021622, - 0.1435983330011368, - 0.1135676354169846, - -0.08536797016859055, - 0.1135676354169846 - ], - "name" : "image5", - "opacity" : 1, - "scale" : 0.2289662957191467 - }, - - { - "aspectScale" : 1, - "body" : 7, - "center" : - { - "x" : -0.02732392773032188, - "y" : 0.02671334147453308 - }, - "corners" : - { - "x" : - [ - -0.1425068378448486, - 0.08785898983478546, - 0.08785898983478546, - -0.1425068378448486 - ], - "y" : - [ - -0.2324482202529907, - -0.2324482202529907, - 0.2858749032020569, - 0.2858749032020569 - ] - }, - "file" : "../../img/Characters/Chuck/upperRightLeg.png", - "filter" : 0, - "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], - "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], - "glVertexPointer" : - [ - -0.1425068378448486, - -0.2324482202529907, - 0.08785898983478546, - -0.2324482202529907, - 0.08785898983478546, - 0.2858749032020569, - -0.1425068378448486, - 0.2858749032020569 - ], - "name" : "image6", - "opacity" : 1, - "scale" : 0.5183231234550476 - }, - - { - "aspectScale" : 1, - "body" : 6, - "center" : - { - "x" : 0.0003027096390724182, - "y" : 0.0006600618362426758 - }, - "corners" : - { - "x" : - [ - -0.05836960300803185, - 0.05897502228617668, - 0.05897502228617668, - -0.05836960300803185 - ], - "y" : - [ - -0.2340291887521744, - -0.2340291887521744, - 0.2353493124246597, - 0.2353493124246597 - ] - }, - "file" : "../../img/Characters/Chuck/upperLeftArm.png", - "filter" : 0, - "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], - "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], - "glVertexPointer" : - [ - -0.05836960300803185, - -0.2340291887521744, - 0.05897502228617668, - -0.2340291887521744, - 0.05897502228617668, - 0.2353493124246597, - -0.05836960300803185, - 0.2353493124246597 - ], - "name" : "image4", - "opacity" : 1, - "renderOrder" : 1, - "scale" : 0.4693785011768341 - }, - - { - "aspectScale" : 1, - "body" : 3, - "center" : - { - "x" : 0.0007003694772720337, - "y" : 0.001779437065124512 - }, - "corners" : - { - "x" : - [ - -0.05596264451742172, - 0.05736338347196579, - 0.05736338347196579, - -0.05596264451742172 - ], - "y" : - [ - -0.1398780941963196, - -0.1398780941963196, - 0.1434369683265686, - 0.1434369683265686 - ] - }, - "file" : "../../img/Characters/Chuck/lowerLeftArm.png", - "filter" : 0, - "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], - "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], - "glVertexPointer" : - [ - -0.05596264451742172, - -0.1398780941963196, - 0.05736338347196579, - -0.1398780941963196, - 0.05736338347196579, - 0.1434369683265686, - -0.05596264451742172, - 0.1434369683265686 - ], - "name" : "image3", - "opacity" : 1, - "renderOrder" : 1, - "scale" : 0.2833150625228882 - }, - - { - "aspectScale" : 1, - "body" : 1, - "center" : - { - "x" : -0.0008481591939926147, - "y" : -0.001265347003936768 - }, - "corners" : - { - "x" : - [ - -0.1698881536722183, - 0.1681918352842331, - 0.1681918352842331, - -0.1698881536722183 - ], - "y" : - [ - -0.480212002992630, - -0.480212002992630, - 0.4776813089847565, - 0.4776813089847565 - ] - }, - "file" : "../../img/Characters/Chuck/chest.png", - "filter" : 0, - "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], - "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], - "glVertexPointer" : - [ - -0.1698881536722183, - -0.480212002992630, - 0.1681918352842331, - -0.480212002992630, - 0.1681918352842331, - 0.4776813089847565, - -0.1698881536722183, - 0.4776813089847565 - ], - "name" : "image2", - "opacity" : 1, - "renderOrder" : 5, - "scale" : 0.9578933119773865 - }, - - { - "aspectScale" : 1, - "body" : 8, - "center" : - { - "x" : 0.003173574805259705, - "y" : -0.001172244548797607 - }, - "corners" : - { - "x" : - [ - -0.1414211541414261, - 0.1477683037519455, - 0.1477683037519455, - -0.1414211541414261 - ], - "y" : - [ - -0.2325238138437271, - -0.2325238138437271, - 0.2301793247461319, - 0.2301793247461319 - ] - }, - "file" : "../../img/Characters/Chuck/upperLeftLeg.png", - "filter" : 0, - "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], - "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], - "glVertexPointer" : - [ - -0.1414211541414261, - -0.2325238138437271, - 0.1477683037519455, - -0.2325238138437271, - 0.1477683037519455, - 0.2301793247461319, - -0.1414211541414261, - 0.2301793247461319 - ], - "name" : "image6", - "opacity" : 1, - "renderOrder" : 6, - "scale" : 0.4627031385898590 - }, - - { - "aspectScale" : 1, - "body" : 4, - "center" : - { - "x" : 0.02851789817214012, - "y" : -0.0009155124425888062 - }, - "corners" : - { - "x" : - [ - -0.08596524596214294, - 0.1430010497570038, - 0.1430010497570038, - -0.08596524596214294 - ], - "y" : - [ - -0.1153986603021622, - -0.1153986603021622, - 0.1135676354169846, - 0.1135676354169846 - ] - }, - "file" : "../../img/Characters/Chuck/lowerLeftLeg.png", - "filter" : 0, - "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], - "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], - "glVertexPointer" : - [ - -0.08596524596214294, - -0.1153986603021622, - 0.1430010497570038, - -0.1153986603021622, - 0.1430010497570038, - 0.1135676354169846, - -0.08596524596214294, - 0.1135676354169846 - ], - "name" : "image5", - "opacity" : 1, - "renderOrder" : 6, - "scale" : 0.2289662957191467 - }, - - { - "aspectScale" : 1, - "body" : 2, - "center" : - { - "x" : 0.01975236460566521, - "y" : -0.07194232940673828 - }, - "corners" : - { - "x" : - [ - -0.2679373621940613, - 0.3074420690536499, - 0.3074420690536499, - -0.2679373621940613 - ], - "y" : - [ - -0.4171699881553650, - -0.4171699881553650, - 0.2732853293418884, - 0.2732853293418884 - ] - }, - "file" : "../../img/Characters/Chuck/head.png", - "filter" : 0, - "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], - "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], - "glVertexPointer" : - [ - -0.2679373621940613, - -0.4171699881553650, - 0.3074420690536499, - -0.4171699881553650, - 0.3074420690536499, - 0.2732853293418884, - -0.2679373621940613, - 0.2732853293418884 - ], - "name" : "image1", - "opacity" : 1, - "renderOrder" : 6, - "scale" : 0.6904553174972534 - }, - - { - "aspectScale" : 1, - "body" : 0, - "center" : - { - "x" : 0.002138927578926086, - "y" : 0.0006600618362426758 - }, - "corners" : - { - "x" : - [ - -0.05653338506817818, - 0.06081124022603035, - 0.06081124022603035, - -0.05653338506817818 - ], - "y" : - [ - -0.2340291887521744, - -0.2340291887521744, - 0.2353493124246597, - 0.2353493124246597 - ] - }, - "file" : "../../img/Characters/Chuck/upperLeftArm.png", - "filter" : 0, - "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], - "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], - "glVertexPointer" : - [ - -0.05653338506817818, - -0.2340291887521744, - 0.06081124022603035, - -0.2340291887521744, - 0.06081124022603035, - 0.2353493124246597, - -0.05653338506817818, - 0.2353493124246597 - ], - "name" : "image4", - "opacity" : 1, - "renderOrder" : 8, - "scale" : 0.4693785011768341 - }, - - { - "aspectScale" : 1, - "body" : 5, - "center" : - { - "x" : 0.002538725733757019, - "y" : 0.001779437065124512 - }, - "corners" : - { - "x" : - [ - -0.05412428826093674, - 0.05920173972845078, - 0.05920173972845078, - -0.05412428826093674 - ], - "y" : - [ - -0.1398780941963196, - -0.1398780941963196, - 0.1434369683265686, - 0.1434369683265686 - ] - }, - "file" : "../../img/Characters/Chuck/lowerLeftArm.png", - "filter" : 0, - "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], - "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], - "glVertexPointer" : - [ - -0.05412428826093674, - -0.1398780941963196, - 0.05920173972845078, - -0.1398780941963196, - 0.05920173972845078, - 0.1434369683265686, - -0.05412428826093674, - 0.1434369683265686 - ], - "name" : "image3", - "opacity" : 1, - "renderOrder" : 8, - "scale" : 0.2833150625228882 - } - ], - "joint" : - [ - - { - "anchorA" : - { - "x" : 0.001047849655151367, - "y" : -0.1790249347686768 - }, - "anchorB" : - { - "x" : 0.001048207283020020, - "y" : 0.08683943748474121 - }, - "bodyA" : 0, - "bodyB" : 5, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : 0, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint4", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 1.919862151145935 - }, - - { - "anchorA" : - { - "x" : -0.1165831685066223, - "y" : 0.3330366015434265 - }, - "anchorB" : - { - "x" : -2.135336399078369e-05, - "y" : 0.1812803745269775 - }, - "bodyA" : 1, - "bodyB" : 0, - "enableLimit" : false, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -2.268928050994873, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint3", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 3.141592741012573 - }, - - { - "anchorA" : - { - "x" : 0.07454992830753326, - "y" : 0.5068108439445496 - }, - "anchorB" : - { - "x" : -0.02141102217137814, - "y" : -0.3435407876968384 - }, - "bodyA" : 1, - "bodyB" : 2, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -1.221730470657349, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint0", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 0.6981316804885864 - }, - - { - "anchorA" : - { - "x" : 0.1367489844560623, - "y" : -0.3606387376785278 - }, - "anchorB" : - { - "x" : 0.05056380107998848, - "y" : 0.1842886805534363 - }, - "bodyA" : 1, - "bodyB" : 7, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -0.6981316804885864, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint5", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 1.919862151145935 - }, - - { - "anchorA" : - { - "x" : -0.08329562842845917, - "y" : -0.3541148304939270 - }, - "anchorB" : - { - "x" : -0.05503869056701660, - "y" : 0.1909851431846619 - }, - "bodyA" : 1, - "bodyB" : 8, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -0.6981316804885864, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint6", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 1.919862151145935 - }, - - { - "anchorA" : - { - "x" : 0.1710196435451508, - "y" : 0.3308989405632019 - }, - "anchorB" : - { - "x" : -9.131431579589844e-05, - "y" : 0.1791421175003052 - }, - "bodyA" : 1, - "bodyB" : 6, - "enableLimit" : false, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -2.268928050994873, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint2", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 3.141592741012573 - }, - - { - "anchorA" : - { - "x" : 0.0004334598779678345, - "y" : 0.08706557750701904 - }, - "anchorB" : - { - "x" : 0.0004332214593887329, - "y" : -0.1787990331649780 - }, - "bodyA" : 3, - "bodyB" : 6, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : 0, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint1", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 1.919862151145935 - }, - - { - "anchorA" : - { - "x" : 0.002425249665975571, - "y" : -0.1845821887254715 - }, - "anchorB" : - { - "x" : 0.002425376325845718, - "y" : 0.1026860624551773 - }, - "bodyA" : 7, - "bodyB" : 9, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -2.268928050994873, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint8", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 0 - }, - - { - "anchorA" : - { - "x" : -0.0009558200836181641, - "y" : -0.1818936169147491 - }, - "anchorB" : - { - "x" : -0.0009555891156196594, - "y" : 0.1055182516574860 - }, - "bodyA" : 8, - "bodyB" : 4, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -2.268928050994873, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint7", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 0 - } - ], - "positionIterations" : 3, - "stepsPerSecond" : 60.0, - "subStepping" : false, - "velocityIterations" : 8, - "warmStarting" : true -}; - - - - - - - return Rube; - -}); \ No newline at end of file diff --git a/app/Game/Core/GameObjects/Items/RubeDoll.js b/app/Game/Core/GameObjects/Items/RubeDoll.js new file mode 100644 index 0000000..ad3323e --- /dev/null +++ b/app/Game/Core/GameObjects/Items/RubeDoll.js @@ -0,0 +1,66 @@ +define([ + "Game/" + GLOBALS.context + "/GameObjects/Item", + "Lib/Vendor/RubeLoader", + "Lib/Vendor/Box2D", + "Game/Config/Settings", + "Lib/Utilities/Assert", + "json!Game/Asset/RubeDoll.json" // using requirejs json loader plugin +], + +function (Parent, RubeLoader, Box2D, Settings, Assert, RubeDollJson) { + + "use strict"; + + function RubeDoll(physicsEngine, uid, options) { + Assert.number(options.x, options.y); + + this.rubeLoader = null; + this.body = null; + this.limbs = {}; + + var chest = null; + var world = physicsEngine.getWorld(); + this.rubeLoader = new RubeLoader(RubeDollJson, world); + var scene = this.rubeLoader.getScene(); + + for (var i in scene.bodies) { + var body = scene.bodies[i]; + var position = body.GetPosition().Copy(); + position.Add(new Box2D.Common.Math.b2Vec2( + options.x / Settings.RATIO, + options.y / Settings.RATIO + )); + body.SetPosition(position); + this.limbs[body.name] = body; + } + + Parent.call(this, physicsEngine, uid, options); + world.DestroyBody(this.body); + this.body = this.limbs.chest; + + var def = this.body.GetDefinition(); + def.userData = this; + this.body.SetUserData(this); + } + + RubeDoll.prototype = Object.create(Parent.prototype); + + RubeDoll.prototype.flip = function(direction) { + Parent.prototype.flip.call(this, direction); + // Extend + }; + + RubeDoll.prototype.reposition = function(handPosition, direction) { + + Parent.prototype.reposition.call(this, handPosition, direction); + + var position = new Box2D.Common.Math.b2Vec2( + handPosition.x + ((6 / Settings.RATIO) * direction), + handPosition.y + ); + + this.body.SetPosition(position); + }; + + return RubeDoll; +}); \ No newline at end of file diff --git a/app/Game/Core/Loader/Level.js b/app/Game/Core/Loader/Level.js index 53b43d8..bd49a20 100755 --- a/app/Game/Core/Loader/Level.js +++ b/app/Game/Core/Loader/Level.js @@ -8,9 +8,9 @@ define([ "Game/" + GLOBALS.context + "/GameObjects/Item", "Game/" + GLOBALS.context + "/GameObjects/Items/Skateboard", "Game/" + GLOBALS.context + "/GameObjects/Items/RagDoll", - "Game/" + GLOBALS.context + "/GameObjects/Items/Rube" + "Game/" + GLOBALS.context + "/GameObjects/Items/RubeDoll" -], function (Settings, Box2D, Nc, Abstract, CollisionDetector, Tile, Item, Skateboard, RagDoll, Rube) { +], function (Settings, Box2D, Nc, Abstract, CollisionDetector, Tile, Item, Skateboard, RagDoll, RubeDoll) { "use strict"; @@ -50,8 +50,8 @@ define([ return new Skateboard(this.engine, uid, options); case "ragdoll": return new RagDoll(this.engine, uid, options); - case "rube": - return new Rube(this.engine, uid, options); + case "rubedoll": + return new RubeDoll(this.engine, uid, options); default: return new Item(this.engine, uid, options); } diff --git a/app/Lib/Vendor/RequireJs/Plugin/Json.js b/app/Lib/Vendor/RequireJs/Plugin/Json.js new file mode 100644 index 0000000..f62f568 --- /dev/null +++ b/app/Lib/Vendor/RequireJs/Plugin/Json.js @@ -0,0 +1,72 @@ +/** @license + * RequireJS plugin for loading JSON files + * - depends on Text plugin and it was HEAVILY "inspired" by it as well. + * Author: Miller Medeiros + * Version: 0.4.0 (2014/04/10) + * Released under the MIT license + */ +define(['text'], function(text){ + + var CACHE_BUST_QUERY_PARAM = 'bust', + CACHE_BUST_FLAG = '!bust', + jsonParse = (typeof JSON !== 'undefined' && typeof JSON.parse === 'function')? JSON.parse : function(val){ + return eval('('+ val +')'); //quick and dirty + }, + buildMap = {}; + + function cacheBust(url){ + url = url.replace(CACHE_BUST_FLAG, ''); + url += (url.indexOf('?') < 0)? '?' : '&'; + return url + CACHE_BUST_QUERY_PARAM +'='+ Math.round(2147483647 * Math.random()); + } + + //API + return { + + load : function(name, req, onLoad, config) { + if (( config.isBuild && (config.inlineJSON === false || name.indexOf(CACHE_BUST_QUERY_PARAM +'=') !== -1)) || (req.toUrl(name).indexOf('empty:') === 0)) { + //avoid inlining cache busted JSON or if inlineJSON:false + //and don't inline files marked as empty! + onLoad(null); + } else { + text.get(req.toUrl(name), function(data){ + var parsed; + if (config.isBuild) { + buildMap[name] = data; + onLoad(data); + } else { + try { + parsed = jsonParse(data); + } catch (e) { + onLoad.error(e); + } + onLoad(parsed); + } + }, + onLoad.error, { + accept: 'application/json' + } + ); + } + }, + + normalize : function (name, normalize) { + // used normalize to avoid caching references to a "cache busted" request + if (name.indexOf(CACHE_BUST_FLAG) !== -1) { + name = cacheBust(name); + } + // resolve any relative paths + return normalize(name); + }, + + //write method based on RequireJS official text plugin by James Burke + //https://github.com/jrburke/requirejs/blob/master/text.js + write : function(pluginName, moduleName, write){ + if(moduleName in buildMap){ + var content = buildMap[moduleName]; + write('define("'+ pluginName +'!'+ moduleName +'", function(){ return '+ content +';});\n'); + } + } + + }; +}); \ No newline at end of file diff --git a/app/Lib/Vendor/RequireJs/Plugin/Text.js b/app/Lib/Vendor/RequireJs/Plugin/Text.js new file mode 100644 index 0000000..148c553 --- /dev/null +++ b/app/Lib/Vendor/RequireJs/Plugin/Text.js @@ -0,0 +1,391 @@ +/** + * @license RequireJS text 2.0.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved. + * Available via the MIT or new BSD license. + * see: http://github.com/requirejs/text for details + */ +/*jslint regexp: true */ +/*global require, XMLHttpRequest, ActiveXObject, + define, window, process, Packages, + java, location, Components, FileUtils */ + +define(['module'], function (module) { + 'use strict'; + + var text, fs, Cc, Ci, xpcIsWindows, + progIds = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'], + xmlRegExp = /^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im, + bodyRegExp = /]*>\s*([\s\S]+)\s*<\/body>/im, + hasLocation = typeof location !== 'undefined' && location.href, + defaultProtocol = hasLocation && location.protocol && location.protocol.replace(/\:/, ''), + defaultHostName = hasLocation && location.hostname, + defaultPort = hasLocation && (location.port || undefined), + buildMap = {}, + masterConfig = (module.config && module.config()) || {}; + + text = { + version: '2.0.14', + + strip: function (content) { + //Strips declarations so that external SVG and XML + //documents can be added to a document without worry. Also, if the string + //is an HTML document, only the part inside the body tag is returned. + if (content) { + content = content.replace(xmlRegExp, ""); + var matches = content.match(bodyRegExp); + if (matches) { + content = matches[1]; + } + } else { + content = ""; + } + return content; + }, + + jsEscape: function (content) { + return content.replace(/(['\\])/g, '\\$1') + .replace(/[\f]/g, "\\f") + .replace(/[\b]/g, "\\b") + .replace(/[\n]/g, "\\n") + .replace(/[\t]/g, "\\t") + .replace(/[\r]/g, "\\r") + .replace(/[\u2028]/g, "\\u2028") + .replace(/[\u2029]/g, "\\u2029"); + }, + + createXhr: masterConfig.createXhr || function () { + //Would love to dump the ActiveX crap in here. Need IE 6 to die first. + var xhr, i, progId; + if (typeof XMLHttpRequest !== "undefined") { + return new XMLHttpRequest(); + } else if (typeof ActiveXObject !== "undefined") { + for (i = 0; i < 3; i += 1) { + progId = progIds[i]; + try { + xhr = new ActiveXObject(progId); + } catch (e) {} + + if (xhr) { + progIds = [progId]; // so faster next time + break; + } + } + } + + return xhr; + }, + + /** + * Parses a resource name into its component parts. Resource names + * look like: module/name.ext!strip, where the !strip part is + * optional. + * @param {String} name the resource name + * @returns {Object} with properties "moduleName", "ext" and "strip" + * where strip is a boolean. + */ + parseName: function (name) { + var modName, ext, temp, + strip = false, + index = name.lastIndexOf("."), + isRelative = name.indexOf('./') === 0 || + name.indexOf('../') === 0; + + if (index !== -1 && (!isRelative || index > 1)) { + modName = name.substring(0, index); + ext = name.substring(index + 1); + } else { + modName = name; + } + + temp = ext || modName; + index = temp.indexOf("!"); + if (index !== -1) { + //Pull off the strip arg. + strip = temp.substring(index + 1) === "strip"; + temp = temp.substring(0, index); + if (ext) { + ext = temp; + } else { + modName = temp; + } + } + + return { + moduleName: modName, + ext: ext, + strip: strip + }; + }, + + xdRegExp: /^((\w+)\:)?\/\/([^\/\\]+)/, + + /** + * Is an URL on another domain. Only works for browser use, returns + * false in non-browser environments. Only used to know if an + * optimized .js version of a text resource should be loaded + * instead. + * @param {String} url + * @returns Boolean + */ + useXhr: function (url, protocol, hostname, port) { + var uProtocol, uHostName, uPort, + match = text.xdRegExp.exec(url); + if (!match) { + return true; + } + uProtocol = match[2]; + uHostName = match[3]; + + uHostName = uHostName.split(':'); + uPort = uHostName[1]; + uHostName = uHostName[0]; + + return (!uProtocol || uProtocol === protocol) && + (!uHostName || uHostName.toLowerCase() === hostname.toLowerCase()) && + ((!uPort && !uHostName) || uPort === port); + }, + + finishLoad: function (name, strip, content, onLoad) { + content = strip ? text.strip(content) : content; + if (masterConfig.isBuild) { + buildMap[name] = content; + } + onLoad(content); + }, + + load: function (name, req, onLoad, config) { + //Name has format: some.module.filext!strip + //The strip part is optional. + //if strip is present, then that means only get the string contents + //inside a body tag in an HTML string. For XML/SVG content it means + //removing the declarations so the content can be inserted + //into the current doc without problems. + + // Do not bother with the work if a build and text will + // not be inlined. + if (config && config.isBuild && !config.inlineText) { + onLoad(); + return; + } + + masterConfig.isBuild = config && config.isBuild; + + var parsed = text.parseName(name), + nonStripName = parsed.moduleName + + (parsed.ext ? '.' + parsed.ext : ''), + url = req.toUrl(nonStripName), + useXhr = (masterConfig.useXhr) || + text.useXhr; + + // Do not load if it is an empty: url + if (url.indexOf('empty:') === 0) { + onLoad(); + return; + } + + //Load the text. Use XHR if possible and in a browser. + if (!hasLocation || useXhr(url, defaultProtocol, defaultHostName, defaultPort)) { + text.get(url, function (content) { + text.finishLoad(name, parsed.strip, content, onLoad); + }, function (err) { + if (onLoad.error) { + onLoad.error(err); + } + }); + } else { + //Need to fetch the resource across domains. Assume + //the resource has been optimized into a JS module. Fetch + //by the module name + extension, but do not include the + //!strip part to avoid file system issues. + req([nonStripName], function (content) { + text.finishLoad(parsed.moduleName + '.' + parsed.ext, + parsed.strip, content, onLoad); + }); + } + }, + + write: function (pluginName, moduleName, write, config) { + if (buildMap.hasOwnProperty(moduleName)) { + var content = text.jsEscape(buildMap[moduleName]); + write.asModule(pluginName + "!" + moduleName, + "define(function () { return '" + + content + + "';});\n"); + } + }, + + writeFile: function (pluginName, moduleName, req, write, config) { + var parsed = text.parseName(moduleName), + extPart = parsed.ext ? '.' + parsed.ext : '', + nonStripName = parsed.moduleName + extPart, + //Use a '.js' file name so that it indicates it is a + //script that can be loaded across domains. + fileName = req.toUrl(parsed.moduleName + extPart) + '.js'; + + //Leverage own load() method to load plugin value, but only + //write out values that do not have the strip argument, + //to avoid any potential issues with ! in file names. + text.load(nonStripName, req, function (value) { + //Use own write() method to construct full module value. + //But need to create shell that translates writeFile's + //write() to the right interface. + var textWrite = function (contents) { + return write(fileName, contents); + }; + textWrite.asModule = function (moduleName, contents) { + return write.asModule(moduleName, fileName, contents); + }; + + text.write(pluginName, nonStripName, textWrite, config); + }, config); + } + }; + + if (masterConfig.env === 'node' || (!masterConfig.env && + typeof process !== "undefined" && + process.versions && + !!process.versions.node && + !process.versions['node-webkit'] && + !process.versions['atom-shell'])) { + //Using special require.nodeRequire, something added by r.js. + fs = require.nodeRequire('fs'); + + text.get = function (url, callback, errback) { + try { + var file = fs.readFileSync(url, 'utf8'); + //Remove BOM (Byte Mark Order) from utf8 files if it is there. + if (file[0] === '\uFEFF') { + file = file.substring(1); + } + callback(file); + } catch (e) { + if (errback) { + errback(e); + } + } + }; + } else if (masterConfig.env === 'xhr' || (!masterConfig.env && + text.createXhr())) { + text.get = function (url, callback, errback, headers) { + var xhr = text.createXhr(), header; + xhr.open('GET', url, true); + + //Allow plugins direct access to xhr headers + if (headers) { + for (header in headers) { + if (headers.hasOwnProperty(header)) { + xhr.setRequestHeader(header.toLowerCase(), headers[header]); + } + } + } + + //Allow overrides specified in config + if (masterConfig.onXhr) { + masterConfig.onXhr(xhr, url); + } + + xhr.onreadystatechange = function (evt) { + var status, err; + //Do not explicitly handle errors, those should be + //visible via console output in the browser. + if (xhr.readyState === 4) { + status = xhr.status || 0; + if (status > 399 && status < 600) { + //An http 4xx or 5xx error. Signal an error. + err = new Error(url + ' HTTP status: ' + status); + err.xhr = xhr; + if (errback) { + errback(err); + } + } else { + callback(xhr.responseText); + } + + if (masterConfig.onXhrComplete) { + masterConfig.onXhrComplete(xhr, url); + } + } + }; + xhr.send(null); + }; + } else if (masterConfig.env === 'rhino' || (!masterConfig.env && + typeof Packages !== 'undefined' && typeof java !== 'undefined')) { + //Why Java, why is this so awkward? + text.get = function (url, callback) { + var stringBuffer, line, + encoding = "utf-8", + file = new java.io.File(url), + lineSeparator = java.lang.System.getProperty("line.separator"), + input = new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(file), encoding)), + content = ''; + try { + stringBuffer = new java.lang.StringBuffer(); + line = input.readLine(); + + // Byte Order Mark (BOM) - The Unicode Standard, version 3.0, page 324 + // http://www.unicode.org/faq/utf_bom.html + + // Note that when we use utf-8, the BOM should appear as "EF BB BF", but it doesn't due to this bug in the JDK: + // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4508058 + if (line && line.length() && line.charAt(0) === 0xfeff) { + // Eat the BOM, since we've already found the encoding on this file, + // and we plan to concatenating this buffer with others; the BOM should + // only appear at the top of a file. + line = line.substring(1); + } + + if (line !== null) { + stringBuffer.append(line); + } + + while ((line = input.readLine()) !== null) { + stringBuffer.append(lineSeparator); + stringBuffer.append(line); + } + //Make sure we return a JavaScript string and not a Java string. + content = String(stringBuffer.toString()); //String + } finally { + input.close(); + } + callback(content); + }; + } else if (masterConfig.env === 'xpconnect' || (!masterConfig.env && + typeof Components !== 'undefined' && Components.classes && + Components.interfaces)) { + //Avert your gaze! + Cc = Components.classes; + Ci = Components.interfaces; + Components.utils['import']('resource://gre/modules/FileUtils.jsm'); + xpcIsWindows = ('@mozilla.org/windows-registry-key;1' in Cc); + + text.get = function (url, callback) { + var inStream, convertStream, fileObj, + readData = {}; + + if (xpcIsWindows) { + url = url.replace(/\//g, '\\'); + } + + fileObj = new FileUtils.File(url); + + //XPCOM, you so crazy + try { + inStream = Cc['@mozilla.org/network/file-input-stream;1'] + .createInstance(Ci.nsIFileInputStream); + inStream.init(fileObj, 1, 0, false); + + convertStream = Cc['@mozilla.org/intl/converter-input-stream;1'] + .createInstance(Ci.nsIConverterInputStream); + convertStream.init(inStream, "utf-8", inStream.available(), + Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER); + + convertStream.readString(inStream.available(), readData); + convertStream.close(); + inStream.close(); + callback(readData.value); + } catch (e) { + throw new Error((fileObj && fileObj.path || '') + ': ' + e); + } + }; + } + return text; +}); \ No newline at end of file diff --git a/channel.js b/channel.js index 27305e9..a94689f 100755 --- a/channel.js +++ b/channel.js @@ -4,7 +4,11 @@ var requirejs = require('requirejs'); requirejs.config({ nodeRequire: require, baseUrl: 'app', - deps: ['Lib/Utilities/Channel/Extensions'] + deps: ['Lib/Utilities/Channel/Extensions'], + paths: { + text: 'Lib/Vendor/RequireJs/Plugin/Text', + json: 'Lib/Vendor/RequireJs/Plugin/Json', + }, }); var inspector = {}; diff --git a/client.js b/client.js index c94262d..b082d49 100755 --- a/client.js +++ b/client.js @@ -7,6 +7,8 @@ requirejs.config({ deps: ['Lib/Utilities/Client/Extensions'], waitSeconds: 0, paths: { + text: 'Lib/Vendor/RequireJs/Plugin/Text', + json: 'Lib/Vendor/RequireJs/Plugin/Json', screenfull: "/screenfull", chart: "/chart", socketio: "/socket.io/socket.io" diff --git a/config/build-profile.js b/config/build-profile.js index ed028e7..e650ccc 100644 --- a/config/build-profile.js +++ b/config/build-profile.js @@ -1,6 +1,8 @@ ({ baseUrl: "../app", paths: { + "text": 'Lib/Vendor/RequireJs/Plugin/Text', + "json": 'Lib/Vendor/RequireJs/Plugin/Json', "screenfull": "../node_modules/screenfull/dist/screenfull", "socketio": "../node_modules/socket.io/node_modules/socket.io-client/dist/socket.io", "chart": "../node_modules/chart.js/Chart" diff --git a/static/items/rube/ragdoll-full.json b/static/items/rube/ragdoll-full.json new file mode 100644 index 0000000..fc81cad --- /dev/null +++ b/static/items/rube/ragdoll-full.json @@ -0,0 +1,1346 @@ + +{ + "allowSleep" : true, + "autoClearForces" : true, + "body" : + [ + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.05748672783374786, + 0.05748672783374786, + -0.05748683214187622, + -0.05748683214187622 + ], + "y" : + [ + -0.2322469353675842, + 0.2322462797164917, + 0.2322462797164917, + -0.2322469353675842 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.001019014045596123, + "massData-center" : + { + "x" : -5.215406062575312e-08, + "y" : -3.278255462646484e-07 + }, + "massData-mass" : 0.05340443924069405, + "name" : "upperArmLeft", + "position" : + { + "x" : -0.1699507087469101, + "y" : 1.113796472549438 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture0", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.1718577891588211, + 0.1684816330671310, + 0.001688212156295776, + -0.1718577295541763, + -0.1718577295541763, + 0.001460619270801544 + ], + "y" : + [ + -0.3928470611572266, + 0.4921868443489075, + 0.4921868443489075, + 0.3841522336006165, + -0.4204435348510742, + -0.4519201517105103 + ] + } + } + }, + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture2", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.1679489463567734, + 0.1679489463567734, + -0.004204027354717255, + -0.004204027354717255 + ], + "y" : + [ + 0.4449140429496765, + 0.6170670390129089, + 0.6170670390129089, + 0.4449140429496765 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.03228222951292992, + "massData-center" : + { + "x" : 0.008858840912580490, + "y" : 0.06282533705234528 + }, + "massData-mass" : 0.3355117142200470, + "name" : "chest", + "position" : + { + "x" : -0.05338868126273155, + "y" : 0.9620395302772522 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "circle" : + { + "center" : + { + "x" : -0.007499951869249344, + "y" : 0.003749847412109375 + }, + "radius" : 0.2746430933475494 + }, + "density" : 0.2204959988594055, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture1" + }, + + { + "circle" : + { + "center" : + { + "x" : -0.03327952325344086, + "y" : -0.1384725570678711 + }, + "radius" : 0.2485582530498505 + }, + "density" : 0.2204959988594055, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture1" + } + ], + "linearVelocity" : 0, + "massData-I" : 0.004164268728345633, + "massData-center" : + { + "x" : -0.01910765282809734, + "y" : -0.06028826907277107 + }, + "massData-mass" : 0.09504657238721848, + "name" : "head", + "position" : + { + "x" : 0.04257059469819069, + "y" : 1.812389135360718 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.05748683214187622, + 0.05748683214187622, + -0.05748690664768219, + -0.05748690664768219 + ], + "y" : + [ + -0.1419981122016907, + 0.1419981718063354, + 0.1419981718063354, + -0.1419981122016907 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0002554289239924401, + "massData-center" : + { + "x" : -3.725290298461914e-08, + "y" : 2.980232238769531e-08 + }, + "massData-mass" : 0.03265211358666420, + "name" : "lowerArmRight", + "position" : + { + "x" : 0.1177217364311218, + "y" : 0.8479318022727966 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.1415265351533890, + 0.1415265351533890, + -0.08457186818122864, + -0.08457186818122864 + ], + "y" : + [ + -0.1143886670470238, + -0.05680520832538605, + -0.05680520832538605, + -0.1143886670470238 + ] + } + } + }, + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.08623030036687851, + 0.08623030036687851, + -0.08623020350933075, + -0.08623020350933075 + ], + "y" : + [ + -0.1138511821627617, + 0.1565139442682266, + 0.1565139442682266, + -0.1138511821627617 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0005858240183442831, + "massData-center" : + { + "x" : 0.006215983536094427, + "y" : -0.002008607611060143 + }, + "massData-mass" : 0.05964682996273041, + "name" : "lowerLegLeft", + "position" : + { + "x" : -0.08319067955017090, + "y" : 0.1298431605100632 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.05748684704303741, + 0.05748684704303741, + -0.05748672783374786, + -0.05748672783374786 + ], + "y" : + [ + -0.1419981122016907, + 0.1419981718063354, + 0.1419981718063354, + -0.1419981122016907 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0002554284874349833, + "massData-center" : + { + "x" : 5.960464477539062e-08, + "y" : 2.980232238769531e-08 + }, + "massData-mass" : 0.03265206888318062, + "name" : "lowerArmLeft", + "position" : + { + "x" : -0.1699528992176056, + "y" : 0.8479318022727966 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.05748683214187622, + 0.05748683214187622, + -0.05748690664768219, + -0.05748690664768219 + ], + "y" : + [ + -0.2322469353675842, + 0.2322462797164917, + 0.2322462797164917, + -0.2322469353675842 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.001019015791825950, + "massData-center" : + { + "x" : -3.725290298461914e-08, + "y" : -3.278255462646484e-07 + }, + "massData-mass" : 0.05340452119708061, + "name" : "upperArmRight", + "position" : + { + "x" : 0.1177217364311218, + "y" : 1.113796472549438 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.08623021841049194, + 0.08623021841049194, + -0.08623008430004120, + -0.08623008430004120 + ], + "y" : + [ + -0.2315792292356491, + 0.2315795421600342, + 0.2315795421600342, + -0.2315792292356491 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.001625877106562257, + "massData-center" : + { + "x" : 6.705522537231445e-08, + "y" : 1.564621925354004e-07 + }, + "massData-mass" : 0.07987650483846664, + "name" : "upperLegRight", + "position" : + { + "x" : 0.03142313286662102, + "y" : 0.4171121716499329 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.08623032271862030, + 0.08623032271862030, + -0.08623017370700836, + -0.08623017370700836 + ], + "y" : + [ + -0.2315792292356491, + 0.2315795421600342, + 0.2315795421600342, + -0.2315792292356491 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.001625879434868693, + "massData-center" : + { + "x" : 7.450580596923828e-08, + "y" : 1.564621925354004e-07 + }, + "massData-mass" : 0.07987659424543381, + "name" : "upperLegLeft", + "position" : + { + "x" : -0.08319067955017090, + "y" : 0.4171121716499329 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.08623021841049194, + 0.08623021841049194, + -0.08623008430004120, + -0.08623008430004120 + ], + "y" : + [ + -0.1138515025377274, + 0.1563164740800858, + 0.1563164740800858, + -0.1138515025377274 + ] + } + } + }, + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.1415264606475830, + 0.1415264606475830, + -0.08457189798355103, + -0.08457189798355103 + ], + "y" : + [ + -0.1143886670470238, + -0.05680520832538605, + -0.05680520832538605, + -0.1143886670470238 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0005849063745699823, + "massData-center" : + { + "x" : 0.006219535600394011, + "y" : -0.002099231118336320 + }, + "massData-mass" : 0.05961277708411217, + "name" : "lowerLegRight", + "position" : + { + "x" : 0.03142313286662102, + "y" : 0.1298431605100632 + }, + "type" : 2 + } + ], + "collisionbitplanes" : + { + "names" : + [ + "bitplane1", + "bitplane2", + "bitplane3", + "bitplane4", + "bitplane5", + "bitplane6", + "bitplane7", + "bitplane8", + "bitplane9", + "bitplane10", + "bitplane11", + "bitplane12", + "bitplane13", + "bitplane14", + "bitplane15", + "bitplane16", + "bitplane17", + "bitplane18", + "bitplane19", + "bitplane20", + "bitplane21", + "bitplane22", + "bitplane23", + "bitplane24", + "bitplane25", + "bitplane26", + "bitplane27", + "bitplane28", + "bitplane29", + "bitplane30", + "bitplane31", + "bitplane32" + ] + }, + "continuousPhysics" : true, + "gravity" : + { + "x" : 0, + "y" : -10 + }, + "image" : + [ + + { + "aspectScale" : 1, + "body" : 9, + "center" : + { + "x" : 0.02911517955362797, + "y" : -0.0009155124425888062 + }, + "corners" : + { + "x" : + [ + -0.08536797016859055, + 0.1435983330011368, + 0.1435983330011368, + -0.08536797016859055 + ], + "y" : + [ + -0.1153986603021622, + -0.1153986603021622, + 0.1135676354169846, + 0.1135676354169846 + ] + }, + "file" : "../../img/Characters/Chuck/lowerLeftLeg.png", + "filter" : 0, + "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], + "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], + "glVertexPointer" : + [ + -0.08536797016859055, + -0.1153986603021622, + 0.1435983330011368, + -0.1153986603021622, + 0.1435983330011368, + 0.1135676354169846, + -0.08536797016859055, + 0.1135676354169846 + ], + "name" : "image5", + "opacity" : 1, + "scale" : 0.2289662957191467 + }, + + { + "aspectScale" : 1, + "body" : 7, + "center" : + { + "x" : -0.02732392773032188, + "y" : 0.02671334147453308 + }, + "corners" : + { + "x" : + [ + -0.1425068378448486, + 0.08785898983478546, + 0.08785898983478546, + -0.1425068378448486 + ], + "y" : + [ + -0.2324482202529907, + -0.2324482202529907, + 0.2858749032020569, + 0.2858749032020569 + ] + }, + "file" : "../../img/Characters/Chuck/upperRightLeg.png", + "filter" : 0, + "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], + "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], + "glVertexPointer" : + [ + -0.1425068378448486, + -0.2324482202529907, + 0.08785898983478546, + -0.2324482202529907, + 0.08785898983478546, + 0.2858749032020569, + -0.1425068378448486, + 0.2858749032020569 + ], + "name" : "image6", + "opacity" : 1, + "scale" : 0.5183231234550476 + }, + + { + "aspectScale" : 1, + "body" : 6, + "center" : + { + "x" : 0.0003027096390724182, + "y" : 0.0006600618362426758 + }, + "corners" : + { + "x" : + [ + -0.05836960300803185, + 0.05897502228617668, + 0.05897502228617668, + -0.05836960300803185 + ], + "y" : + [ + -0.2340291887521744, + -0.2340291887521744, + 0.2353493124246597, + 0.2353493124246597 + ] + }, + "file" : "../../img/Characters/Chuck/upperLeftArm.png", + "filter" : 0, + "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], + "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], + "glVertexPointer" : + [ + -0.05836960300803185, + -0.2340291887521744, + 0.05897502228617668, + -0.2340291887521744, + 0.05897502228617668, + 0.2353493124246597, + -0.05836960300803185, + 0.2353493124246597 + ], + "name" : "image4", + "opacity" : 1, + "renderOrder" : 1, + "scale" : 0.4693785011768341 + }, + + { + "aspectScale" : 1, + "body" : 3, + "center" : + { + "x" : 0.0007003694772720337, + "y" : 0.001779437065124512 + }, + "corners" : + { + "x" : + [ + -0.05596264451742172, + 0.05736338347196579, + 0.05736338347196579, + -0.05596264451742172 + ], + "y" : + [ + -0.1398780941963196, + -0.1398780941963196, + 0.1434369683265686, + 0.1434369683265686 + ] + }, + "file" : "../../img/Characters/Chuck/lowerLeftArm.png", + "filter" : 0, + "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], + "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], + "glVertexPointer" : + [ + -0.05596264451742172, + -0.1398780941963196, + 0.05736338347196579, + -0.1398780941963196, + 0.05736338347196579, + 0.1434369683265686, + -0.05596264451742172, + 0.1434369683265686 + ], + "name" : "image3", + "opacity" : 1, + "renderOrder" : 1, + "scale" : 0.2833150625228882 + }, + + { + "aspectScale" : 1, + "body" : 1, + "center" : + { + "x" : -0.0008481591939926147, + "y" : -0.001265347003936768 + }, + "corners" : + { + "x" : + [ + -0.1698881536722183, + 0.1681918352842331, + 0.1681918352842331, + -0.1698881536722183 + ], + "y" : + [ + -0.480212002992630, + -0.480212002992630, + 0.4776813089847565, + 0.4776813089847565 + ] + }, + "file" : "../../img/Characters/Chuck/chest.png", + "filter" : 0, + "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], + "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], + "glVertexPointer" : + [ + -0.1698881536722183, + -0.480212002992630, + 0.1681918352842331, + -0.480212002992630, + 0.1681918352842331, + 0.4776813089847565, + -0.1698881536722183, + 0.4776813089847565 + ], + "name" : "image2", + "opacity" : 1, + "renderOrder" : 5, + "scale" : 0.9578933119773865 + }, + + { + "aspectScale" : 1, + "body" : 8, + "center" : + { + "x" : 0.003173574805259705, + "y" : -0.001172244548797607 + }, + "corners" : + { + "x" : + [ + -0.1414211541414261, + 0.1477683037519455, + 0.1477683037519455, + -0.1414211541414261 + ], + "y" : + [ + -0.2325238138437271, + -0.2325238138437271, + 0.2301793247461319, + 0.2301793247461319 + ] + }, + "file" : "../../img/Characters/Chuck/upperLeftLeg.png", + "filter" : 0, + "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], + "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], + "glVertexPointer" : + [ + -0.1414211541414261, + -0.2325238138437271, + 0.1477683037519455, + -0.2325238138437271, + 0.1477683037519455, + 0.2301793247461319, + -0.1414211541414261, + 0.2301793247461319 + ], + "name" : "image6", + "opacity" : 1, + "renderOrder" : 6, + "scale" : 0.4627031385898590 + }, + + { + "aspectScale" : 1, + "body" : 4, + "center" : + { + "x" : 0.02851789817214012, + "y" : -0.0009155124425888062 + }, + "corners" : + { + "x" : + [ + -0.08596524596214294, + 0.1430010497570038, + 0.1430010497570038, + -0.08596524596214294 + ], + "y" : + [ + -0.1153986603021622, + -0.1153986603021622, + 0.1135676354169846, + 0.1135676354169846 + ] + }, + "file" : "../../img/Characters/Chuck/lowerLeftLeg.png", + "filter" : 0, + "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], + "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], + "glVertexPointer" : + [ + -0.08596524596214294, + -0.1153986603021622, + 0.1430010497570038, + -0.1153986603021622, + 0.1430010497570038, + 0.1135676354169846, + -0.08596524596214294, + 0.1135676354169846 + ], + "name" : "image5", + "opacity" : 1, + "renderOrder" : 6, + "scale" : 0.2289662957191467 + }, + + { + "aspectScale" : 1, + "body" : 2, + "center" : + { + "x" : 0.01975236460566521, + "y" : -0.07194232940673828 + }, + "corners" : + { + "x" : + [ + -0.2679373621940613, + 0.3074420690536499, + 0.3074420690536499, + -0.2679373621940613 + ], + "y" : + [ + -0.4171699881553650, + -0.4171699881553650, + 0.2732853293418884, + 0.2732853293418884 + ] + }, + "file" : "../../img/Characters/Chuck/head.png", + "filter" : 0, + "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], + "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], + "glVertexPointer" : + [ + -0.2679373621940613, + -0.4171699881553650, + 0.3074420690536499, + -0.4171699881553650, + 0.3074420690536499, + 0.2732853293418884, + -0.2679373621940613, + 0.2732853293418884 + ], + "name" : "image1", + "opacity" : 1, + "renderOrder" : 6, + "scale" : 0.6904553174972534 + }, + + { + "aspectScale" : 1, + "body" : 0, + "center" : + { + "x" : 0.002138927578926086, + "y" : 0.0006600618362426758 + }, + "corners" : + { + "x" : + [ + -0.05653338506817818, + 0.06081124022603035, + 0.06081124022603035, + -0.05653338506817818 + ], + "y" : + [ + -0.2340291887521744, + -0.2340291887521744, + 0.2353493124246597, + 0.2353493124246597 + ] + }, + "file" : "../../img/Characters/Chuck/upperLeftArm.png", + "filter" : 0, + "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], + "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], + "glVertexPointer" : + [ + -0.05653338506817818, + -0.2340291887521744, + 0.06081124022603035, + -0.2340291887521744, + 0.06081124022603035, + 0.2353493124246597, + -0.05653338506817818, + 0.2353493124246597 + ], + "name" : "image4", + "opacity" : 1, + "renderOrder" : 8, + "scale" : 0.4693785011768341 + }, + + { + "aspectScale" : 1, + "body" : 5, + "center" : + { + "x" : 0.002538725733757019, + "y" : 0.001779437065124512 + }, + "corners" : + { + "x" : + [ + -0.05412428826093674, + 0.05920173972845078, + 0.05920173972845078, + -0.05412428826093674 + ], + "y" : + [ + -0.1398780941963196, + -0.1398780941963196, + 0.1434369683265686, + 0.1434369683265686 + ] + }, + "file" : "../../img/Characters/Chuck/lowerLeftArm.png", + "filter" : 0, + "glDrawElements" : [ 0, 1, 2, 2, 3, 0 ], + "glTexCoordPointer" : [ 0.0, 0.0, 1, 0.0, 1, 1, 0.0, 1 ], + "glVertexPointer" : + [ + -0.05412428826093674, + -0.1398780941963196, + 0.05920173972845078, + -0.1398780941963196, + 0.05920173972845078, + 0.1434369683265686, + -0.05412428826093674, + 0.1434369683265686 + ], + "name" : "image3", + "opacity" : 1, + "renderOrder" : 8, + "scale" : 0.2833150625228882 + } + ], + "joint" : + [ + + { + "anchorA" : + { + "x" : 0.001047849655151367, + "y" : -0.1790249347686768 + }, + "anchorB" : + { + "x" : 0.001048207283020020, + "y" : 0.08683943748474121 + }, + "bodyA" : 0, + "bodyB" : 5, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : 0, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint4", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 1.919862151145935 + }, + + { + "anchorA" : + { + "x" : -0.1165831685066223, + "y" : 0.3330366015434265 + }, + "anchorB" : + { + "x" : -2.135336399078369e-05, + "y" : 0.1812803745269775 + }, + "bodyA" : 1, + "bodyB" : 0, + "enableLimit" : false, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -2.268928050994873, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint3", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 3.141592741012573 + }, + + { + "anchorA" : + { + "x" : 0.07454992830753326, + "y" : 0.5068108439445496 + }, + "anchorB" : + { + "x" : -0.02141102217137814, + "y" : -0.3435407876968384 + }, + "bodyA" : 1, + "bodyB" : 2, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -1.221730470657349, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint0", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 0.6981316804885864 + }, + + { + "anchorA" : + { + "x" : 0.1367489844560623, + "y" : -0.3606387376785278 + }, + "anchorB" : + { + "x" : 0.05056380107998848, + "y" : 0.1842886805534363 + }, + "bodyA" : 1, + "bodyB" : 7, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -0.6981316804885864, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint5", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 1.919862151145935 + }, + + { + "anchorA" : + { + "x" : -0.08329562842845917, + "y" : -0.3541148304939270 + }, + "anchorB" : + { + "x" : -0.05503869056701660, + "y" : 0.1909851431846619 + }, + "bodyA" : 1, + "bodyB" : 8, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -0.6981316804885864, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint6", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 1.919862151145935 + }, + + { + "anchorA" : + { + "x" : 0.1710196435451508, + "y" : 0.3308989405632019 + }, + "anchorB" : + { + "x" : -9.131431579589844e-05, + "y" : 0.1791421175003052 + }, + "bodyA" : 1, + "bodyB" : 6, + "enableLimit" : false, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -2.268928050994873, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint2", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 3.141592741012573 + }, + + { + "anchorA" : + { + "x" : 0.0004334598779678345, + "y" : 0.08706557750701904 + }, + "anchorB" : + { + "x" : 0.0004332214593887329, + "y" : -0.1787990331649780 + }, + "bodyA" : 3, + "bodyB" : 6, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : 0, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint1", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 1.919862151145935 + }, + + { + "anchorA" : + { + "x" : 0.002425249665975571, + "y" : -0.1845821887254715 + }, + "anchorB" : + { + "x" : 0.002425376325845718, + "y" : 0.1026860624551773 + }, + "bodyA" : 7, + "bodyB" : 9, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -2.268928050994873, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint8", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 0 + }, + + { + "anchorA" : + { + "x" : -0.0009558200836181641, + "y" : -0.1818936169147491 + }, + "anchorB" : + { + "x" : -0.0009555891156196594, + "y" : 0.1055182516574860 + }, + "bodyA" : 8, + "bodyB" : 4, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -2.268928050994873, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint7", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 0 + } + ], + "positionIterations" : 3, + "stepsPerSecond" : 60.0, + "subStepping" : false, + "velocityIterations" : 8, + "warmStarting" : true +} diff --git a/static/items/rube/ragdoll.rube b/static/items/rube/ragdoll.rube index 53f1406..b7f646a 100644 --- a/static/items/rube/ragdoll.rube +++ b/static/items/rube/ragdoll.rube @@ -71,7 +71,7 @@ "density" : 1, "filter-groupIndex" : -55, "friction" : 0.2, - "id" : 17, + "id" : 2, "name" : "fixture3", "shapes" : [ @@ -84,67 +84,35 @@ { "x" : [ - -0.08623008430004120, - 0.08623021841049194, - 0.08623021841049194, - -0.08623008430004120 + 0.07039496302604675, + 0.07039496302604675, + -0.07039486616849899, + -0.07039486616849899 ], "y" : [ - -0.1138515025377274, - -0.1138515025377274, - 0.1563164740800858, - 0.1563164740800858 - ] - } - }, - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "id" : 18, - "name" : "fixture3", - "shapes" : - [ - - { - "type" : "polygon" - } - ], - "vertices" : - { - "x" : - [ - -0.08457189798355103, - 0.1415264606475830, - 0.1415264606475830, - -0.08457189798355103 - ], - "y" : - [ - -0.1143886670470238, - -0.1143886670470238, - -0.05680520832538605, - -0.05680520832538605 + -0.09294389933347702, + 0.1276105940341949, + 0.1276105940341949, + -0.09294389933347702 ] } } ], - "id" : 13, + "id" : 1, "linearVelocity" : 0, - "massData-I" : 0.0005849063745699823, + "massData-I" : 0.0001864957448560745, "massData-center" : { - "x" : 0.006219535600394011, - "y" : -0.002099231118336320 + "x" : 4.842877032729120e-08, + "y" : 0.01733334921300411 }, - "massData-mass" : 0.05961277708411217, - "name" : "lowerLegRight", + "massData-mass" : 0.03105182945728302, + "name" : "lowerRightLeg", "position" : { - "x" : 0.03142313286662102, - "y" : 0.1298431605100632 + "x" : 0.02818956598639488, + "y" : 0.1036150008440018 }, "type" : "dynamic" }, @@ -160,7 +128,7 @@ "density" : 1, "filter-groupIndex" : -55, "friction" : 0.2, - "id" : 19, + "id" : 3, "name" : "fixture3", "shapes" : [ @@ -173,35 +141,35 @@ { "x" : [ - -0.08623017370700836, - 0.08623032271862030, - 0.08623032271862030, - -0.08623017370700836 + 0.07039505988359451, + 0.07039505988359451, + -0.07039495557546616, + -0.07039495557546616 ], "y" : [ - -0.2315792292356491, - -0.2315792292356491, - 0.2315795421600342, - 0.2315795421600342 + -0.1890522241592407, + 0.1890524625778198, + 0.1890524625778198, + -0.1890522241592407 ] } } ], - "id" : 14, + "id" : 2, "linearVelocity" : 0, - "massData-I" : 0.001625879434868693, + "massData-I" : 0.000722132739610970, "massData-center" : { - "x" : 7.450580596923828e-08, - "y" : 1.564621925354004e-07 + "x" : 5.215406417846680e-08, + "y" : 1.192092824453539e-07 }, - "massData-mass" : 0.07987659424543381, - "name" : "upperLegLeft", + "massData-mass" : 0.05323336645960808, + "name" : "upperLeftLeg", "position" : { - "x" : -0.08319067955017090, - "y" : 0.4171121716499329 + "x" : -0.06537666171789169, + "y" : 0.3381301760673523 }, "type" : "dynamic" }, @@ -217,7 +185,7 @@ "density" : 1, "filter-groupIndex" : -55, "friction" : 0.2, - "id" : 20, + "id" : 4, "name" : "fixture3", "shapes" : [ @@ -230,35 +198,35 @@ { "x" : [ - -0.08623008430004120, - 0.08623021841049194, - 0.08623021841049194, - -0.08623008430004120 + 0.07039496302604675, + 0.07039496302604675, + -0.07039486616849899, + -0.07039486616849899 ], "y" : [ - -0.2315792292356491, - -0.2315792292356491, - 0.2315795421600342, - 0.2315795421600342 + -0.1890522241592407, + 0.1890524625778198, + 0.1890524625778198, + -0.1890522241592407 ] } } ], - "id" : 15, + "id" : 3, "linearVelocity" : 0, - "massData-I" : 0.001625877106562257, + "massData-I" : 0.0007221315754577518, "massData-center" : { - "x" : 6.705522537231445e-08, - "y" : 1.564621925354004e-07 + "x" : 4.842877388000488e-08, + "y" : 1.192092895507812e-07 }, - "massData-mass" : 0.07987650483846664, - "name" : "upperLegRight", + "massData-mass" : 0.05323329567909241, + "name" : "upperRightLeg", "position" : { - "x" : 0.03142313286662102, - "y" : 0.4171121716499329 + "x" : 0.02818956598639488, + "y" : 0.3381301760673523 }, "type" : "dynamic" }, @@ -274,7 +242,7 @@ "density" : 1, "filter-groupIndex" : -55, "friction" : 0.2, - "id" : 21, + "id" : 5, "name" : "fixture3", "shapes" : [ @@ -287,35 +255,35 @@ { "x" : [ - -0.05748690664768219, - 0.05748683214187622, - 0.05748683214187622, - -0.05748690664768219 + 0.04693000018596649, + 0.04693000018596649, + -0.04693005979061127, + -0.04693005979061127 ], "y" : [ - -0.2322469353675842, - -0.2322469353675842, - 0.2322462797164917, - 0.2322462797164917 + -0.1895973682403564, + 0.1895966529846191, + 0.1895966529846191, + -0.1895973682403564 ] } } ], - "id" : 16, + "id" : 4, "linearVelocity" : 0, - "massData-I" : 0.001019015791825950, + "massData-I" : 0.0004525946278590709, "massData-center" : { - "x" : -3.725290298461914e-08, - "y" : -3.278255462646484e-07 + "x" : -2.980232238769531e-08, + "y" : -3.576278686523438e-07 }, - "massData-mass" : 0.05340452119708061, - "name" : "upperArmRight", + "massData-mass" : 0.03559117391705513, + "name" : "upperRightArm", "position" : { - "x" : 0.1177217364311218, - "y" : 1.113796472549438 + "x" : 0.09864036738872528, + "y" : 0.9068759679794312 }, "type" : "dynamic" }, @@ -331,7 +299,7 @@ "density" : 1, "filter-groupIndex" : -55, "friction" : 0.2, - "id" : 22, + "id" : 6, "name" : "fixture3", "shapes" : [ @@ -344,35 +312,35 @@ { "x" : [ - -0.05748672783374786, - 0.05748684704303741, - 0.05748684704303741, - -0.05748672783374786 + 0.04693000763654709, + 0.04693000763654709, + -0.04692991077899933, + -0.04692991077899933 ], "y" : [ - -0.1419981122016907, - -0.1419981122016907, - 0.1419981718063354, - 0.1419981718063354 + -0.1159216761589050, + 0.1159217953681946, + 0.1159217953681946, + -0.1159216761589050 ] } } ], - "id" : 17, + "id" : 5, "linearVelocity" : 0, - "massData-I" : 0.0002554284874349833, + "massData-I" : 0.0001134483172791079, "massData-center" : { - "x" : 5.960464477539062e-08, - "y" : 2.980232238769531e-08 + "x" : 4.842877032729120e-08, + "y" : 5.960464477539062e-08 }, - "massData-mass" : 0.03265206888318062, - "name" : "lowerArmLeft", + "massData-mass" : 0.02176081016659737, + "name" : "lowerLeftArm", "position" : { - "x" : -0.1699528992176056, - "y" : 0.8479318022727966 + "x" : -0.1362059414386749, + "y" : 0.6898344159126282 }, "type" : "dynamic" }, @@ -388,7 +356,7 @@ "density" : 1, "filter-groupIndex" : -55, "friction" : 0.2, - "id" : 23, + "id" : 7, "name" : "fixture3", "shapes" : [ @@ -401,67 +369,35 @@ { "x" : [ - -0.08623020350933075, - 0.08623030036687851, - 0.08623030036687851, - -0.08623020350933075 + 0.07039503753185272, + 0.07039503753185272, + -0.07039495557546616, + -0.07039495557546616 ], "y" : [ - -0.1138511821627617, - -0.1138511821627617, - 0.1565139442682266, - 0.1565139442682266 - ] - } - }, - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "id" : 24, - "name" : "fixture3", - "shapes" : - [ - - { - "type" : "polygon" - } - ], - "vertices" : - { - "x" : - [ - -0.08457186818122864, - 0.1415265351533890, - 0.1415265351533890, - -0.08457186818122864 - ], - "y" : - [ - -0.1143886670470238, - -0.1143886670470238, - -0.05680520832538605, - -0.05680520832538605 + -0.09294363856315613, + 0.1277718394994736, + 0.1277718394994736, + -0.09294363856315613 ] } } ], - "id" : 18, + "id" : 6, "linearVelocity" : 0, - "massData-I" : 0.0005858240183442831, + "massData-I" : 0.0001869033440016210, "massData-center" : { - "x" : 0.006215983536094427, - "y" : -0.002008607611060143 + "x" : 4.097818973036738e-08, + "y" : 0.01741409860551357 }, - "massData-mass" : 0.05964682996273041, - "name" : "lowerLegLeft", + "massData-mass" : 0.03107452951371670, + "name" : "lowerLeftLeg", "position" : { - "x" : -0.08319067955017090, - "y" : 0.1298431605100632 + "x" : -0.06537666171789169, + "y" : 0.1036150008440018 }, "type" : "dynamic" }, @@ -477,7 +413,7 @@ "density" : 1, "filter-groupIndex" : -55, "friction" : 0.2, - "id" : 25, + "id" : 9, "name" : "fixture3", "shapes" : [ @@ -490,35 +426,35 @@ { "x" : [ - -0.05748690664768219, - 0.05748683214187622, - 0.05748683214187622, - -0.05748690664768219 + 0.04693000018596649, + 0.04693000018596649, + -0.04693005979061127, + -0.04693005979061127 ], "y" : [ - -0.1419981122016907, - -0.1419981122016907, - 0.1419981718063354, - 0.1419981718063354 + -0.1159216761589050, + 0.1159217953681946, + 0.1159217953681946, + -0.1159216761589050 ] } } ], - "id" : 19, + "id" : 7, "linearVelocity" : 0, - "massData-I" : 0.0002554289239924401, + "massData-I" : 0.0001134485355578363, "massData-center" : { - "x" : -3.725290298461914e-08, - "y" : 2.980232238769531e-08 + "x" : -2.980232238769531e-08, + "y" : 5.960464477539062e-08 }, - "massData-mass" : 0.03265211358666420, - "name" : "lowerArmRight", + "massData-mass" : 0.02176084183156490, + "name" : "lowerRightArm", "position" : { - "x" : 0.1177217364311218, - "y" : 0.8479318022727966 + "x" : 0.09864036738872528, + "y" : 0.6898344159126282 }, "type" : "dynamic" }, @@ -534,58 +470,37 @@ "density" : 0.2204959988594055, "filter-groupIndex" : -55, "friction" : 0.2, - "id" : 26, + "id" : 10, "name" : "fixture1", "shapes" : [ { - "radius" : 0.2746430933475494, + "radius" : 0.2268356680870056, "type" : "circle" } ], "vertices" : { - "x" : [ -0.007499951869249344 ], - "y" : [ 0.003749847412109375 ] - } - }, - - { - "density" : 0.2204959988594055, - "filter-groupIndex" : -55, - "friction" : 0.2, - "id" : 27, - "name" : "fixture1", - "shapes" : - [ - - { - "radius" : 0.2485582530498505, - "type" : "circle" - } - ], - "vertices" : - { - "x" : [ -0.03327952325344086 ], - "y" : [ -0.1384725570678711 ] + "x" : [ -0.002679032273590565 ], + "y" : [ 0.004700660705566406 ] } } ], - "id" : 20, + "id" : 8, "linearVelocity" : 0, - "massData-I" : 0.004164268728345633, + "massData-I" : 0.0009180362685583532, "massData-center" : { - "x" : -0.01910765282809734, - "y" : -0.06028826907277107 + "x" : -0.002679032273590565, + "y" : 0.004700660705566406 }, - "massData-mass" : 0.09504657238721848, + "massData-mass" : 0.03564291819930077, "name" : "head", "position" : { - "x" : 0.04257059469819069, - "y" : 1.812389135360718 + "x" : 0.009572610259056091, + "y" : 1.462979435920715 }, "type" : "dynamic" }, @@ -601,7 +516,7 @@ "density" : 1, "filter-groupIndex" : -55, "friction" : 0.2, - "id" : 28, + "id" : 13, "name" : "fixture0", "shapes" : [ @@ -614,71 +529,39 @@ { "x" : [ - -0.1718577295541763, - 0.001460619270801544, - 0.1718577891588211, - 0.1684816330671310, - 0.001688212156295776, - -0.1718577295541763 + 0.1402979493141174, + 0.1375417709350586, + 0.001378186047077179, + -0.1402979493141174, + -0.1402979493141174, + 0.001192390918731689 ], "y" : [ - -0.4204435348510742, - -0.4519201517105103, - -0.3928470611572266, - 0.4921868443489075, - 0.4921868443489075, - 0.3841522336006165 - ] - } - }, - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "id" : 29, - "name" : "fixture2", - "shapes" : - [ - - { - "type" : "polygon" - } - ], - "vertices" : - { - "x" : - [ - -0.004204027354717255, - 0.1679489463567734, - 0.1679489463567734, - -0.004204027354717255 - ], - "y" : - [ - 0.4449140429496765, - 0.4449140429496765, - 0.6170670390129089, - 0.6170670390129089 + -0.3207050263881683, + 0.4018019437789917, + 0.4018019437789917, + 0.3136067390441895, + -0.3432337343692780, + -0.3689299821853638 ] } } ], - "id" : 21, + "id" : 9, "linearVelocity" : 0, - "massData-I" : 0.03228222951292992, + "massData-I" : 0.01047351956367493, "massData-center" : { - "x" : 0.008858840912580490, - "y" : 0.06282533705234528 + "x" : 0.001456731930375099, + "y" : 0.01425695233047009 }, - "massData-mass" : 0.3355117142200470, + "massData-mass" : 0.2038488984107971, "name" : "chest", "position" : { - "x" : -0.05338868126273155, - "y" : 0.9620395302772522 + "x" : -0.04104747623205185, + "y" : 0.7829875946044922 }, "type" : "dynamic" }, @@ -694,7 +577,7 @@ "density" : 1, "filter-groupIndex" : -55, "friction" : 0.2, - "id" : 30, + "id" : 14, "name" : "fixture3", "shapes" : [ @@ -707,318 +590,137 @@ { "x" : [ - -0.05748683214187622, - 0.05748672783374786, - 0.05748672783374786, - -0.05748683214187622 + 0.04692991077899933, + 0.04692991077899933, + -0.04692997038364410, + -0.04692997038364410 ], "y" : [ - -0.2322469353675842, - -0.2322469353675842, - 0.2322462797164917, - 0.2322462797164917 + -0.1895973682403564, + 0.1895966529846191, + 0.1895966529846191, + -0.1895973682403564 ] } } ], - "id" : 22, + "id" : 10, "linearVelocity" : 0, - "massData-I" : 0.001019014045596123, + "massData-I" : 0.0004525936674326658, "massData-center" : { - "x" : -5.215406062575312e-08, - "y" : -3.278255462646484e-07 + "x" : -2.980232238769531e-08, + "y" : -3.576278686523438e-07 }, - "massData-mass" : 0.05340443924069405, - "name" : "upperArmLeft", + "massData-mass" : 0.03559110686182976, + "name" : "upperLeftArm", "position" : { - "x" : -0.1699507087469101, - "y" : 1.113796472549438 + "x" : -0.1362041532993317, + "y" : 0.9068759679794312 }, "type" : "dynamic" } ], - "metaimage" : - [ - - { - "aspectScale" : 1, - "body" : 21, - "center" : - { - "x" : -0.0008481591939926147, - "y" : -0.001265347003936768 - }, - "file" : "../../img/Characters/Chuck/chest.png", - "filter" : 0, - "flip" : false, - "id" : 15, - "name" : "image2", - "opacity" : 1, - "renderOrder" : 5, - "scale" : 0.9578933119773865 - }, - - { - "aspectScale" : 1, - "body" : 18, - "center" : - { - "x" : 0.02851789817214012, - "y" : -0.0009155124425888062 - }, - "file" : "../../img/Characters/Chuck/lowerLeftLeg.png", - "filter" : 0, - "flip" : false, - "id" : 16, - "name" : "image5", - "opacity" : 1, - "renderOrder" : 6, - "scale" : 0.2289662957191467 - }, - - { - "aspectScale" : 1, - "body" : 20, - "center" : - { - "x" : 0.01975236460566521, - "y" : -0.07194232940673828 - }, - "file" : "../../img/Characters/Chuck/head.png", - "filter" : 0, - "flip" : false, - "id" : 17, - "name" : "image1", - "opacity" : 1, - "renderOrder" : 6, - "scale" : 0.6904553174972534 - }, - - { - "aspectScale" : 1, - "body" : 22, - "center" : - { - "x" : 0.002138927578926086, - "y" : 0.0006600618362426758 - }, - "file" : "../../img/Characters/Chuck/upperLeftArm.png", - "filter" : 0, - "flip" : false, - "id" : 18, - "name" : "image4", - "opacity" : 1, - "renderOrder" : 8, - "scale" : 0.4693785011768341 - }, - - { - "aspectScale" : 1, - "body" : 16, - "center" : - { - "x" : 0.0003027096390724182, - "y" : 0.0006600618362426758 - }, - "file" : "../../img/Characters/Chuck/upperLeftArm.png", - "filter" : 0, - "flip" : false, - "id" : 19, - "name" : "image4", - "opacity" : 1, - "renderOrder" : 1, - "scale" : 0.4693785011768341 - }, - - { - "aspectScale" : 1, - "body" : 17, - "center" : - { - "x" : 0.002538725733757019, - "y" : 0.001779437065124512 - }, - "file" : "../../img/Characters/Chuck/lowerLeftArm.png", - "filter" : 0, - "flip" : false, - "id" : 20, - "name" : "image3", - "opacity" : 1, - "renderOrder" : 8, - "scale" : 0.2833150625228882 - }, - - { - "aspectScale" : 1, - "body" : 19, - "center" : - { - "x" : 0.0007003694772720337, - "y" : 0.001779437065124512 - }, - "file" : "../../img/Characters/Chuck/lowerLeftArm.png", - "filter" : 0, - "flip" : false, - "id" : 21, - "name" : "image3", - "opacity" : 1, - "renderOrder" : 1, - "scale" : 0.2833150625228882 - }, - - { - "aspectScale" : 1, - "body" : 14, - "center" : - { - "x" : 0.003173574805259705, - "y" : -0.001172244548797607 - }, - "file" : "../../img/Characters/Chuck/upperLeftLeg.png", - "filter" : 0, - "flip" : false, - "id" : 22, - "name" : "image6", - "opacity" : 1, - "renderOrder" : 6, - "scale" : 0.4627031385898590 - }, - - { - "aspectScale" : 1, - "body" : 15, - "center" : - { - "x" : -0.02732392773032188, - "y" : 0.02671334147453308 - }, - "file" : "../../img/Characters/Chuck/upperRightLeg.png", - "filter" : 0, - "flip" : false, - "id" : 23, - "name" : "image6", - "opacity" : 1, - "scale" : 0.5183231234550476 - }, - - { - "aspectScale" : 1, - "body" : 13, - "center" : - { - "x" : 0.02911517955362797, - "y" : -0.0009155124425888062 - }, - "file" : "../../img/Characters/Chuck/lowerLeftLeg.png", - "filter" : 0, - "flip" : false, - "id" : 24, - "name" : "image5", - "opacity" : 1, - "scale" : 0.2289662957191467 - } - ], "metajoint" : [ { "anchorA" : { - "x" : 0.07454992830753326, - "y" : 0.5068107843399048 + "x" : -0.0007802955806255341, + "y" : -0.1484908312559128 }, "anchorB" : { - "x" : -0.02141102217137814, - "y" : -0.3435407876968384 + "x" : -0.0007801018655300140, + "y" : 0.08614096790552139 }, - "bodyA" : 21, - "bodyB" : 20, + "bodyA" : 2, + "bodyB" : 6, "collideConnected" : false, "enableLimit" : true, "enableMotor" : false, - "id" : 10, - "lowerLimit" : -1.221730470657349, + "id" : 1, + "lowerLimit" : 0.01745329238474369, "maxMotorTorque" : 1, "motorSpeed" : 0, - "name" : "joint0", + "name" : "joint7", "referenceAngle" : 0, "type" : "revolute", - "upperLimit" : 0.6981316804885864 + "upperLimit" : 2.268928050994873 }, { "anchorA" : { - "x" : 0.002425247803330421, - "y" : -0.1845821887254715 + "x" : 0.001979876309633255, + "y" : -0.1506856828927994 }, "anchorB" : { - "x" : 0.002425374463200569, - "y" : 0.1026860624551773 + "x" : 0.001979988068342209, + "y" : 0.08382887393236160 }, - "bodyA" : 15, - "bodyB" : 13, + "bodyA" : 3, + "bodyB" : 1, "collideConnected" : false, "enableLimit" : true, "enableMotor" : false, - "id" : 11, - "lowerLimit" : -2.268928050994873, + "id" : 2, + "lowerLimit" : 0.01745329238474369, "maxMotorTorque" : 1, "motorSpeed" : 0, "name" : "joint8", "referenceAngle" : 0, "type" : "revolute", - "upperLimit" : 0 + "upperLimit" : 2.268928050994873 }, { "anchorA" : { - "x" : -0.1165831685066223, - "y" : 0.3330365419387817 + "x" : 0.0003538504242897034, + "y" : 0.07107692956924438 }, "anchorB" : { - "x" : -2.135336399078369e-05, - "y" : 0.1812803745269775 + "x" : 0.0003536641597747803, + "y" : -0.1459646224975586 }, - "bodyA" : 21, - "bodyB" : 22, + "bodyA" : 7, + "bodyB" : 4, "collideConnected" : false, - "enableLimit" : false, + "enableLimit" : true, "enableMotor" : false, - "id" : 12, - "lowerLimit" : -2.268928050994873, + "id" : 3, + "lowerLimit" : -1.919862151145935, "maxMotorTorque" : 1, "motorSpeed" : 0, - "name" : "joint3", + "name" : "joint1", "referenceAngle" : 0, "type" : "revolute", - "upperLimit" : 3.141592741012573 + "upperLimit" : 0.01745329238474369 }, { "anchorA" : { - "x" : 0.1710196435451508, - "y" : 0.3308988809585571 + "x" : 0.1396137326955795, + "y" : 0.2701327204704285 }, "anchorB" : { - "x" : -9.131431579589844e-05, - "y" : 0.1791421175003052 + "x" : -7.455050945281982e-05, + "y" : 0.1462445855140686 }, - "bodyA" : 21, - "bodyB" : 16, + "bodyA" : 9, + "bodyB" : 4, "collideConnected" : false, "enableLimit" : false, "enableMotor" : false, - "id" : 13, + "id" : 4, "lowerLimit" : -2.268928050994873, "maxMotorTorque" : 1, "motorSpeed" : 0, @@ -1031,24 +733,24 @@ { "anchorA" : { - "x" : 0.0004334598779678345, - "y" : 0.08706557750701904 + "x" : -0.06799929589033127, + "y" : -0.2890855073928833 }, "anchorB" : { - "x" : 0.0004332214593887329, - "y" : -0.1787990331649780 + "x" : -0.04493143782019615, + "y" : 0.1559127867221832 }, - "bodyA" : 19, - "bodyB" : 16, + "bodyA" : 9, + "bodyB" : 2, "collideConnected" : false, "enableLimit" : true, "enableMotor" : false, - "id" : 14, - "lowerLimit" : 0, + "id" : 5, + "lowerLimit" : -0.6981316804885864, "maxMotorTorque" : 1, "motorSpeed" : 0, - "name" : "joint1", + "name" : "joint6", "referenceAngle" : 0, "type" : "revolute", "upperLimit" : 1.919862151145935 @@ -1057,20 +759,20 @@ { "anchorA" : { - "x" : 0.1367489844560623, - "y" : -0.3606387376785278 + "x" : 0.1116365119814873, + "y" : -0.2944114208221436 }, "anchorB" : { - "x" : 0.05056379735469818, - "y" : 0.1842886805534363 + "x" : 0.04127831012010574, + "y" : 0.1504460573196411 }, - "bodyA" : 21, - "bodyB" : 15, + "bodyA" : 9, + "bodyB" : 3, "collideConnected" : false, "enableLimit" : true, "enableMotor" : false, - "id" : 15, + "id" : 6, "lowerLimit" : -0.6981316804885864, "maxMotorTorque" : 1, "motorSpeed" : 0, @@ -1083,79 +785,79 @@ { "anchorA" : { - "x" : 0.001047849655151367, - "y" : -0.1790249347686768 + "x" : -0.09517394006252289, + "y" : 0.2718779444694519 }, "anchorB" : { - "x" : 0.001048207283020020, - "y" : 0.08683943748474121 + "x" : -1.741945743560791e-05, + "y" : 0.1479902863502502 }, - "bodyA" : 22, - "bodyB" : 17, + "bodyA" : 9, + "bodyB" : 10, + "collideConnected" : false, + "enableLimit" : false, + "enableMotor" : false, + "id" : 8, + "lowerLimit" : -2.268928050994873, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint3", + "referenceAngle" : 0, + "type" : "revolute", + "upperLimit" : 3.141592741012573 + }, + + { + "anchorA" : + { + "x" : 0.0008554458618164062, + "y" : -0.1461489200592041 + }, + "anchorB" : + { + "x" : 0.0008557140827178955, + "y" : 0.07089227437973022 + }, + "bodyA" : 10, + "bodyB" : 5, "collideConnected" : false, "enableLimit" : true, "enableMotor" : false, - "id" : 16, - "lowerLimit" : 0, + "id" : 9, + "lowerLimit" : -1.919862151145935, "maxMotorTorque" : 1, "motorSpeed" : 0, "name" : "joint4", "referenceAngle" : 0, "type" : "revolute", - "upperLimit" : 1.919862151145935 + "upperLimit" : 0.01745329238474369 }, { "anchorA" : { - "x" : -0.0009558200836181641, - "y" : -0.1818936169147491 + "x" : 0.06392270326614380, + "y" : 0.4330990016460419 }, "anchorB" : { - "x" : -0.0009555891156196594, - "y" : 0.1055182516574860 + "x" : 0.01330260001122952, + "y" : -0.2468920052051544 }, - "bodyA" : 14, - "bodyB" : 18, + "bodyA" : 9, + "bodyB" : 8, "collideConnected" : false, "enableLimit" : true, "enableMotor" : false, - "id" : 17, - "lowerLimit" : -2.268928050994873, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint7", - "referenceAngle" : 0, - "type" : "revolute", - "upperLimit" : 0 - }, - - { - "anchorA" : - { - "x" : -0.08329562842845917, - "y" : -0.3541148304939270 - }, - "anchorB" : - { - "x" : -0.0550386831164360, - "y" : 0.1909851431846619 - }, - "bodyA" : 21, - "bodyB" : 14, - "collideConnected" : false, - "enableLimit" : true, - "enableMotor" : false, - "id" : 18, + "id" : 29, "lowerLimit" : -0.6981316804885864, - "maxMotorTorque" : 1, + "maxMotorTorque" : 0, "motorSpeed" : 0, - "name" : "joint6", + "name" : "joint9", "referenceAngle" : 0, "type" : "revolute", - "upperLimit" : 1.919862151145935 + "upperLimit" : 1.221730470657349 } ], "positionIterations" : 3, diff --git a/static/maps/tiled/debug.json b/static/maps/tiled/debug.json index d8e0842..920a287 100644 --- a/static/maps/tiled/debug.json +++ b/static/maps/tiled/debug.json @@ -108,8 +108,8 @@ "type":"", "visible":true, "width":0, - "x":516.282764098491, - "y":128.219675479405 + "x":548.282764098491, + "y":130.219675479405 }, { "ellipse":true, @@ -215,17 +215,17 @@ { "height":0, "id":10, - "name":"Rube", + "name":"RubeDoll", "properties": { }, "rotation":0, - "type":"rube", + "type":"", "visible":true, "width":0, - "x":236.607333333333, - "y":462.255333333333 + "x":504.607333333333, + "y":111.255333333333 }, { "height":0, From c4fcb2fabfcc211008f7b00afba0f21a9cd8193b Mon Sep 17 00:00:00 2001 From: logsol Date: Tue, 28 Apr 2015 14:56:29 +0200 Subject: [PATCH 06/14] fixed a few bugs - rube loader was manipulating the json, which resulted in coordinates flipping every second time --- app/Lib/Vendor/RubeLoader.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Lib/Vendor/RubeLoader.js b/app/Lib/Vendor/RubeLoader.js index 49674c3..2b6d5a1 100644 --- a/app/Lib/Vendor/RubeLoader.js +++ b/app/Lib/Vendor/RubeLoader.js @@ -152,8 +152,7 @@ function (Box2D) { if ( bodyJson.hasOwnProperty('linearVelocity') && bodyJson.linearVelocity instanceof Object ) bd.linearVelocity.SetV( bodyJson.linearVelocity ); if ( bodyJson.hasOwnProperty('position') && bodyJson.position instanceof Object ) - bodyJson.position.y *= -1; - bd.position.SetV( bodyJson.position ); + bd.position.SetV( this.getVectorValue(bodyJson.position) ); if ( bodyJson.hasOwnProperty('awake') ) bd.awake = bodyJson.awake; else @@ -169,6 +168,7 @@ function (Box2D) { body.name = bodyJson.name; if ( bodyJson.hasOwnProperty('customProperties') ) body.customProperties = bodyJson.customProperties; + return body; } @@ -231,8 +231,7 @@ function (Box2D) { RubeLoader.prototype.getVectorValue = function (val) { if ( val instanceof Object ) { - val.y *= -1; - return val; + return { x: val.x, y: val.y * -1 }; } else { return { x:0, y:0 }; } From b3fbf34cf72e97366e5ce21baa76266ea99af2a6 Mon Sep 17 00:00:00 2001 From: logsol Date: Tue, 28 Apr 2015 14:57:22 +0200 Subject: [PATCH 07/14] implemented rube doll to appear when dying --- .../Channel/GameObjects/Items/RubeDoll.js | 42 +++++++++++++++++-- app/Game/Client/GameObjects/Items/RubeDoll.js | 8 +++- app/Game/Client/Player.js | 4 -- app/Game/Core/GameObjects/Items/RubeDoll.js | 41 +++++++++++++++++- app/Game/Core/Player.js | 18 ++++++-- 5 files changed, 99 insertions(+), 14 deletions(-) diff --git a/app/Game/Channel/GameObjects/Items/RubeDoll.js b/app/Game/Channel/GameObjects/Items/RubeDoll.js index 3e27b2b..b810471 100644 --- a/app/Game/Channel/GameObjects/Items/RubeDoll.js +++ b/app/Game/Channel/GameObjects/Items/RubeDoll.js @@ -1,11 +1,45 @@ define([ - "Game/Core/GameObjects/Items/RubeDoll" + "Game/Core/GameObjects/Items/RubeDoll", + "Game/Config/Settings", + "Lib/Utilities/NotificationCenter" ], -function (Parent) { +function (Parent, Settings, Nc) { - "use strict"; + "use strict"; + + function RubeDoll(physicsEngine, uid, options) { + Parent.call(this, physicsEngine, uid, options); + } - return Parent; + RubeDoll.prototype = Object.create(Parent.prototype); + + RubeDoll.prototype.beingReleased = function(player) { + Parent.prototype.beingReleased.call(this, player); + if(this.scheduledForDestruction) { + this.delayedDestroy(); + } + }; + + RubeDoll.prototype.delayedDestroy = function() { + var self = this; + this.scheduledForDestruction = true; + this.destructionTimeout = setTimeout(function() { + Nc.trigger(Nc.ns.channel.to.client.gameCommand.broadcast, 'removeGameObject', { + type: 'animated', + uid: self.uid + }); + self.destroy(); + }, Settings.RAGDOLL_DESTRUCTION_TIME * 1000); + }; + + RubeDoll.prototype.destroy = function() { + if(this.scheduledForDestruction) { + clearTimeout(this.destructionTimeout); + } + Parent.prototype.destroy.call(this); + }; + + return RubeDoll; }); \ No newline at end of file diff --git a/app/Game/Client/GameObjects/Items/RubeDoll.js b/app/Game/Client/GameObjects/Items/RubeDoll.js index 2c76d91..078fd9a 100644 --- a/app/Game/Client/GameObjects/Items/RubeDoll.js +++ b/app/Game/Client/GameObjects/Items/RubeDoll.js @@ -11,7 +11,7 @@ function (Parent, Layer, Settings, Nc) { function RubeDoll(physicsEngine, uid, options) { - this.primaryColor = 0x008800; + this.primaryColor = options.primaryColor; var limbOptions = {}; @@ -160,6 +160,12 @@ function (Parent, Layer, Settings, Nc) { }; RubeDoll.prototype.destroy = function() { + + for (var name in this.limbMeshes) { + Nc.trigger(Nc.ns.client.view.mesh.remove, this.layerId, this.limbMeshes[name]); + }; + + Parent.prototype.destroy.call(this); }; RubeDoll.prototype.render = function() { diff --git a/app/Game/Client/Player.js b/app/Game/Client/Player.js index 5170f63..cb7c9db 100755 --- a/app/Game/Client/Player.js +++ b/app/Game/Client/Player.js @@ -83,10 +83,6 @@ function (Parent, Nc, Settings) { } }; - Player.prototype.getNickname = function() { - return this.user.options.nickname; - }; - Player.prototype.render = function() { if(this.doll) { diff --git a/app/Game/Core/GameObjects/Items/RubeDoll.js b/app/Game/Core/GameObjects/Items/RubeDoll.js index ad3323e..ea5b6c0 100644 --- a/app/Game/Core/GameObjects/Items/RubeDoll.js +++ b/app/Game/Core/GameObjects/Items/RubeDoll.js @@ -4,10 +4,11 @@ define([ "Lib/Vendor/Box2D", "Game/Config/Settings", "Lib/Utilities/Assert", + "Lib/Utilities/NotificationCenter", "json!Game/Asset/RubeDoll.json" // using requirejs json loader plugin ], -function (Parent, RubeLoader, Box2D, Settings, Assert, RubeDollJson) { +function (Parent, RubeLoader, Box2D, Settings, Assert, Nc, RubeDollJson) { "use strict"; @@ -45,6 +46,13 @@ function (Parent, RubeLoader, Box2D, Settings, Assert, RubeDollJson) { RubeDoll.prototype = Object.create(Parent.prototype); + RubeDoll.prototype.getFixtureDef = function() { + + var fixtureDef = new Box2D.Dynamics.b2FixtureDef(); + fixtureDef.shape = new Box2D.Collision.Shapes.b2CircleShape(); + return fixtureDef; + }; + RubeDoll.prototype.flip = function(direction) { Parent.prototype.flip.call(this, direction); // Extend @@ -61,6 +69,37 @@ function (Parent, RubeLoader, Box2D, Settings, Assert, RubeDollJson) { this.body.SetPosition(position); }; + + RubeDoll.prototype.setVelocities = function(options) { + Assert.number(options.linearVelocity.x, options.linearVelocity.y); + Assert.number(options.angularVelocity); + + this.body.SetLinearVelocity(options.linearVelocity); + this.body.SetAngularVelocity(options.angularVelocity); + for(var name in this.limbs) { + this.limbs[name].SetLinearVelocity(options.linearVelocity); + } + }; + + RubeDoll.prototype.getPosition = function() { + return this.body.GetPosition().Copy(); + }; + + RubeDoll.prototype.getHeadPosition = function() { + return this.limbs.head.GetPosition().Copy(); + }; + + RubeDoll.prototype.destroy = function() { + + Nc.trigger(Nc.ns.core.game.gameObject.remove, "animated", this); + var world = this.body.GetWorld(); + + for (var name in this.limbs) { + world.DestroyBody(this.limbs[name]); + } + + Parent.prototype.destroy.call(this); + }; return RubeDoll; }); \ No newline at end of file diff --git a/app/Game/Core/Player.js b/app/Game/Core/Player.js index e9a818a..67b492b 100755 --- a/app/Game/Core/Player.js +++ b/app/Game/Core/Player.js @@ -3,11 +3,12 @@ define([ "Game/Config/Settings", "Lib/Utilities/NotificationCenter", "Lib/Utilities/Exception", + "Lib/Utilities/ColorConverter", "Game/" + GLOBALS.context + "/GameObjects/SpectatorDoll", - "Game/" + GLOBALS.context + "/GameObjects/Items/RagDoll" + "Game/" + GLOBALS.context + "/GameObjects/Items/RubeDoll" ], -function (Doll, Settings, Nc, Exception, SpectatorDoll, RagDoll) { +function (Doll, Settings, Nc, Exception, ColorConverter, SpectatorDoll, RubeDoll) { "use strict"; @@ -30,6 +31,10 @@ function (Doll, Settings, Nc, Exception, SpectatorDoll, RagDoll) { Nc.trigger(Nc.ns.core.game.gameObject.add, 'animated', this); } + Player.prototype.getNickname = function() { + return this.user.options.nickname; + }; + Player.prototype.getActiveDoll = function() { if(this.spawned) { return this.doll; @@ -112,6 +117,10 @@ function (Doll, Settings, Nc, Exception, SpectatorDoll, RagDoll) { } // prepare for creating the ragdoll + + var converter = new ColorConverter(); + var primaryColor = converter.getColorByName(this.getNickname()); + var options = { x: this.getPosition().x * Settings.RATIO, y: this.getPosition().y * Settings.RATIO, @@ -123,10 +132,11 @@ function (Doll, Settings, Nc, Exception, SpectatorDoll, RagDoll) { type: "ragdoll", weight: 3, width: 5, - height: 12 + height: 12, + primaryColor: primaryColor }; - var ragDoll = new RagDoll(this.physicsEngine, "ragDoll-" + this.id + "-" + ragDollId, options); + var ragDoll = new RubeDoll(this.physicsEngine, "ragDoll-" + this.id + "-" + ragDollId, options); ragDoll.setVelocities(this.doll.getVelocities()); this.spawned = false; From 0da744f5fd7cc1cb64b8fc0adb1e044c372f7595 Mon Sep 17 00:00:00 2001 From: logsol Date: Tue, 28 Apr 2015 15:50:45 +0200 Subject: [PATCH 08/14] changed box2d calculation config #158 --- app/Game/Config/Settings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Game/Config/Settings.js b/app/Game/Config/Settings.js index 993e3e4..4e93113 100755 --- a/app/Game/Config/Settings.js +++ b/app/Game/Config/Settings.js @@ -16,8 +16,8 @@ function () { BOX2D_WORLD_AABB_SIZE: 3000, BOX2D_ALLOW_SLEEP: true, BOX2D_GRAVITY: 26, - BOX2D_VELOCITY_ITERATIONS: 5, - BOX2D_POSITION_ITERATIONS: 5, + BOX2D_VELOCITY_ITERATIONS: 10, + BOX2D_POSITION_ITERATIONS: 6, BOX2D_TIME_STEP: 1 / 60, // PATHS From a5f45ffef695defc94302742a8ac7b833d8acedb Mon Sep 17 00:00:00 2001 From: logsol Date: Wed, 29 Apr 2015 00:04:17 +0200 Subject: [PATCH 09/14] implemented rubedoll direction flip and added meshIndex (z) swapping capability. #151 --- app/Game/Asset/RubeDoll.json | 666 +++++++++--------- app/Game/Channel/GameController.js | 6 +- .../Channel/GameObjects/Items/RubeDoll.js | 10 + app/Game/Client/GameObjects/Items/RubeDoll.js | 46 +- app/Game/Client/View/LayerManager.js | 8 +- app/Game/Client/View/Pixi/Layer.js | 8 + app/Game/Core/GameObjects/Doll.js | 2 +- app/Game/Core/GameObjects/Items/RubeDoll.js | 58 +- app/Game/Core/Player.js | 11 +- app/Lib/Utilities/NotificationCenter.js | 3 +- app/Lib/Vendor/RubeLoader.js | 2 +- static/items/rube/ragdoll.rube | 52 +- 12 files changed, 483 insertions(+), 389 deletions(-) diff --git a/app/Game/Asset/RubeDoll.json b/app/Game/Asset/RubeDoll.json index 114e29f..37e4c0e 100644 --- a/app/Game/Asset/RubeDoll.json +++ b/app/Game/Asset/RubeDoll.json @@ -5,6 +5,57 @@ "body" : [ + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture2", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.1570904254913330, + 0.1570904254913330, + -0.1156365871429443, + -0.1156365871429443 + ], + "y" : + [ + -0.3584164977073669, + 0.4034895300865173, + 0.4034895300865173, + -0.3584164977073669 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.01153474207967520, + "massData-center" : + { + "x" : 0.02072691917419434, + "y" : 0.02253651618957520 + }, + "massData-mass" : 0.2077923566102982, + "name" : "chest", + "position" : + { + "x" : -0.04104747623205185, + "y" : 0.7829875946044922 + }, + "type" : 2 + }, + { "angle" : 0, "angularVelocity" : 0, @@ -67,86 +118,42 @@ "density" : 1, "filter-groupIndex" : -55, "friction" : 0.2, - "name" : "fixture0", + "name" : "fixture3", "polygon" : { "vertices" : { "x" : [ - 0.1402979493141174, - 0.1375417709350586, - 0.001378186047077179, - -0.1402979493141174, - -0.1402979493141174, - 0.001192390918731689 + 0.07039496302604675, + 0.07039496302604675, + -0.07039486616849899, + -0.07039486616849899 ], "y" : [ - -0.3207050263881683, - 0.4018019437789917, - 0.4018019437789917, - 0.3136067390441895, - -0.3432337343692780, - -0.3689299821853638 + -0.09294389933347702, + 0.1276105940341949, + 0.1276105940341949, + -0.09294389933347702 ] } } } ], "linearVelocity" : 0, - "massData-I" : 0.01047351956367493, + "massData-I" : 0.0001864957448560745, "massData-center" : { - "x" : 0.001456731930375099, - "y" : 0.01425695233047009 + "x" : 4.842877032729120e-08, + "y" : 0.01733334921300411 }, - "massData-mass" : 0.2038488984107971, - "name" : "chest", + "massData-mass" : 0.03105182945728302, + "name" : "lowerRightLeg", "position" : { - "x" : -0.04104747623205185, - "y" : 0.7829875946044922 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "circle" : - { - "center" : - { - "x" : -0.002679032273590565, - "y" : 0.004700660705566406 - }, - "radius" : 0.2268356680870056 - }, - "density" : 0.2204959988594055, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture1" - } - ], - "linearVelocity" : 0, - "massData-I" : 0.0009180362685583532, - "massData-center" : - { - "x" : -0.002679032273590565, - "y" : 0.004700660705566406 - }, - "massData-mass" : 0.03564291819930077, - "name" : "head", - "position" : - { - "x" : 0.009572610259056091, - "y" : 1.462979435920715 + "x" : 0.02818956598639488, + "y" : 0.1036150008440018 }, "type" : 2 }, @@ -169,35 +176,35 @@ { "x" : [ - 0.04693000018596649, - 0.04693000018596649, - -0.04693005979061127, - -0.04693005979061127 + 0.07039505988359451, + 0.07039505988359451, + -0.07039495557546616, + -0.07039495557546616 ], "y" : [ - -0.1159216761589050, - 0.1159217953681946, - 0.1159217953681946, - -0.1159216761589050 + -0.1890522241592407, + 0.1890524625778198, + 0.1890524625778198, + -0.1890522241592407 ] } } } ], "linearVelocity" : 0, - "massData-I" : 0.0001134485355578363, + "massData-I" : 0.000722132739610970, "massData-center" : { - "x" : -2.980232238769531e-08, - "y" : 5.960464477539062e-08 + "x" : 5.215406417846680e-08, + "y" : 1.192092824453539e-07 }, - "massData-mass" : 0.02176084183156490, - "name" : "lowerRightArm", + "massData-mass" : 0.05323336645960808, + "name" : "upperLeftLeg", "position" : { - "x" : 0.09864036738872528, - "y" : 0.6898344159126282 + "x" : -0.06537666171789169, + "y" : 0.3381301760673523 }, "type" : 2 }, @@ -304,57 +311,6 @@ "type" : 2 }, - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.04693000018596649, - 0.04693000018596649, - -0.04693005979061127, - -0.04693005979061127 - ], - "y" : - [ - -0.1895973682403564, - 0.1895966529846191, - 0.1895966529846191, - -0.1895973682403564 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.0004525946278590709, - "massData-center" : - { - "x" : -2.980232238769531e-08, - "y" : -3.576278686523438e-07 - }, - "massData-mass" : 0.03559117391705513, - "name" : "upperRightArm", - "position" : - { - "x" : 0.09864036738872528, - "y" : 0.9068759679794312 - }, - "type" : 2 - }, - { "angle" : 0, "angularVelocity" : 0, @@ -424,35 +380,35 @@ { "x" : [ - 0.07039505988359451, - 0.07039505988359451, - -0.07039495557546616, - -0.07039495557546616 + 0.04693000018596649, + 0.04693000018596649, + -0.04693005979061127, + -0.04693005979061127 ], "y" : [ - -0.1890522241592407, - 0.1890524625778198, - 0.1890524625778198, - -0.1890522241592407 + -0.1895973682403564, + 0.1895966529846191, + 0.1895966529846191, + -0.1895973682403564 ] } } } ], "linearVelocity" : 0, - "massData-I" : 0.000722132739610970, + "massData-I" : 0.0004525946278590709, "massData-center" : { - "x" : 5.215406417846680e-08, - "y" : 1.192092824453539e-07 + "x" : -2.980232238769531e-08, + "y" : -3.576278686523438e-07 }, - "massData-mass" : 0.05323336645960808, - "name" : "upperLeftLeg", + "massData-mass" : 0.03559117391705513, + "name" : "upperRightArm", "position" : { - "x" : -0.06537666171789169, - "y" : 0.3381301760673523 + "x" : 0.09864036738872528, + "y" : 0.9068759679794312 }, "type" : 2 }, @@ -475,35 +431,75 @@ { "x" : [ - 0.07039496302604675, - 0.07039496302604675, - -0.07039486616849899, - -0.07039486616849899 + 0.04693000018596649, + 0.04693000018596649, + -0.04693005979061127, + -0.04693005979061127 ], "y" : [ - -0.09294389933347702, - 0.1276105940341949, - 0.1276105940341949, - -0.09294389933347702 + -0.1159216761589050, + 0.1159217953681946, + 0.1159217953681946, + -0.1159216761589050 ] } } } ], "linearVelocity" : 0, - "massData-I" : 0.0001864957448560745, + "massData-I" : 0.0001134485355578363, "massData-center" : { - "x" : 4.842877032729120e-08, - "y" : 0.01733334921300411 + "x" : -2.980232238769531e-08, + "y" : 5.960464477539062e-08 }, - "massData-mass" : 0.03105182945728302, - "name" : "lowerRightLeg", + "massData-mass" : 0.02176084183156490, + "name" : "lowerRightArm", "position" : { - "x" : 0.02818956598639488, - "y" : 0.1036150008440018 + "x" : 0.09864036738872528, + "y" : 0.6898344159126282 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "circle" : + { + "center" : + { + "x" : -0.01561669446527958, + "y" : 0.004700659774243832 + }, + "radius" : 0.2268356680870056 + }, + "density" : 0.2204959988594055, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture1" + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0009264730615541339, + "massData-center" : + { + "x" : -0.01561669446527958, + "y" : 0.004700659774243832 + }, + "massData-mass" : 0.03564291819930077, + "name" : "head", + "position" : + { + "x" : 0.009572610259056091, + "y" : 1.462979435920715 }, "type" : 2 } @@ -555,181 +551,6 @@ "joint" : [ - { - "anchorA" : - { - "x" : 0.06392270326614380, - "y" : 0.4330990314483643 - }, - "anchorB" : - { - "x" : 0.01330260001122952, - "y" : -0.2468919754028320 - }, - "bodyA" : 1, - "bodyB" : 2, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -0.6981316804885864, - "maxMotorTorque" : 0, - "motorSpeed" : 0, - "name" : "joint9", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 1.221730470657349 - }, - - { - "anchorA" : - { - "x" : 0.0008554458618164062, - "y" : -0.1461489200592041 - }, - "anchorB" : - { - "x" : 0.0008557140827178955, - "y" : 0.07089227437973022 - }, - "bodyA" : 0, - "bodyB" : 5, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -1.919862151145935, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint4", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 0.01745329238474369 - }, - - { - "anchorA" : - { - "x" : 0.0003538504242897034, - "y" : 0.07107692956924438 - }, - "anchorB" : - { - "x" : 0.0003536641597747803, - "y" : -0.1459646224975586 - }, - "bodyA" : 3, - "bodyB" : 6, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -1.919862151145935, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint1", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 0.01745329238474369 - }, - - { - "anchorA" : - { - "x" : 0.001979876309633255, - "y" : -0.1506856828927994 - }, - "anchorB" : - { - "x" : 0.001979988068342209, - "y" : 0.08382888138294220 - }, - "bodyA" : 7, - "bodyB" : 9, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : 0.01745329238474369, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint8", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 2.268928050994873 - }, - - { - "anchorA" : - { - "x" : -0.0007802918553352356, - "y" : -0.1484908312559128 - }, - "anchorB" : - { - "x" : -0.0007800981402397156, - "y" : 0.08614097535610199 - }, - "bodyA" : 8, - "bodyB" : 4, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : 0.01745329238474369, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint7", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 2.268928050994873 - }, - - { - "anchorA" : - { - "x" : -0.09517393261194229, - "y" : 0.2718780040740967 - }, - "anchorB" : - { - "x" : -1.741945743560791e-05, - "y" : 0.1479903459548950 - }, - "bodyA" : 1, - "bodyB" : 0, - "enableLimit" : false, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -2.268928050994873, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint3", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 3.141592741012573 - }, - - { - "anchorA" : - { - "x" : 0.1396137326955795, - "y" : 0.2701327800750732 - }, - "anchorB" : - { - "x" : -7.455050945281982e-05, - "y" : 0.1462446451187134 - }, - "bodyA" : 1, - "bodyB" : 6, - "enableLimit" : false, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -2.268928050994873, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint2", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 3.141592741012573 - }, - { "anchorA" : { @@ -741,8 +562,8 @@ "x" : -0.04493143409490585, "y" : 0.1559127867221832 }, - "bodyA" : 1, - "bodyB" : 8, + "bodyA" : 0, + "bodyB" : 3, "enableLimit" : true, "enableMotor" : false, "jointSpeed" : 0, @@ -766,8 +587,8 @@ "x" : 0.04127830639481544, "y" : 0.1504460573196411 }, - "bodyA" : 1, - "bodyB" : 7, + "bodyA" : 0, + "bodyB" : 6, "enableLimit" : true, "enableMotor" : false, "jointSpeed" : 0, @@ -778,6 +599,181 @@ "refAngle" : 0, "type" : "revolute", "upperLimit" : 1.919862151145935 + }, + + { + "anchorA" : + { + "x" : -0.0007802918553352356, + "y" : -0.1484908312559128 + }, + "anchorB" : + { + "x" : -0.0007800981402397156, + "y" : 0.08614097535610199 + }, + "bodyA" : 3, + "bodyB" : 4, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : 0.01745329238474369, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint7", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 2.268928050994873 + }, + + { + "anchorA" : + { + "x" : 0.001979876309633255, + "y" : -0.1506856828927994 + }, + "anchorB" : + { + "x" : 0.001979988068342209, + "y" : 0.08382888138294220 + }, + "bodyA" : 6, + "bodyB" : 2, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : 0.01745329238474369, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint8", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 2.268928050994873 + }, + + { + "anchorA" : + { + "x" : 0.0003538504242897034, + "y" : 0.07107692956924438 + }, + "anchorB" : + { + "x" : 0.0003536641597747803, + "y" : -0.1459646224975586 + }, + "bodyA" : 8, + "bodyB" : 7, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -1.919862151145935, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint1", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 0 + }, + + { + "anchorA" : + { + "x" : 0.06392270326614380, + "y" : 0.4330990314483643 + }, + "anchorB" : + { + "x" : 0.01330260001122952, + "y" : -0.2468919754028320 + }, + "bodyA" : 0, + "bodyB" : 9, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -0.6981316804885864, + "maxMotorTorque" : 0, + "motorSpeed" : 0, + "name" : "joint9", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 1.221730470657349 + }, + + { + "anchorA" : + { + "x" : 0.1396137326955795, + "y" : 0.2701327800750732 + }, + "anchorB" : + { + "x" : -7.455050945281982e-05, + "y" : 0.1462446451187134 + }, + "bodyA" : 0, + "bodyB" : 7, + "enableLimit" : false, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -2.268928050994873, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint2", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 3.141592741012573 + }, + + { + "anchorA" : + { + "x" : -0.09517393261194229, + "y" : 0.2718780040740967 + }, + "anchorB" : + { + "x" : -1.741945743560791e-05, + "y" : 0.1479903459548950 + }, + "bodyA" : 0, + "bodyB" : 1, + "enableLimit" : false, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -2.268928050994873, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint3", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 3.141592741012573 + }, + + { + "anchorA" : + { + "x" : 0.0008554458618164062, + "y" : -0.1461489200592041 + }, + "anchorB" : + { + "x" : 0.0008557140827178955, + "y" : 0.07089227437973022 + }, + "bodyA" : 1, + "bodyB" : 5, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -1.919862151145935, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint4", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 0.01745329238474369 } ], "positionIterations" : 3, diff --git a/app/Game/Channel/GameController.js b/app/Game/Channel/GameController.js index 571b088..6b3b1db 100755 --- a/app/Game/Channel/GameController.js +++ b/app/Game/Channel/GameController.js @@ -9,10 +9,10 @@ define([ "Game/Channel/Player", "Game/Channel/GameObjects/GameObject", "Game/Channel/GameObjects/Doll", - "Game/Channel/GameObjects/Items/RagDoll" + "Game/Channel/GameObjects/Items/RubeDoll" ], -function (Parent, PhysicsEngine, Settings, PlayerController, requestAnimFrame, Nc, Box2D, Player, GameObject, Doll, RagDoll) { +function (Parent, PhysicsEngine, Settings, PlayerController, requestAnimFrame, Nc, Box2D, Player, GameObject, Doll, RubeDoll) { "use strict"; @@ -172,7 +172,7 @@ function (Parent, PhysicsEngine, Settings, PlayerController, requestAnimFrame, N var objects = []; for (var i = 0; i < this.gameObjects.animated.length; i++) { - if(this.gameObjects.animated[i] instanceof RagDoll) { + if(this.gameObjects.animated[i] instanceof RubeDoll) { var object = this.gameObjects.animated[i]; var options = object.options; options.x = object.getPosition().x; diff --git a/app/Game/Channel/GameObjects/Items/RubeDoll.js b/app/Game/Channel/GameObjects/Items/RubeDoll.js index b810471..dfad73f 100644 --- a/app/Game/Channel/GameObjects/Items/RubeDoll.js +++ b/app/Game/Channel/GameObjects/Items/RubeDoll.js @@ -9,10 +9,20 @@ function (Parent, Settings, Nc) { "use strict"; function RubeDoll(physicsEngine, uid, options) { + this.scheduledForDestruction = false; + this.destructionTimeout = null; + Parent.call(this, physicsEngine, uid, options); } RubeDoll.prototype = Object.create(Parent.prototype); + + RubeDoll.prototype.beingGrabbed = function(player) { + Parent.prototype.beingGrabbed.call(this, player); + if(this.scheduledForDestruction) { + clearTimeout(this.destructionTimeout); + } + }; RubeDoll.prototype.beingReleased = function(player) { Parent.prototype.beingReleased.call(this, player); diff --git a/app/Game/Client/GameObjects/Items/RubeDoll.js b/app/Game/Client/GameObjects/Items/RubeDoll.js index 078fd9a..4075560 100644 --- a/app/Game/Client/GameObjects/Items/RubeDoll.js +++ b/app/Game/Client/GameObjects/Items/RubeDoll.js @@ -93,6 +93,7 @@ function (Parent, Layer, Settings, Nc) { this.limbMeshes = {}; this.baseMeshName = "chest"; this.characterName = "Chuck"; + this.lastFlipDirection = 1; Parent.call(this, physicsEngine, uid, options); } @@ -101,10 +102,8 @@ function (Parent, Layer, Settings, Nc) { RubeDoll.prototype.createMesh = function() { - this.createLimbMesh("lowerRightLeg"); this.createLimbMesh("upperRightLeg"); - this.createLimbMesh("lowerRightArm"); this.createLimbMesh("upperRightArm"); @@ -113,7 +112,6 @@ function (Parent, Layer, Settings, Nc) { this.createLimbMesh("lowerLeftLeg"); this.createLimbMesh("upperLeftLeg"); - this.createLimbMesh("lowerLeftArm"); this.createLimbMesh("upperLeftArm"); @@ -187,6 +185,48 @@ function (Parent, Layer, Settings, Nc) { }; RubeDoll.prototype.flip = function(direction) { + Parent.prototype.flip.call(this, direction); + + if(this.limbs) { + for(var name in this.limbMeshes) { + if(this.limbs[name]) { + Nc.trigger(Nc.ns.client.view.mesh.update, + this.layerId, + this.limbMeshes[name], + { + xScale: direction, + } + ); + } + } + } + + // flipping depth of right body side arm/leg images with left + if (this.lastFlipDirection != direction) { + + this.lastFlipDirection = direction; + + Nc.trigger(Nc.ns.client.view.mesh.swapMeshIndexes, + this.layerId, + this.limbMeshes["lowerRightLeg"], + this.limbMeshes["lowerLeftLeg"] + ); + Nc.trigger(Nc.ns.client.view.mesh.swapMeshIndexes, + this.layerId, + this.limbMeshes["upperRightLeg"], + this.limbMeshes["upperLeftLeg"] + ); + Nc.trigger(Nc.ns.client.view.mesh.swapMeshIndexes, + this.layerId, + this.limbMeshes["lowerRightArm"], + this.limbMeshes["lowerLeftArm"] + ); + Nc.trigger(Nc.ns.client.view.mesh.swapMeshIndexes, + this.layerId, + this.limbMeshes["upperRightArm"], + this.limbMeshes["upperLeftArm"] + ); + } }; return RubeDoll; diff --git a/app/Game/Client/View/LayerManager.js b/app/Game/Client/View/LayerManager.js index 3ad6dea..7adec2f 100644 --- a/app/Game/Client/View/LayerManager.js +++ b/app/Game/Client/View/LayerManager.js @@ -20,7 +20,8 @@ function (Nc, Exception, Layer) { Nc.on(Nc.ns.client.view.mesh.remove, this.removeMesh, this), Nc.on(Nc.ns.client.view.mesh.update, this.updateMesh, this), Nc.on(Nc.ns.client.view.mesh.addFilter, this.addFilter, this), - Nc.on(Nc.ns.client.view.mesh.removeFilter, this.removeFilter, this) + Nc.on(Nc.ns.client.view.mesh.removeFilter, this.removeFilter, this), + Nc.on(Nc.ns.client.view.mesh.swapMeshIndexes, this.swapMeshIndexes, this) ]; } @@ -157,6 +158,11 @@ function (Nc, Exception, Layer) { this.delegate.apply(this, arguments); }; + LayerManager.prototype.swapMeshIndexes = function() { + Array.prototype.splice.call(arguments, 0, 0, 'swapMeshIndexes') + this.delegate.apply(this, arguments); + }; + LayerManager.prototype.destroy = function() { for (var i = 0; i < this.ncTokens.length; i++) { Nc.off(this.ncTokens[i]); diff --git a/app/Game/Client/View/Pixi/Layer.js b/app/Game/Client/View/Pixi/Layer.js index acd0f98..58a0fd8 100644 --- a/app/Game/Client/View/Pixi/Layer.js +++ b/app/Game/Client/View/Pixi/Layer.js @@ -95,6 +95,14 @@ function (Parent, PIXI, ColorRangeReplaceFilter, Settings, ColorConverter, Nc) { this.container.removeChild(mesh); }; + Layer.prototype.swapMeshIndexes = function(meshA, meshB) { + var indexA = this.container.getChildIndex(meshA); + var indexB = this.container.getChildIndex(meshB); + + this.container.setChildIndex(meshA, indexB); + this.container.setChildIndex(meshB, indexA); + }; + Layer.prototype.createMesh = function (texturePath, callback, options) { var texture = (options && options.fromFrame) diff --git a/app/Game/Core/GameObjects/Doll.js b/app/Game/Core/GameObjects/Doll.js index 8090fb8..7dd7780 100755 --- a/app/Game/Core/GameObjects/Doll.js +++ b/app/Game/Core/GameObjects/Doll.js @@ -40,7 +40,7 @@ function (Parent, Exception, Box2D, Settings, CollisionDetector, Item, Nc, Asser this.holdingJoint = null; this.holdingItem = null; - this.ragDoll = {head: null, body: null}; + this.ragDoll = {head: null, body: null}; // FIXME: wtf is this? can we remove it? this.createFixtures(); this.body.SetActive(false); diff --git a/app/Game/Core/GameObjects/Items/RubeDoll.js b/app/Game/Core/GameObjects/Items/RubeDoll.js index ea5b6c0..eeca209 100644 --- a/app/Game/Core/GameObjects/Items/RubeDoll.js +++ b/app/Game/Core/GameObjects/Items/RubeDoll.js @@ -18,10 +18,27 @@ function (Parent, RubeLoader, Box2D, Settings, Assert, Nc, RubeDollJson) { this.rubeLoader = null; this.body = null; this.limbs = {}; + this.joints = null; + this.limits = []; var chest = null; var world = physicsEngine.getWorld(); this.rubeLoader = new RubeLoader(RubeDollJson, world); + + this.loadRubeDollFromScene(options); + + Parent.call(this, physicsEngine, uid, options); + world.DestroyBody(this.body); + this.body = this.limbs.chest; + + this.body.SetUserData(this); + + this.flip(options.direction); + } + + RubeDoll.prototype = Object.create(Parent.prototype); + + RubeDoll.prototype.loadRubeDollFromScene = function(options) { var scene = this.rubeLoader.getScene(); for (var i in scene.bodies) { @@ -35,19 +52,17 @@ function (Parent, RubeLoader, Box2D, Settings, Assert, Nc, RubeDollJson) { this.limbs[body.name] = body; } - Parent.call(this, physicsEngine, uid, options); - world.DestroyBody(this.body); - this.body = this.limbs.chest; + this.joints = scene.joints; - var def = this.body.GetDefinition(); - def.userData = this; - this.body.SetUserData(this); - } - - RubeDoll.prototype = Object.create(Parent.prototype); + for (var i in this.joints) { + this.limits[i] = { + lower: this.joints[i].GetLowerLimit(), + upper: this.joints[i].GetUpperLimit(), + }; + } + }; RubeDoll.prototype.getFixtureDef = function() { - var fixtureDef = new Box2D.Dynamics.b2FixtureDef(); fixtureDef.shape = new Box2D.Collision.Shapes.b2CircleShape(); return fixtureDef; @@ -55,7 +70,28 @@ function (Parent, RubeLoader, Box2D, Settings, Assert, Nc, RubeDollJson) { RubeDoll.prototype.flip = function(direction) { Parent.prototype.flip.call(this, direction); - // Extend + + for (var i in this.joints) { + var joint = this.joints[i]; + var limits = this.limits[i]; + + if (joint instanceof Box2D.Dynamics.Joints.b2RevoluteJoint) { + + if (direction > 0) { + joint.SetLimits(limits.lower, limits.upper); + continue; + } + + var a1 = limits.lower * -1; + var a2 = limits.upper * -1; + + if (a2 > a1) { + joint.SetLimits(a1, a2); + } else { + joint.SetLimits(a2, a1); + } + } + } }; RubeDoll.prototype.reposition = function(handPosition, direction) { diff --git a/app/Game/Core/Player.js b/app/Game/Core/Player.js index 67b492b..d40a748 100755 --- a/app/Game/Core/Player.js +++ b/app/Game/Core/Player.js @@ -129,22 +129,23 @@ function (Doll, Settings, Nc, Exception, ColorConverter, SpectatorDoll, RubeDoll image: "chest.png", name: "RagDoll", rotation: 0, - type: "ragdoll", + type: "rubedoll", weight: 3, width: 5, height: 12, - primaryColor: primaryColor + primaryColor: primaryColor, + direction: this.doll.lookDirection }; - var ragDoll = new RubeDoll(this.physicsEngine, "ragDoll-" + this.id + "-" + ragDollId, options); - ragDoll.setVelocities(this.doll.getVelocities()); + var rubeDoll = new RubeDoll(this.physicsEngine, "rubeDoll-" + this.id + "-" + ragDollId, options); + rubeDoll.setVelocities(this.doll.getVelocities()); this.spawned = false; this.doll.destroy(); this.doll = null; - this.ragDoll = ragDoll; + this.ragDoll = rubeDoll; }; Player.prototype.update = function () { diff --git a/app/Lib/Utilities/NotificationCenter.js b/app/Lib/Utilities/NotificationCenter.js index 33f8eb7..ec4beb3 100755 --- a/app/Lib/Utilities/NotificationCenter.js +++ b/app/Lib/Utilities/NotificationCenter.js @@ -41,7 +41,8 @@ function (Exception) { remove: null, update: null, addFilter: null, - removeFilter: null + removeFilter: null, + swapMeshIndexes: null }, animatedMesh: { create: null diff --git a/app/Lib/Vendor/RubeLoader.js b/app/Lib/Vendor/RubeLoader.js index 2b6d5a1..b1f3b83 100644 --- a/app/Lib/Vendor/RubeLoader.js +++ b/app/Lib/Vendor/RubeLoader.js @@ -426,7 +426,7 @@ function (Box2D) { var scene = { bodies: loadedBodies, - // joints: loadedJoints + joints: loadedJoints }; return scene; diff --git a/static/items/rube/ragdoll.rube b/static/items/rube/ragdoll.rube index b7f646a..5a3b727 100644 --- a/static/items/rube/ragdoll.rube +++ b/static/items/rube/ragdoll.rube @@ -482,18 +482,18 @@ ], "vertices" : { - "x" : [ -0.002679032273590565 ], - "y" : [ 0.004700660705566406 ] + "x" : [ -0.01561669446527958 ], + "y" : [ 0.004700659774243832 ] } } ], "id" : 8, "linearVelocity" : 0, - "massData-I" : 0.0009180362685583532, + "massData-I" : 0.0009264730615541339, "massData-center" : { - "x" : -0.002679032273590565, - "y" : 0.004700660705566406 + "x" : -0.01561669446527958, + "y" : 0.004700659774243832 }, "massData-mass" : 0.03564291819930077, "name" : "head", @@ -516,8 +516,8 @@ "density" : 1, "filter-groupIndex" : -55, "friction" : 0.2, - "id" : 13, - "name" : "fixture0", + "id" : 11, + "name" : "fixture2", "shapes" : [ @@ -529,34 +529,30 @@ { "x" : [ - 0.1402979493141174, - 0.1375417709350586, - 0.001378186047077179, - -0.1402979493141174, - -0.1402979493141174, - 0.001192390918731689 + -0.1156365871429443, + 0.1570904254913330, + 0.1570904254913330, + -0.1156365871429443 ], "y" : [ - -0.3207050263881683, - 0.4018019437789917, - 0.4018019437789917, - 0.3136067390441895, - -0.3432337343692780, - -0.3689299821853638 + -0.3584164977073669, + -0.3584164977073669, + 0.4034895300865173, + 0.4034895300865173 ] } } ], "id" : 9, "linearVelocity" : 0, - "massData-I" : 0.01047351956367493, + "massData-I" : 0.01153474207967520, "massData-center" : { - "x" : 0.001456731930375099, - "y" : 0.01425695233047009 + "x" : 0.02072691917419434, + "y" : 0.02253651618957520 }, - "massData-mass" : 0.2038488984107971, + "massData-mass" : 0.2077923566102982, "name" : "chest", "position" : { @@ -701,7 +697,7 @@ "name" : "joint1", "referenceAngle" : 0, "type" : "revolute", - "upperLimit" : 0.01745329238474369 + "upperLimit" : 0 }, { @@ -747,13 +743,13 @@ "enableLimit" : true, "enableMotor" : false, "id" : 5, - "lowerLimit" : -0.6981316804885864, + "lowerLimit" : -0.7853981852531433, "maxMotorTorque" : 1, "motorSpeed" : 0, "name" : "joint6", "referenceAngle" : 0, "type" : "revolute", - "upperLimit" : 1.919862151145935 + "upperLimit" : 1.570796370506287 }, { @@ -773,13 +769,13 @@ "enableLimit" : true, "enableMotor" : false, "id" : 6, - "lowerLimit" : -0.6981316804885864, + "lowerLimit" : -0.7853981852531433, "maxMotorTorque" : 1, "motorSpeed" : 0, "name" : "joint5", "referenceAngle" : 0, "type" : "revolute", - "upperLimit" : 1.919862151145935 + "upperLimit" : 1.570796370506287 }, { From 413f5424c23310946edf722b9ba9a659870c7857 Mon Sep 17 00:00:00 2001 From: logsol Date: Mon, 4 May 2015 14:01:23 +0200 Subject: [PATCH 10/14] added setting to switch off pointer lock filter --- app/Game/Client/View/Pixi/View.js | 5 ++++- app/Game/Config/Settings.js | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Game/Client/View/Pixi/View.js b/app/Game/Client/View/Pixi/View.js index d191bae..62c2fc5 100755 --- a/app/Game/Client/View/Pixi/View.js +++ b/app/Game/Client/View/Pixi/View.js @@ -121,7 +121,8 @@ function (Parent, DomController, PIXI, Settings, Nc, Exception, GameStats, Layer } PixiView.prototype.initPointerLockView = function() { - + if (!Settings.ENABLE_POINTER_LOCK_FILTER) return; + var blurFilter = new PIXI.BlurFilter(); blurFilter.blurX = 42 * this.currentZoom; blurFilter.blurY = 42 * this.currentZoom; @@ -139,6 +140,8 @@ function (Parent, DomController, PIXI, Settings, Nc, Exception, GameStats, Layer }; PixiView.prototype.onPointerLockChange = function(isLocked, options) { + if (!Settings.ENABLE_POINTER_LOCK_FILTER) return; + if(isLocked) { this.container.filters = null; this.clickToEnable.visible = false; diff --git a/app/Game/Config/Settings.js b/app/Game/Config/Settings.js index 4e93113..0771d84 100755 --- a/app/Game/Config/Settings.js +++ b/app/Game/Config/Settings.js @@ -39,6 +39,7 @@ function () { VIEW_CONTROLLER: 0 ? "Three" : "Pixi", ARROW_GLIDE: 30, // % of the way per frame SHOW_LAYER_INFO: false, + ENABLE_POINTER_LOCK_FILTER: false, // GAME PLAY WALK_SPEED: 4, From 8da2d48643d18250e6d96573d3d6d486ed0e8659 Mon Sep 17 00:00:00 2001 From: logsol Date: Mon, 4 May 2015 14:02:53 +0200 Subject: [PATCH 11/14] centered rubedoll head --- app/Game/Asset/RubeDoll.json | 942 ++++++++++++++++----------------- static/items/rube/ragdoll.rube | 72 +-- 2 files changed, 507 insertions(+), 507 deletions(-) diff --git a/app/Game/Asset/RubeDoll.json b/app/Game/Asset/RubeDoll.json index 37e4c0e..6f526a2 100644 --- a/app/Game/Asset/RubeDoll.json +++ b/app/Game/Asset/RubeDoll.json @@ -5,57 +5,6 @@ "body" : [ - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture2", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.1570904254913330, - 0.1570904254913330, - -0.1156365871429443, - -0.1156365871429443 - ], - "y" : - [ - -0.3584164977073669, - 0.4034895300865173, - 0.4034895300865173, - -0.3584164977073669 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.01153474207967520, - "massData-center" : - { - "x" : 0.02072691917419434, - "y" : 0.02253651618957520 - }, - "massData-mass" : 0.2077923566102982, - "name" : "chest", - "position" : - { - "x" : -0.04104747623205185, - "y" : 0.7829875946044922 - }, - "type" : 2 - }, - { "angle" : 0, "angularVelocity" : 0, @@ -101,8 +50,8 @@ "name" : "upperLeftArm", "position" : { - "x" : -0.1362041532993317, - "y" : 0.9068759679794312 + "x" : -0.1165364086627960, + "y" : 0.9012566804885864 }, "type" : 2 }, @@ -118,42 +67,42 @@ "density" : 1, "filter-groupIndex" : -55, "friction" : 0.2, - "name" : "fixture3", + "name" : "fixture2", "polygon" : { "vertices" : { "x" : [ - 0.07039496302604675, - 0.07039496302604675, - -0.07039486616849899, - -0.07039486616849899 + 0.1570899933576584, + 0.1570899933576584, + -0.1156369969248772, + -0.1156369969248772 ], "y" : [ - -0.09294389933347702, - 0.1276105940341949, - 0.1276105940341949, - -0.09294389933347702 + -0.3584159910678864, + 0.4034900069236755, + 0.4034900069236755, + -0.3584159910678864 ] } } } ], "linearVelocity" : 0, - "massData-I" : 0.0001864957448560745, + "massData-I" : 0.01153474114835262, "massData-center" : { - "x" : 4.842877032729120e-08, - "y" : 0.01733334921300411 + "x" : 0.02072649449110031, + "y" : 0.02253700792789459 }, - "massData-mass" : 0.03105182945728302, - "name" : "lowerRightLeg", + "massData-mass" : 0.2077923268079758, + "name" : "chest", "position" : { - "x" : 0.02818956598639488, - "y" : 0.1036150008440018 + "x" : -0.02137973159551620, + "y" : 0.7773683071136475 }, "type" : 2 }, @@ -166,249 +115,34 @@ [ { - "density" : 1, + "circle" : + { + "center" : + { + "x" : -0.01561669446527958, + "y" : 0.004700659774243832 + }, + "radius" : 0.2268356680870056 + }, + "density" : 0.2204959988594055, "filter-groupIndex" : -55, "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.07039505988359451, - 0.07039505988359451, - -0.07039495557546616, - -0.07039495557546616 - ], - "y" : - [ - -0.1890522241592407, - 0.1890524625778198, - 0.1890524625778198, - -0.1890522241592407 - ] - } - } + "name" : "fixture1" } ], "linearVelocity" : 0, - "massData-I" : 0.000722132739610970, + "massData-I" : 0.0009264730615541339, "massData-center" : { - "x" : 5.215406417846680e-08, - "y" : 1.192092824453539e-07 + "x" : -0.01561669446527958, + "y" : 0.004700659774243832 }, - "massData-mass" : 0.05323336645960808, - "name" : "upperLeftLeg", + "massData-mass" : 0.03564291819930077, + "name" : "head", "position" : { - "x" : -0.06537666171789169, - "y" : 0.3381301760673523 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.07039503753185272, - 0.07039503753185272, - -0.07039495557546616, - -0.07039495557546616 - ], - "y" : - [ - -0.09294363856315613, - 0.1277718394994736, - 0.1277718394994736, - -0.09294363856315613 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.0001869033440016210, - "massData-center" : - { - "x" : 4.097818973036738e-08, - "y" : 0.01741409860551357 - }, - "massData-mass" : 0.03107452951371670, - "name" : "lowerLeftLeg", - "position" : - { - "x" : -0.06537666171789169, - "y" : 0.1036150008440018 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.04693000763654709, - 0.04693000763654709, - -0.04692991077899933, - -0.04692991077899933 - ], - "y" : - [ - -0.1159216761589050, - 0.1159217953681946, - 0.1159217953681946, - -0.1159216761589050 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.0001134483172791079, - "massData-center" : - { - "x" : 4.842877032729120e-08, - "y" : 5.960464477539062e-08 - }, - "massData-mass" : 0.02176081016659737, - "name" : "lowerLeftArm", - "position" : - { - "x" : -0.1362059414386749, - "y" : 0.6898344159126282 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.07039496302604675, - 0.07039496302604675, - -0.07039486616849899, - -0.07039486616849899 - ], - "y" : - [ - -0.1890522241592407, - 0.1890524625778198, - 0.1890524625778198, - -0.1890522241592407 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.0007221315754577518, - "massData-center" : - { - "x" : 4.842877388000488e-08, - "y" : 1.192092895507812e-07 - }, - "massData-mass" : 0.05323329567909241, - "name" : "upperRightLeg", - "position" : - { - "x" : 0.02818956598639488, - "y" : 0.3381301760673523 - }, - "type" : 2 - }, - - { - "angle" : 0, - "angularVelocity" : 0, - "awake" : true, - "fixture" : - [ - - { - "density" : 1, - "filter-groupIndex" : -55, - "friction" : 0.2, - "name" : "fixture3", - "polygon" : - { - "vertices" : - { - "x" : - [ - 0.04693000018596649, - 0.04693000018596649, - -0.04693005979061127, - -0.04693005979061127 - ], - "y" : - [ - -0.1895973682403564, - 0.1895966529846191, - 0.1895966529846191, - -0.1895973682403564 - ] - } - } - } - ], - "linearVelocity" : 0, - "massData-I" : 0.0004525946278590709, - "massData-center" : - { - "x" : -2.980232238769531e-08, - "y" : -3.576278686523438e-07 - }, - "massData-mass" : 0.03559117391705513, - "name" : "upperRightArm", - "position" : - { - "x" : 0.09864036738872528, - "y" : 0.9068759679794312 + "x" : 0.02309736609458923, + "y" : 1.497289657592773 }, "type" : 2 }, @@ -458,8 +192,8 @@ "name" : "lowerRightArm", "position" : { - "x" : 0.09864036738872528, - "y" : 0.6898344159126282 + "x" : 0.1183081120252609, + "y" : 0.6842151284217834 }, "type" : 2 }, @@ -472,34 +206,300 @@ [ { - "circle" : - { - "center" : - { - "x" : -0.01561669446527958, - "y" : 0.004700659774243832 - }, - "radius" : 0.2268356680870056 - }, - "density" : 0.2204959988594055, + "density" : 1, "filter-groupIndex" : -55, "friction" : 0.2, - "name" : "fixture1" + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.07039503753185272, + 0.07039503753185272, + -0.07039495557546616, + -0.07039495557546616 + ], + "y" : + [ + -0.09294363856315613, + 0.1277718394994736, + 0.1277718394994736, + -0.09294363856315613 + ] + } + } } ], "linearVelocity" : 0, - "massData-I" : 0.0009264730615541339, + "massData-I" : 0.0001869033440016210, "massData-center" : { - "x" : -0.01561669446527958, - "y" : 0.004700659774243832 + "x" : 4.097818973036738e-08, + "y" : 0.01741409860551357 }, - "massData-mass" : 0.03564291819930077, - "name" : "head", + "massData-mass" : 0.03107452951371670, + "name" : "lowerLeftLeg", "position" : { - "x" : 0.009572610259056091, - "y" : 1.462979435920715 + "x" : -0.04570891708135605, + "y" : 0.09799571335315704 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.04693000763654709, + 0.04693000763654709, + -0.04692991077899933, + -0.04692991077899933 + ], + "y" : + [ + -0.1159216761589050, + 0.1159217953681946, + 0.1159217953681946, + -0.1159216761589050 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0001134483172791079, + "massData-center" : + { + "x" : 4.842877032729120e-08, + "y" : 5.960464477539062e-08 + }, + "massData-mass" : 0.02176081016659737, + "name" : "lowerLeftArm", + "position" : + { + "x" : -0.1165381968021393, + "y" : 0.6842151284217834 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.04693000018596649, + 0.04693000018596649, + -0.04693005979061127, + -0.04693005979061127 + ], + "y" : + [ + -0.1895973682403564, + 0.1895966529846191, + 0.1895966529846191, + -0.1895973682403564 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0004525946278590709, + "massData-center" : + { + "x" : -2.980232238769531e-08, + "y" : -3.576278686523438e-07 + }, + "massData-mass" : 0.03559117391705513, + "name" : "upperRightArm", + "position" : + { + "x" : 0.1183081120252609, + "y" : 0.9012566804885864 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.07039496302604675, + 0.07039496302604675, + -0.07039486616849899, + -0.07039486616849899 + ], + "y" : + [ + -0.1890522241592407, + 0.1890524625778198, + 0.1890524625778198, + -0.1890522241592407 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0007221315754577518, + "massData-center" : + { + "x" : 4.842877388000488e-08, + "y" : 1.192092895507812e-07 + }, + "massData-mass" : 0.05323329567909241, + "name" : "upperRightLeg", + "position" : + { + "x" : 0.04785731062293053, + "y" : 0.3325108885765076 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.07039505988359451, + 0.07039505988359451, + -0.07039495557546616, + -0.07039495557546616 + ], + "y" : + [ + -0.1890522241592407, + 0.1890524625778198, + 0.1890524625778198, + -0.1890522241592407 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.000722132739610970, + "massData-center" : + { + "x" : 5.215406417846680e-08, + "y" : 1.192092824453539e-07 + }, + "massData-mass" : 0.05323336645960808, + "name" : "upperLeftLeg", + "position" : + { + "x" : -0.04570891708135605, + "y" : 0.3325108885765076 + }, + "type" : 2 + }, + + { + "angle" : 0, + "angularVelocity" : 0, + "awake" : true, + "fixture" : + [ + + { + "density" : 1, + "filter-groupIndex" : -55, + "friction" : 0.2, + "name" : "fixture3", + "polygon" : + { + "vertices" : + { + "x" : + [ + 0.07039496302604675, + 0.07039496302604675, + -0.07039486616849899, + -0.07039486616849899 + ], + "y" : + [ + -0.09294389933347702, + 0.1276105940341949, + 0.1276105940341949, + -0.09294389933347702 + ] + } + } + } + ], + "linearVelocity" : 0, + "massData-I" : 0.0001864957448560745, + "massData-center" : + { + "x" : 4.842877032729120e-08, + "y" : 0.01733334921300411 + }, + "massData-mass" : 0.03105182945728302, + "name" : "lowerRightLeg", + "position" : + { + "x" : 0.04785731062293053, + "y" : 0.09799571335315704 }, "type" : 2 } @@ -554,144 +554,19 @@ { "anchorA" : { - "x" : -0.06799929589033127, - "y" : -0.2890855073928833 + "x" : 0.02210754156112671, + "y" : 0.4607425928115845 }, "anchorB" : { - "x" : -0.04493143409490585, - "y" : 0.1559127867221832 + "x" : -0.02544101513922215, + "y" : -0.2591779232025146 }, - "bodyA" : 0, - "bodyB" : 3, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -0.6981316804885864, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint6", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 1.919862151145935 - }, - - { - "anchorA" : - { - "x" : 0.1116365119814873, - "y" : -0.2944114208221436 - }, - "anchorB" : - { - "x" : 0.04127830639481544, - "y" : 0.1504460573196411 - }, - "bodyA" : 0, - "bodyB" : 6, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -0.6981316804885864, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint5", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 1.919862151145935 - }, - - { - "anchorA" : - { - "x" : -0.0007802918553352356, - "y" : -0.1484908312559128 - }, - "anchorB" : - { - "x" : -0.0007800981402397156, - "y" : 0.08614097535610199 - }, - "bodyA" : 3, - "bodyB" : 4, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : 0.01745329238474369, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint7", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 2.268928050994873 - }, - - { - "anchorA" : - { - "x" : 0.001979876309633255, - "y" : -0.1506856828927994 - }, - "anchorB" : - { - "x" : 0.001979988068342209, - "y" : 0.08382888138294220 - }, - "bodyA" : 6, + "bodyA" : 1, "bodyB" : 2, "enableLimit" : true, "enableMotor" : false, "jointSpeed" : 0, - "lowerLimit" : 0.01745329238474369, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint8", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 2.268928050994873 - }, - - { - "anchorA" : - { - "x" : 0.0003538504242897034, - "y" : 0.07107692956924438 - }, - "anchorB" : - { - "x" : 0.0003536641597747803, - "y" : -0.1459646224975586 - }, - "bodyA" : 8, - "bodyB" : 7, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -1.919862151145935, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint1", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 0 - }, - - { - "anchorA" : - { - "x" : 0.06392270326614380, - "y" : 0.4330990314483643 - }, - "anchorB" : - { - "x" : 0.01330260001122952, - "y" : -0.2468919754028320 - }, - "bodyA" : 0, - "bodyB" : 9, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, "lowerLimit" : -0.6981316804885864, "maxMotorTorque" : 0, "motorSpeed" : 0, @@ -704,32 +579,32 @@ { "anchorA" : { - "x" : 0.1396137326955795, - "y" : 0.2701327800750732 + "x" : 0.0008554458618164062, + "y" : -0.1461489200592041 }, "anchorB" : { - "x" : -7.455050945281982e-05, - "y" : 0.1462446451187134 + "x" : 0.0008557140827178955, + "y" : 0.07089227437973022 }, "bodyA" : 0, - "bodyB" : 7, - "enableLimit" : false, + "bodyB" : 5, + "enableLimit" : true, "enableMotor" : false, "jointSpeed" : 0, - "lowerLimit" : -2.268928050994873, + "lowerLimit" : -1.919862151145935, "maxMotorTorque" : 1, "motorSpeed" : 0, - "name" : "joint2", + "name" : "joint4", "refAngle" : 0, "type" : "revolute", - "upperLimit" : 3.141592741012573 + "upperLimit" : 0.01745329238474369 }, { "anchorA" : { - "x" : -0.09517393261194229, + "x" : -0.09517394006252289, "y" : 0.2718780040740967 }, "anchorB" : @@ -737,8 +612,8 @@ "x" : -1.741945743560791e-05, "y" : 0.1479903459548950 }, - "bodyA" : 0, - "bodyB" : 1, + "bodyA" : 1, + "bodyB" : 0, "enableLimit" : false, "enableMotor" : false, "jointSpeed" : 0, @@ -754,26 +629,151 @@ { "anchorA" : { - "x" : 0.0008554458618164062, - "y" : -0.1461489200592041 + "x" : 0.1116365119814873, + "y" : -0.2944114208221436 }, "anchorB" : { - "x" : 0.0008557140827178955, - "y" : 0.07089227437973022 + "x" : 0.04127830639481544, + "y" : 0.1504460573196411 }, "bodyA" : 1, - "bodyB" : 5, + "bodyB" : 7, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -0.7853981852531433, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint5", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 1.570796370506287 + }, + + { + "anchorA" : + { + "x" : -0.06799929589033127, + "y" : -0.2890855073928833 + }, + "anchorB" : + { + "x" : -0.04493143409490585, + "y" : 0.1559127867221832 + }, + "bodyA" : 1, + "bodyB" : 8, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -0.7853981852531433, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint6", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 1.570796370506287 + }, + + { + "anchorA" : + { + "x" : 0.1396137326955795, + "y" : 0.2701327800750732 + }, + "anchorB" : + { + "x" : -7.455050945281982e-05, + "y" : 0.1462446451187134 + }, + "bodyA" : 1, + "bodyB" : 6, + "enableLimit" : false, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -2.268928050994873, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint2", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 3.141592741012573 + }, + + { + "anchorA" : + { + "x" : 0.0003538504242897034, + "y" : 0.07107692956924438 + }, + "anchorB" : + { + "x" : 0.0003536641597747803, + "y" : -0.1459646224975586 + }, + "bodyA" : 3, + "bodyB" : 6, "enableLimit" : true, "enableMotor" : false, "jointSpeed" : 0, "lowerLimit" : -1.919862151145935, "maxMotorTorque" : 1, "motorSpeed" : 0, - "name" : "joint4", + "name" : "joint1", "refAngle" : 0, "type" : "revolute", - "upperLimit" : 0.01745329238474369 + "upperLimit" : 0 + }, + + { + "anchorA" : + { + "x" : 0.001979876309633255, + "y" : -0.1506856828927994 + }, + "anchorB" : + { + "x" : 0.001979988068342209, + "y" : 0.08382888138294220 + }, + "bodyA" : 7, + "bodyB" : 9, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : 0.01745329238474369, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint8", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 2.268928050994873 + }, + + { + "anchorA" : + { + "x" : -0.0007802955806255341, + "y" : -0.1484908312559128 + }, + "anchorB" : + { + "x" : -0.0007801018655300140, + "y" : 0.08614097535610199 + }, + "bodyA" : 8, + "bodyB" : 4, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : 0.01745329238474369, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint7", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 2.268928050994873 } ], "positionIterations" : 3, diff --git a/static/items/rube/ragdoll.rube b/static/items/rube/ragdoll.rube index 5a3b727..7024172 100644 --- a/static/items/rube/ragdoll.rube +++ b/static/items/rube/ragdoll.rube @@ -111,8 +111,8 @@ "name" : "lowerRightLeg", "position" : { - "x" : 0.02818956598639488, - "y" : 0.1036150008440018 + "x" : 0.04785731062293053, + "y" : 0.09799571335315704 }, "type" : "dynamic" }, @@ -168,8 +168,8 @@ "name" : "upperLeftLeg", "position" : { - "x" : -0.06537666171789169, - "y" : 0.3381301760673523 + "x" : -0.04570891708135605, + "y" : 0.3325108885765076 }, "type" : "dynamic" }, @@ -225,8 +225,8 @@ "name" : "upperRightLeg", "position" : { - "x" : 0.02818956598639488, - "y" : 0.3381301760673523 + "x" : 0.04785731062293053, + "y" : 0.3325108885765076 }, "type" : "dynamic" }, @@ -282,8 +282,8 @@ "name" : "upperRightArm", "position" : { - "x" : 0.09864036738872528, - "y" : 0.9068759679794312 + "x" : 0.1183081120252609, + "y" : 0.9012566804885864 }, "type" : "dynamic" }, @@ -339,8 +339,8 @@ "name" : "lowerLeftArm", "position" : { - "x" : -0.1362059414386749, - "y" : 0.6898344159126282 + "x" : -0.1165381968021393, + "y" : 0.6842151284217834 }, "type" : "dynamic" }, @@ -396,8 +396,8 @@ "name" : "lowerLeftLeg", "position" : { - "x" : -0.06537666171789169, - "y" : 0.1036150008440018 + "x" : -0.04570891708135605, + "y" : 0.09799571335315704 }, "type" : "dynamic" }, @@ -453,8 +453,8 @@ "name" : "lowerRightArm", "position" : { - "x" : 0.09864036738872528, - "y" : 0.6898344159126282 + "x" : 0.1183081120252609, + "y" : 0.6842151284217834 }, "type" : "dynamic" }, @@ -499,8 +499,8 @@ "name" : "head", "position" : { - "x" : 0.009572610259056091, - "y" : 1.462979435920715 + "x" : 0.02309736609458923, + "y" : 1.497289657592773 }, "type" : "dynamic" }, @@ -529,35 +529,35 @@ { "x" : [ - -0.1156365871429443, - 0.1570904254913330, - 0.1570904254913330, - -0.1156365871429443 + -0.1156369969248772, + 0.1570899933576584, + 0.1570899933576584, + -0.1156369969248772 ], "y" : [ - -0.3584164977073669, - -0.3584164977073669, - 0.4034895300865173, - 0.4034895300865173 + -0.3584159910678864, + -0.3584159910678864, + 0.4034900069236755, + 0.4034900069236755 ] } } ], "id" : 9, "linearVelocity" : 0, - "massData-I" : 0.01153474207967520, + "massData-I" : 0.01153474114835262, "massData-center" : { - "x" : 0.02072691917419434, - "y" : 0.02253651618957520 + "x" : 0.02072649449110031, + "y" : 0.02253700792789459 }, - "massData-mass" : 0.2077923566102982, + "massData-mass" : 0.2077923268079758, "name" : "chest", "position" : { - "x" : -0.04104747623205185, - "y" : 0.7829875946044922 + "x" : -0.02137973159551620, + "y" : 0.7773683071136475 }, "type" : "dynamic" }, @@ -613,8 +613,8 @@ "name" : "upperLeftArm", "position" : { - "x" : -0.1362041532993317, - "y" : 0.9068759679794312 + "x" : -0.1165364086627960, + "y" : 0.9012566804885864 }, "type" : "dynamic" } @@ -833,13 +833,13 @@ { "anchorA" : { - "x" : 0.06392270326614380, - "y" : 0.4330990016460419 + "x" : 0.02210754156112671, + "y" : 0.4607425630092621 }, "anchorB" : { - "x" : 0.01330260001122952, - "y" : -0.2468920052051544 + "x" : -0.02544101513922215, + "y" : -0.2591779530048370 }, "bodyA" : 9, "bodyB" : 8, From 1db8de34dffdb5dead9f8fd7a24c04825881f565 Mon Sep 17 00:00:00 2001 From: logsol Date: Wed, 6 May 2015 20:11:12 +0200 Subject: [PATCH 12/14] added possibility to not debug-draw sensor shapes --- app/Lib/Vendor/Box2D.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Lib/Vendor/Box2D.js b/app/Lib/Vendor/Box2D.js index 0e1e7c5..760681d 100755 --- a/app/Lib/Vendor/Box2D.js +++ b/app/Lib/Vendor/Box2D.js @@ -6006,6 +6006,10 @@ Box2D.postDefs = []; xf = b.m_xf; for (f = b.GetFixtureList(); f; f = f.m_next) { + // Disable drawing sensors by removing false || + if (false || f.IsSensor()) { + continue; + } s = f.GetShape(); if (b.IsActive() == false) { color.Set(0.5, 0.5, 0.3); From ec7ce459cb3d076ac2b67cce8eec15ad93a9b09c Mon Sep 17 00:00:00 2001 From: logsol Date: Wed, 6 May 2015 20:13:13 +0200 Subject: [PATCH 13/14] added swapMeshes method to swap textures of 2 meshes --- app/Game/Client/View/LayerManager.js | 8 +++++++- app/Game/Client/View/Pixi/Layer.js | 16 ++++++++++++++++ app/Lib/Utilities/NotificationCenter.js | 3 ++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/Game/Client/View/LayerManager.js b/app/Game/Client/View/LayerManager.js index 7adec2f..8245e3f 100644 --- a/app/Game/Client/View/LayerManager.js +++ b/app/Game/Client/View/LayerManager.js @@ -21,7 +21,8 @@ function (Nc, Exception, Layer) { Nc.on(Nc.ns.client.view.mesh.update, this.updateMesh, this), Nc.on(Nc.ns.client.view.mesh.addFilter, this.addFilter, this), Nc.on(Nc.ns.client.view.mesh.removeFilter, this.removeFilter, this), - Nc.on(Nc.ns.client.view.mesh.swapMeshIndexes, this.swapMeshIndexes, this) + Nc.on(Nc.ns.client.view.mesh.swapMeshIndexes, this.swapMeshIndexes, this), + Nc.on(Nc.ns.client.view.mesh.swapMeshes, this.swapMeshes, this) ]; } @@ -163,6 +164,11 @@ function (Nc, Exception, Layer) { this.delegate.apply(this, arguments); }; + LayerManager.prototype.swapMeshes = function() { + Array.prototype.splice.call(arguments, 0, 0, 'swapMeshes') + this.delegate.apply(this, arguments); + }; + LayerManager.prototype.destroy = function() { for (var i = 0; i < this.ncTokens.length; i++) { Nc.off(this.ncTokens[i]); diff --git a/app/Game/Client/View/Pixi/Layer.js b/app/Game/Client/View/Pixi/Layer.js index 58a0fd8..4d6465f 100644 --- a/app/Game/Client/View/Pixi/Layer.js +++ b/app/Game/Client/View/Pixi/Layer.js @@ -103,6 +103,22 @@ function (Parent, PIXI, ColorRangeReplaceFilter, Settings, ColorConverter, Nc) { this.container.setChildIndex(meshB, indexA); }; + Layer.prototype.swapMeshes = function(meshA, meshB) { + var textureA = meshA.texture; + var textureB = meshB.texture; + + meshA.setTexture(textureB); + meshA.onTextureUpdate(); + meshA.scale.x = 1; + meshA.scale.y = 1; + + meshB.setTexture(textureA); + meshB.onTextureUpdate(); + meshB.scale.x = 1; + meshB.scale.y = 1; + + }; + Layer.prototype.createMesh = function (texturePath, callback, options) { var texture = (options && options.fromFrame) diff --git a/app/Lib/Utilities/NotificationCenter.js b/app/Lib/Utilities/NotificationCenter.js index ec4beb3..62496ba 100755 --- a/app/Lib/Utilities/NotificationCenter.js +++ b/app/Lib/Utilities/NotificationCenter.js @@ -42,7 +42,8 @@ function (Exception) { update: null, addFilter: null, removeFilter: null, - swapMeshIndexes: null + swapMeshIndexes: null, + swapMeshes: null }, animatedMesh: { create: null From 6d8609b47555916458768f261156f6aa4efeb0ec Mon Sep 17 00:00:00 2001 From: logsol Date: Wed, 6 May 2015 20:15:22 +0200 Subject: [PATCH 14/14] improving rube doll flipping behaviour and positioning --- app/Game/Asset/RubeDoll.json | 474 +++++++++--------- app/Game/Client/GameObjects/Items/RubeDoll.js | 58 ++- app/Game/Core/GameObjects/Items/RubeDoll.js | 13 +- static/img/Characters/Chuck/lowerLeftArm.png | Bin 148 -> 2776 bytes static/img/Characters/Chuck/lowerLeftLeg.png | Bin 158 -> 2785 bytes static/img/Characters/Chuck/lowerRightArm.png | Bin 148 -> 2776 bytes static/img/Characters/Chuck/lowerRightLeg.png | Bin 158 -> 2785 bytes static/img/Characters/Chuck/upperLeftArm.png | Bin 145 -> 2793 bytes static/img/Characters/Chuck/upperRightArm.png | Bin 170 -> 2793 bytes static/img/Characters/Chuck/upperRightLeg.png | Bin 2866 -> 2822 bytes static/items/rube/ragdoll.rube | 198 ++++---- 11 files changed, 383 insertions(+), 360 deletions(-) diff --git a/app/Game/Asset/RubeDoll.json b/app/Game/Asset/RubeDoll.json index 6f526a2..a7b9312 100644 --- a/app/Game/Asset/RubeDoll.json +++ b/app/Game/Asset/RubeDoll.json @@ -23,17 +23,17 @@ { "x" : [ - 0.04692991077899933, - 0.04692991077899933, - -0.04692997038364410, - -0.04692997038364410 + 0.04692989960312843, + 0.04692989960312843, + -0.04693000018596649, + -0.04693000018596649 ], "y" : [ - -0.1895973682403564, - 0.1895966529846191, - 0.1895966529846191, - -0.1895973682403564 + -0.1895969957113266, + 0.1895969957113266, + 0.1895969957113266, + -0.1895969957113266 ] } } @@ -43,15 +43,15 @@ "massData-I" : 0.0004525936674326658, "massData-center" : { - "x" : -2.980232238769531e-08, - "y" : -3.576278686523438e-07 + "x" : -5.029141902923584e-08, + "y" : 0 }, "massData-mass" : 0.03559110686182976, "name" : "upperLeftArm", "position" : { - "x" : -0.1165364086627960, - "y" : 0.9012566804885864 + "x" : -0.1165359988808632, + "y" : 0.9012569785118103 }, "type" : 2 }, @@ -74,35 +74,35 @@ { "x" : [ - 0.1570899933576584, - 0.1570899933576584, - -0.1156369969248772, - -0.1156369969248772 + 0.1366278976202011, + 0.1366278976202011, + -0.1360991001129150, + -0.1360991001129150 ], "y" : [ - -0.3584159910678864, - 0.4034900069236755, - 0.4034900069236755, - -0.3584159910678864 + -0.3788780868053436, + 0.3830279111862183, + 0.3830279111862183, + -0.3788780868053436 ] } } } ], "linearVelocity" : 0, - "massData-I" : 0.01153474114835262, + "massData-I" : 0.01134084537625313, "massData-center" : { - "x" : 0.02072649449110031, - "y" : 0.02253700792789459 + "x" : 0.0002643987536430359, + "y" : 0.002074912190437317 }, - "massData-mass" : 0.2077923268079758, + "massData-mass" : 0.2077923566102982, "name" : "chest", "position" : { - "x" : -0.02137973159551620, - "y" : 0.7773683071136475 + "x" : 0.0007875636219978333, + "y" : 0.7995355725288391 }, "type" : 2 }, @@ -216,35 +216,35 @@ { "x" : [ - 0.07039503753185272, - 0.07039503753185272, - -0.07039495557546616, - -0.07039495557546616 + 0.07039500027894974, + 0.07039500027894974, + -0.07039500027894974, + -0.07039500027894974 ], "y" : [ - -0.09294363856315613, - 0.1277718394994736, - 0.1277718394994736, - -0.09294363856315613 + -0.09294360131025314, + 0.1277720034122467, + 0.1277720034122467, + -0.09294360131025314 ] } } } ], "linearVelocity" : 0, - "massData-I" : 0.0001869033440016210, + "massData-I" : 0.0001869037223514169, "massData-center" : { - "x" : 4.097818973036738e-08, - "y" : 0.01741409860551357 + "x" : 0, + "y" : 0.01741420105099678 }, - "massData-mass" : 0.03107452951371670, + "massData-mass" : 0.03107454814016819, "name" : "lowerLeftLeg", "position" : { - "x" : -0.04570891708135605, - "y" : 0.09799571335315704 + "x" : -0.03829947486519814, + "y" : 0.09799569845199585 }, "type" : 2 }, @@ -320,33 +320,33 @@ [ 0.04693000018596649, 0.04693000018596649, - -0.04693005979061127, - -0.04693005979061127 + -0.04693010076880455, + -0.04693010076880455 ], "y" : [ - -0.1895973682403564, - 0.1895966529846191, - 0.1895966529846191, - -0.1895973682403564 + -0.1895969957113266, + 0.1895969957113266, + 0.1895969957113266, + -0.1895969957113266 ] } } } ], "linearVelocity" : 0, - "massData-I" : 0.0004525946278590709, + "massData-I" : 0.0004525947733782232, "massData-center" : { - "x" : -2.980232238769531e-08, - "y" : -3.576278686523438e-07 + "x" : -5.029141902923584e-08, + "y" : 0 }, - "massData-mass" : 0.03559117391705513, + "massData-mass" : 0.03559118881821632, "name" : "upperRightArm", "position" : { - "x" : 0.1183081120252609, - "y" : 0.9012566804885864 + "x" : 0.1183080002665520, + "y" : 0.9012569785118103 }, "type" : 2 }, @@ -396,8 +396,8 @@ "name" : "upperRightLeg", "position" : { - "x" : 0.04785731062293053, - "y" : 0.3325108885765076 + "x" : 0.03859551250934601, + "y" : 0.3325110077857971 }, "type" : 2 }, @@ -447,8 +447,8 @@ "name" : "upperLeftLeg", "position" : { - "x" : -0.04570891708135605, - "y" : 0.3325108885765076 + "x" : -0.03829947486519814, + "y" : 0.3325110077857971 }, "type" : 2 }, @@ -471,16 +471,16 @@ { "x" : [ - 0.07039496302604675, - 0.07039496302604675, - -0.07039486616849899, - -0.07039486616849899 + 0.07039500027894974, + 0.07039500027894974, + -0.07039490342140198, + -0.07039490342140198 ], "y" : [ -0.09294389933347702, - 0.1276105940341949, - 0.1276105940341949, + 0.1276109963655472, + 0.1276109963655472, -0.09294389933347702 ] } @@ -488,18 +488,18 @@ } ], "linearVelocity" : 0, - "massData-I" : 0.0001864957448560745, + "massData-I" : 0.0001864968799054623, "massData-center" : { "x" : 4.842877032729120e-08, - "y" : 0.01733334921300411 + "y" : 0.01733354665338993 }, - "massData-mass" : 0.03105182945728302, + "massData-mass" : 0.03105190023779869, "name" : "lowerRightLeg", "position" : { - "x" : 0.04785731062293053, - "y" : 0.09799571335315704 + "x" : 0.03859551250934601, + "y" : 0.09799569845199585 }, "type" : 2 } @@ -554,33 +554,183 @@ { "anchorA" : { - "x" : 0.02210754156112671, - "y" : 0.4607425928115845 + "x" : 0.0003538504242897034, + "y" : 0.07107692956924438 }, "anchorB" : { - "x" : -0.02544101513922215, - "y" : -0.2591779232025146 + "x" : 0.0003536641597747803, + "y" : -0.1459649801254272 }, - "bodyA" : 1, - "bodyB" : 2, + "bodyA" : 3, + "bodyB" : 6, "enableLimit" : true, "enableMotor" : false, "jointSpeed" : 0, - "lowerLimit" : -0.6981316804885864, - "maxMotorTorque" : 0, + "lowerLimit" : 0.01745329238474369, + "maxMotorTorque" : 1, "motorSpeed" : 0, - "name" : "joint9", + "name" : "joint1", "refAngle" : 0, "type" : "revolute", - "upperLimit" : 1.221730470657349 + "upperLimit" : 1.919862151145935 + }, + + { + "anchorA" : + { + "x" : -0.0007802955806255341, + "y" : -0.1484909951686859 + }, + "anchorB" : + { + "x" : -0.0007801018655300140, + "y" : 0.08614099025726318 + }, + "bodyA" : 8, + "bodyB" : 4, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : 0.01745329238474369, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint7", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 2.443460941314697 + }, + + { + "anchorA" : + { + "x" : -0.004979588091373444, + "y" : -0.1506859958171844 + }, + "anchorB" : + { + "x" : -0.005973689258098602, + "y" : 0.08482310175895691 + }, + "bodyA" : 7, + "bodyB" : 9, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : 0.01745329238474369, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint8", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 2.443460941314697 + }, + + { + "anchorA" : + { + "x" : -0.06799955666065216, + "y" : -0.3021813035011292 + }, + "anchorB" : + { + "x" : -0.02891255542635918, + "y" : 0.1648437976837158 + }, + "bodyA" : 1, + "bodyB" : 8, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -0.7853981852531433, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint6", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 1.570796370506287 + }, + + { + "anchorA" : + { + "x" : 0.06260262429714203, + "y" : -0.3029872477054596 + }, + "anchorB" : + { + "x" : 0.02294230461120605, + "y" : 0.1640380322933197 + }, + "bodyA" : 1, + "bodyB" : 7, + "enableLimit" : true, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -0.7853981852531433, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint5", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 1.570796370506287 + }, + + { + "anchorA" : + { + "x" : 0.1179294362664223, + "y" : 0.2464744448661804 + }, + "anchorB" : + { + "x" : 0.0004089996218681335, + "y" : 0.1447530388832092 + }, + "bodyA" : 1, + "bodyB" : 6, + "enableLimit" : false, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -2.268928050994873, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint2", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 3.141592741012573 + }, + + { + "anchorA" : + { + "x" : -0.1188285648822784, + "y" : 0.2521644234657288 + }, + "anchorB" : + { + "x" : -0.001505002379417419, + "y" : 0.1504430174827576 + }, + "bodyA" : 1, + "bodyB" : 0, + "enableLimit" : false, + "enableMotor" : false, + "jointSpeed" : 0, + "lowerLimit" : -2.268928050994873, + "maxMotorTorque" : 1, + "motorSpeed" : 0, + "name" : "joint3", + "refAngle" : 0, + "type" : "revolute", + "upperLimit" : 3.141592741012573 }, { "anchorA" : { "x" : 0.0008554458618164062, - "y" : -0.1461489200592041 + "y" : -0.1461489796638489 }, "anchorB" : { @@ -604,176 +754,26 @@ { "anchorA" : { - "x" : -0.09517394006252289, - "y" : 0.2718780040740967 + "x" : 0.02210754156112671, + "y" : 0.4607425332069397 }, "anchorB" : { - "x" : -1.741945743560791e-05, - "y" : 0.1479903459548950 + "x" : -0.02544101513922215, + "y" : -0.2591779232025146 }, "bodyA" : 1, - "bodyB" : 0, - "enableLimit" : false, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -2.268928050994873, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint3", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 3.141592741012573 - }, - - { - "anchorA" : - { - "x" : 0.1116365119814873, - "y" : -0.2944114208221436 - }, - "anchorB" : - { - "x" : 0.04127830639481544, - "y" : 0.1504460573196411 - }, - "bodyA" : 1, - "bodyB" : 7, + "bodyB" : 2, "enableLimit" : true, "enableMotor" : false, "jointSpeed" : 0, - "lowerLimit" : -0.7853981852531433, - "maxMotorTorque" : 1, + "lowerLimit" : -0.6981316804885864, + "maxMotorTorque" : 0, "motorSpeed" : 0, - "name" : "joint5", + "name" : "joint9", "refAngle" : 0, "type" : "revolute", - "upperLimit" : 1.570796370506287 - }, - - { - "anchorA" : - { - "x" : -0.06799929589033127, - "y" : -0.2890855073928833 - }, - "anchorB" : - { - "x" : -0.04493143409490585, - "y" : 0.1559127867221832 - }, - "bodyA" : 1, - "bodyB" : 8, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -0.7853981852531433, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint6", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 1.570796370506287 - }, - - { - "anchorA" : - { - "x" : 0.1396137326955795, - "y" : 0.2701327800750732 - }, - "anchorB" : - { - "x" : -7.455050945281982e-05, - "y" : 0.1462446451187134 - }, - "bodyA" : 1, - "bodyB" : 6, - "enableLimit" : false, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -2.268928050994873, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint2", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 3.141592741012573 - }, - - { - "anchorA" : - { - "x" : 0.0003538504242897034, - "y" : 0.07107692956924438 - }, - "anchorB" : - { - "x" : 0.0003536641597747803, - "y" : -0.1459646224975586 - }, - "bodyA" : 3, - "bodyB" : 6, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : -1.919862151145935, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint1", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 0 - }, - - { - "anchorA" : - { - "x" : 0.001979876309633255, - "y" : -0.1506856828927994 - }, - "anchorB" : - { - "x" : 0.001979988068342209, - "y" : 0.08382888138294220 - }, - "bodyA" : 7, - "bodyB" : 9, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : 0.01745329238474369, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint8", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 2.268928050994873 - }, - - { - "anchorA" : - { - "x" : -0.0007802955806255341, - "y" : -0.1484908312559128 - }, - "anchorB" : - { - "x" : -0.0007801018655300140, - "y" : 0.08614097535610199 - }, - "bodyA" : 8, - "bodyB" : 4, - "enableLimit" : true, - "enableMotor" : false, - "jointSpeed" : 0, - "lowerLimit" : 0.01745329238474369, - "maxMotorTorque" : 1, - "motorSpeed" : 0, - "name" : "joint7", - "refAngle" : 0, - "type" : "revolute", - "upperLimit" : 2.268928050994873 + "upperLimit" : 1.221730470657349 } ], "positionIterations" : 3, diff --git a/app/Game/Client/GameObjects/Items/RubeDoll.js b/app/Game/Client/GameObjects/Items/RubeDoll.js index 4075560..659cd08 100644 --- a/app/Game/Client/GameObjects/Items/RubeDoll.js +++ b/app/Game/Client/GameObjects/Items/RubeDoll.js @@ -37,21 +37,21 @@ function (Parent, Layer, Settings, Nc) { }; limbOptions.upperRightLeg = { - width: 4, - height: 9, + width: 5, + height: 8, x: 2, y: limbOptions.chest.height / 2 }; limbOptions.lowerLeftLeg = { - width: 4, + width: 5, height: 4, x: -2, y: limbOptions.chest.height / 2 + limbOptions.upperLeftLeg.height }; limbOptions.lowerRightLeg = { - width: 4, + width: 5, height: 4, x: 2, y: limbOptions.chest.height / 2 + limbOptions.upperRightLeg.height @@ -60,28 +60,28 @@ function (Parent, Layer, Settings, Nc) { limbOptions.upperLeftArm = { - width: 2, + width: 4, height: 8, x: -2, y: -limbOptions.chest.height / 2 }; limbOptions.upperRightArm = { - width: 3, + width: 4, height: 8, x: 2, y: -limbOptions.chest.height / 2 }; limbOptions.lowerLeftArm = { - width: 2, + width: 4, height: 5, x: -2, y: -limbOptions.chest.height / 2 + limbOptions.upperLeftArm.height }; limbOptions.lowerRightArm = { - width: 2, + width: 4, height: 5, x: 2, y: -limbOptions.chest.height / 2 + limbOptions.upperRightArm.height @@ -93,7 +93,9 @@ function (Parent, Layer, Settings, Nc) { this.limbMeshes = {}; this.baseMeshName = "chest"; this.characterName = "Chuck"; - this.lastFlipDirection = 1; + this.lastFlipDirection = -options.direction || 1; + + console.log(this.lastFlipDirection); Parent.call(this, physicsEngine, uid, options); } @@ -187,22 +189,10 @@ function (Parent, Layer, Settings, Nc) { RubeDoll.prototype.flip = function(direction) { Parent.prototype.flip.call(this, direction); - if(this.limbs) { - for(var name in this.limbMeshes) { - if(this.limbs[name]) { - Nc.trigger(Nc.ns.client.view.mesh.update, - this.layerId, - this.limbMeshes[name], - { - xScale: direction, - } - ); - } - } - } + console.log("last", this.lastFlipDirection, "now", direction); // flipping depth of right body side arm/leg images with left - if (this.lastFlipDirection != direction) { + if (this.lastFlipDirection != direction) { // FIXME : this is a bit broken. this.lastFlipDirection = direction; @@ -226,6 +216,28 @@ function (Parent, Layer, Settings, Nc) { this.limbMeshes["upperRightArm"], this.limbMeshes["upperLeftArm"] ); + + // swap short images + Nc.trigger(Nc.ns.client.view.mesh.swapMeshes, + this.layerId, + this.limbMeshes["upperRightLeg"], + this.limbMeshes["upperLeftLeg"] + ); + } + + // x flipping has to happen after (see swapMeshes) + if(this.limbs) { + for(var name in this.limbMeshes) { + if(this.limbs[name]) { + Nc.trigger(Nc.ns.client.view.mesh.update, + this.layerId, + this.limbMeshes[name], + { + xScale: direction, + } + ); + } + } } }; diff --git a/app/Game/Core/GameObjects/Items/RubeDoll.js b/app/Game/Core/GameObjects/Items/RubeDoll.js index eeca209..f30d53b 100644 --- a/app/Game/Core/GameObjects/Items/RubeDoll.js +++ b/app/Game/Core/GameObjects/Items/RubeDoll.js @@ -33,7 +33,7 @@ function (Parent, RubeLoader, Box2D, Settings, Assert, Nc, RubeDollJson) { this.body.SetUserData(this); - this.flip(options.direction); + this.flip(options.direction || 1); } RubeDoll.prototype = Object.create(Parent.prototype); @@ -41,6 +41,8 @@ function (Parent, RubeLoader, Box2D, Settings, Assert, Nc, RubeDollJson) { RubeDoll.prototype.loadRubeDollFromScene = function(options) { var scene = this.rubeLoader.getScene(); + + for (var i in scene.bodies) { var body = scene.bodies[i]; var position = body.GetPosition().Copy(); @@ -50,6 +52,15 @@ function (Parent, RubeLoader, Box2D, Settings, Assert, Nc, RubeDollJson) { )); body.SetPosition(position); this.limbs[body.name] = body; + + // code snipped possibly needed for filtering between doll and rubedoll while holding + //var filterData = new Box2D.Dynamics.b2FilterData(); + //filterData.groupIndex = -66; + //if(body.name != "head" && body.name != "chest") { + // for (var fixture = body.GetFixtureList(); fixture; fixture = fixture.GetNext()) { + // fixture.SetFilterData(filterData); + // } + //} } this.joints = scene.joints; diff --git a/static/img/Characters/Chuck/lowerLeftArm.png b/static/img/Characters/Chuck/lowerLeftArm.png index fb43dd59175fcfebcd3dca2291122613ea36c273..85d7ac4412b399d8ecc004c79dc24fabfb2fbe2b 100755 GIT binary patch literal 2776 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 diff --git a/static/img/Characters/Chuck/lowerLeftLeg.png b/static/img/Characters/Chuck/lowerLeftLeg.png index 2314dec36b6188ab3cc3d75b3d971e0b9bbcd8b7..c7b08033680a286a9cc3d8bdc36a516a2a2f5eca 100755 GIT binary patch literal 2785 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 diff --git a/static/img/Characters/Chuck/lowerRightLeg.png b/static/img/Characters/Chuck/lowerRightLeg.png index 2314dec36b6188ab3cc3d75b3d971e0b9bbcd8b7..1d7c7b84646468e4d950126e23a3ba47ade1317e 100755 GIT binary patch literal 2785 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 v000$9L_t&t*JEHdU|52 literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^OhC-R!3-pye7;uzq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c74Zl7gt(rW9lfn5B)ZrqIMdZH+39lb$Gbo&2~QWtkcwML p2}wx_X-Nr*X$dI~ZVZfU42%T~VlyIFr2^G3c)I$ztaD0e0suQdDv|&I diff --git a/static/img/Characters/Chuck/upperRightArm.png b/static/img/Characters/Chuck/upperRightArm.png index 44bf6cf377ca6cbfbff29fc6266ae4dacaf2203e..cd31fce6edd8b1a0593d41d21a1641a5df94f97a 100755 GIT binary patch literal 2793 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 v000$9L_t&t*JEHdU|RF{JKv}kuAirQB z_y2!}&HI<^2a3pex;TbZ+)7GFN=i*gN=!>gOiN2hNO3*Rz{tkH!opzfwtcTFP#uG( LtDnm{r-UW|_~$iM diff --git a/static/img/Characters/Chuck/upperRightLeg.png b/static/img/Characters/Chuck/upperRightLeg.png index 11b5f29c66ae3bf70477490c169d71d5140a1595..c8ab6d672e92ce12394be286afaf522729a5738d 100644 GIT binary patch delta 2805 zcmV;QlP9${Ff#{e35u39)87vVOh&UxnkS?~*ikKRgEM^!bX1*vv5zC1=VUZ0!`z*4f znAxd3wur?!r?XSpV(u03woD;M#E7qm3p2T#ED_%lu||q8l`G;m;@DIUGXnq=e@Sc? za9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub1#}&jF5T4HnnCyEWTkKf z0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z{i;y^b@OjZ+}lNZ8Th$p z5Uu}YB~8euXQVS(9J=A3hxi`{ z{&gM(L7aFFpTiSHgo&n%%S#Zoo5$t~xM@5(m-nBV_z%PWq{X=wiPHEHe^6tLfYfy= zKz{89C<+lE(fh?+|D$id_%I-TdEqLPi*x_)H~nY9rQ#)noA5c#B`Ac>67n+__r%W< zpaB6$0xFOP%0M0H07GB~tbi?W1a80^_=6A-304CZNCc^X53)cW*aQkeG1v+AfND?& z8bLE?1;;@rI0epwOW+!~e*tcT`(PAIfM;M9yao#p1YsdEM1kZX6-X1(hs+=bWDmJP zzEBVp3B^JQ5DyYUdC+F47%GFRp?atp`W`w7orkVKgV0@Q44Q_1hu*;mOoFMf608Lq z!wlF7_JKp-Rd52l2F`^G;2m%!+yEbiJK*#1HTX6>3O|GA5P%R7e;T5S7$OYB1@T9s zka&cTtVfEF3ZwyPMY@qbwx1%qjZ=)yBuQ3=54Wo^*!gyjLF-e%U zm=erBOdIALW)L%uf0@H#vGQ1btR2=L%ft$>h1e?WQS4dl5OxCl21mrH;LLFDxF{SC zmyfH!9l@Q!4dEtn3wSBKCf)|`k7wg^@TK@hd^i3&egeNhkS1so>_C83pY zk??@5*JW(Ig>he+TIh=^W`U=_Q#=)*?HS zqsRjC4stX30{Id7jRZx)NWx2kEwMqOMxsMvNaDF9UQ$!iNpiJhu4IMe3CZh{Gg5dd zEh!f%rqp_=8mW^~BT{qH6lqgwf9X`|66qt-SEQ$8urgXQZZd3{0-1v{7i7jM2t}RZ zLSa!hQyM83e<>4G3{{)zMNOg>Q@^7QP-kUjWS7Z?$!5#e$exxRr6DveninmFR!Tcg z8>YQmqO`QdXKtffUuk1xHa2rKF-1}UypJgC^Oe>kV4tmL7Tu2iLTL1{*rrtGMk zq+G6iMtNF=qGGSYRVi0FtMZgCOLwBD&@1V^^jTF!RZmr+YQ5@!>VlfKTBusSTASKK zb%HuWJzl+By+?gkLq)?+BTu76*gyjC_sqjXI5<8*3Ox8SgUgGyZ5|VUl9fXma0F#?;$1-?ZEGcQZXR zmRXJ2EpxKDyZHw5F7p@5^p|m#?O%4sf@0xkf3ek~$Kr#fl_lS@)pFWO!z$LQ)@p=7 zWdtxv7?-Wl*3Q-&tWR0LwXw7j*c`X{&DPL1+4hL-)N<|RoaK$n$L-YYn0EDcqxN+B zSo;I^qYkPLOos-C$BycbY{w?YNhe*WB&VZJ&z()2`OfXm^DZ_n>s-#cBCZ~;MXm#G ze==^NZq;s&+|}F@+*{mdJuE!ddYtn_d-{0p@*MF}@?v>4d(C=Vd9U;C^&$BL`&9cp z_SN&{`*!=me%^k&{T{5)T)|t>=@0z9{CE354A2f(6YygoCNLndCh$p+X;5BJUoa&& zCiqD3>k#LV(vbV1I-$bQo-oO<=&{&C*_u)5XKpCqtx&&0w&s4uq zN4P~emT8|^lldkqEbBzJbT%)$KSwWTd(LF8d+xVuQEORid-7ECHsy`2b6Quw9$Fu_ zzGs8_hJpTWf0O*O{8yX9H+L5(6>KaR-{P^QrBI@fUpTVWc5B@> z)Hd$6f$iqotG0hEVi#R4HYu(seqX{Wx%!RiHe#iZ-bxL)`b?**v58SEusPAadYN$AfIhc9yNn==J-?xl!o0}Axikm(h z;vE`29CWz1*{Zquh~kmb7Pv*&GJQ1q=#B4Ozw2r>Y^`sjwG|%&$Arh8ejoe&@Nu8x zJtr6^T7S^|p|+jUUep0~f8=z`b|!X?c13m#p7cK1({0<`{-e>4hfb-UsyQuty7Ua; zOu?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2Ae@nN#Ze6>*;`ZQh z=^oC;Q|`XFmw9jD{>BIB2SpF19#%Y3eAMu>?$2$bmZPV~T*vw!2S2_) z&KiIAOU5tnCkmdBpHxh$Og2xMO`V!{pT6;Q<CYBs3V)UUwf4Er^B;b5{H=dB zVs_#M|HY@@OJ2&qOg!{z*{hzpfVoGnQ(rI47rl{xbNDUeZQr}_casZQ@3HSIKj?nw z{^;}Z!Kc(upZ)~{nDhL)#OTui000JJOGiWi{{a60|De66laV18cK`=;Nliru-vtH_ zDgsCjKFBY5 literal 2866 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 diff --git a/static/items/rube/ragdoll.rube b/static/items/rube/ragdoll.rube index 7024172..bbe7d2d 100644 --- a/static/items/rube/ragdoll.rube +++ b/static/items/rube/ragdoll.rube @@ -84,16 +84,16 @@ { "x" : [ - 0.07039496302604675, - 0.07039496302604675, - -0.07039486616849899, - -0.07039486616849899 + 0.07039500027894974, + 0.07039500027894974, + -0.07039490342140198, + -0.07039490342140198 ], "y" : [ -0.09294389933347702, - 0.1276105940341949, - 0.1276105940341949, + 0.1276109963655472, + 0.1276109963655472, -0.09294389933347702 ] } @@ -101,18 +101,18 @@ ], "id" : 1, "linearVelocity" : 0, - "massData-I" : 0.0001864957448560745, + "massData-I" : 0.0001864968799054623, "massData-center" : { "x" : 4.842877032729120e-08, - "y" : 0.01733334921300411 + "y" : 0.01733354665338993 }, - "massData-mass" : 0.03105182945728302, + "massData-mass" : 0.03105190023779869, "name" : "lowerRightLeg", "position" : { - "x" : 0.04785731062293053, - "y" : 0.09799571335315704 + "x" : 0.03859551250934601, + "y" : 0.09799569845199585 }, "type" : "dynamic" }, @@ -168,8 +168,8 @@ "name" : "upperLeftLeg", "position" : { - "x" : -0.04570891708135605, - "y" : 0.3325108885765076 + "x" : -0.03829947486519814, + "y" : 0.3325110077857971 }, "type" : "dynamic" }, @@ -225,8 +225,8 @@ "name" : "upperRightLeg", "position" : { - "x" : 0.04785731062293053, - "y" : 0.3325108885765076 + "x" : 0.03859551250934601, + "y" : 0.3325110077857971 }, "type" : "dynamic" }, @@ -257,33 +257,33 @@ [ 0.04693000018596649, 0.04693000018596649, - -0.04693005979061127, - -0.04693005979061127 + -0.04693010076880455, + -0.04693010076880455 ], "y" : [ - -0.1895973682403564, - 0.1895966529846191, - 0.1895966529846191, - -0.1895973682403564 + -0.1895969957113266, + 0.1895969957113266, + 0.1895969957113266, + -0.1895969957113266 ] } } ], "id" : 4, "linearVelocity" : 0, - "massData-I" : 0.0004525946278590709, + "massData-I" : 0.0004525947733782232, "massData-center" : { - "x" : -2.980232238769531e-08, - "y" : -3.576278686523438e-07 + "x" : -5.029141902923584e-08, + "y" : 0 }, - "massData-mass" : 0.03559117391705513, + "massData-mass" : 0.03559118881821632, "name" : "upperRightArm", "position" : { - "x" : 0.1183081120252609, - "y" : 0.9012566804885864 + "x" : 0.1183080002665520, + "y" : 0.9012569785118103 }, "type" : "dynamic" }, @@ -369,35 +369,35 @@ { "x" : [ - 0.07039503753185272, - 0.07039503753185272, - -0.07039495557546616, - -0.07039495557546616 + 0.07039500027894974, + 0.07039500027894974, + -0.07039500027894974, + -0.07039500027894974 ], "y" : [ - -0.09294363856315613, - 0.1277718394994736, - 0.1277718394994736, - -0.09294363856315613 + -0.09294360131025314, + 0.1277720034122467, + 0.1277720034122467, + -0.09294360131025314 ] } } ], "id" : 6, "linearVelocity" : 0, - "massData-I" : 0.0001869033440016210, + "massData-I" : 0.0001869037223514169, "massData-center" : { - "x" : 4.097818973036738e-08, - "y" : 0.01741409860551357 + "x" : 0, + "y" : 0.01741420105099678 }, - "massData-mass" : 0.03107452951371670, + "massData-mass" : 0.03107454814016819, "name" : "lowerLeftLeg", "position" : { - "x" : -0.04570891708135605, - "y" : 0.09799571335315704 + "x" : -0.03829947486519814, + "y" : 0.09799569845199585 }, "type" : "dynamic" }, @@ -529,35 +529,35 @@ { "x" : [ - -0.1156369969248772, - 0.1570899933576584, - 0.1570899933576584, - -0.1156369969248772 + -0.1360991001129150, + 0.1366278976202011, + 0.1366278976202011, + -0.1360991001129150 ], "y" : [ - -0.3584159910678864, - -0.3584159910678864, - 0.4034900069236755, - 0.4034900069236755 + -0.3788780868053436, + -0.3788780868053436, + 0.3830279111862183, + 0.3830279111862183 ] } } ], "id" : 9, "linearVelocity" : 0, - "massData-I" : 0.01153474114835262, + "massData-I" : 0.01134084537625313, "massData-center" : { - "x" : 0.02072649449110031, - "y" : 0.02253700792789459 + "x" : 0.0002643987536430359, + "y" : 0.002074912190437317 }, - "massData-mass" : 0.2077923268079758, + "massData-mass" : 0.2077923566102982, "name" : "chest", "position" : { - "x" : -0.02137973159551620, - "y" : 0.7773683071136475 + "x" : 0.0007875636219978333, + "y" : 0.7995355725288391 }, "type" : "dynamic" }, @@ -586,17 +586,17 @@ { "x" : [ - 0.04692991077899933, - 0.04692991077899933, - -0.04692997038364410, - -0.04692997038364410 + 0.04692989960312843, + 0.04692989960312843, + -0.04693000018596649, + -0.04693000018596649 ], "y" : [ - -0.1895973682403564, - 0.1895966529846191, - 0.1895966529846191, - -0.1895973682403564 + -0.1895969957113266, + 0.1895969957113266, + 0.1895969957113266, + -0.1895969957113266 ] } } @@ -606,15 +606,15 @@ "massData-I" : 0.0004525936674326658, "massData-center" : { - "x" : -2.980232238769531e-08, - "y" : -3.576278686523438e-07 + "x" : -5.029141902923584e-08, + "y" : 0 }, "massData-mass" : 0.03559110686182976, "name" : "upperLeftArm", "position" : { - "x" : -0.1165364086627960, - "y" : 0.9012566804885864 + "x" : -0.1165359988808632, + "y" : 0.9012569785118103 }, "type" : "dynamic" } @@ -625,13 +625,13 @@ { "anchorA" : { - "x" : -0.0007802955806255341, - "y" : -0.1484908312559128 + "x" : -0.0007802959880791605, + "y" : -0.1484909951686859 }, "anchorB" : { - "x" : -0.0007801018655300140, - "y" : 0.08614096790552139 + "x" : -0.0007801019819453359, + "y" : 0.08614099770784378 }, "bodyA" : 2, "bodyB" : 6, @@ -645,19 +645,19 @@ "name" : "joint7", "referenceAngle" : 0, "type" : "revolute", - "upperLimit" : 2.268928050994873 + "upperLimit" : 2.443460941314697 }, { "anchorA" : { - "x" : 0.001979876309633255, - "y" : -0.1506856828927994 + "x" : -0.004979589954018593, + "y" : -0.1506859958171844 }, "anchorB" : { - "x" : 0.001979988068342209, - "y" : 0.08382887393236160 + "x" : -0.005973690189421177, + "y" : 0.08482310175895691 }, "bodyA" : 3, "bodyB" : 1, @@ -671,7 +671,7 @@ "name" : "joint8", "referenceAngle" : 0, "type" : "revolute", - "upperLimit" : 2.268928050994873 + "upperLimit" : 2.443460941314697 }, { @@ -682,8 +682,8 @@ }, "anchorB" : { - "x" : 0.0003536641597747803, - "y" : -0.1459646224975586 + "x" : 0.0003536640142556280, + "y" : -0.1459649950265884 }, "bodyA" : 7, "bodyB" : 4, @@ -691,25 +691,25 @@ "enableLimit" : true, "enableMotor" : false, "id" : 3, - "lowerLimit" : -1.919862151145935, + "lowerLimit" : 0.01745329238474369, "maxMotorTorque" : 1, "motorSpeed" : 0, "name" : "joint1", "referenceAngle" : 0, "type" : "revolute", - "upperLimit" : 0 + "upperLimit" : 1.919862151145935 }, { "anchorA" : { - "x" : 0.1396137326955795, - "y" : 0.2701327204704285 + "x" : 0.1179294362664223, + "y" : 0.2464744448661804 }, "anchorB" : { - "x" : -7.455050945281982e-05, - "y" : 0.1462445855140686 + "x" : 0.0004089996218681335, + "y" : 0.1447530388832092 }, "bodyA" : 9, "bodyB" : 4, @@ -729,13 +729,13 @@ { "anchorA" : { - "x" : -0.06799929589033127, - "y" : -0.2890855073928833 + "x" : -0.06799955666065216, + "y" : -0.3021813035011292 }, "anchorB" : { - "x" : -0.04493143782019615, - "y" : 0.1559127867221832 + "x" : -0.02891255542635918, + "y" : 0.1648437976837158 }, "bodyA" : 9, "bodyB" : 2, @@ -755,13 +755,13 @@ { "anchorA" : { - "x" : 0.1116365119814873, - "y" : -0.2944114208221436 + "x" : 0.06260262429714203, + "y" : -0.3029872477054596 }, "anchorB" : { - "x" : 0.04127831012010574, - "y" : 0.1504460573196411 + "x" : 0.02294230461120605, + "y" : 0.1640380322933197 }, "bodyA" : 9, "bodyB" : 3, @@ -781,13 +781,13 @@ { "anchorA" : { - "x" : -0.09517394006252289, - "y" : 0.2718779444694519 + "x" : -0.1188285648822784, + "y" : 0.2521644234657288 }, "anchorB" : { - "x" : -1.741945743560791e-05, - "y" : 0.1479902863502502 + "x" : -0.001505002379417419, + "y" : 0.1504430174827576 }, "bodyA" : 9, "bodyB" : 10, @@ -807,8 +807,8 @@ { "anchorA" : { - "x" : 0.0008554458618164062, - "y" : -0.1461489200592041 + "x" : 0.0008554459782317281, + "y" : -0.1461489945650101 }, "anchorB" : {