Skip to content

Commit 9561d5d

Browse files
liabruliabru
committed
updated edge build
1 parent d03145e commit 9561d5d

2 files changed

Lines changed: 49 additions & 49 deletions

File tree

‎build/matter.js‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* matter.js edge-master 2015-05-20
2+
* matter.js edge-master 2015-05-22
33
* http://brm.io/matter-js/
44
* License: MIT
55
*/
@@ -1782,8 +1782,8 @@ var World = {};
17821782
label: 'World',
17831783
gravity: { x: 0, y: 1 },
17841784
bounds: {
1785-
min: { x: 0, y: 0 },
1786-
max: { x: 800, y: 600 }
1785+
min: { x: -Infinity, y: -Infinity },
1786+
max: { x: Infinity, y: Infinity }
17871787
}
17881788
};
17891789

@@ -4164,15 +4164,19 @@ var Common = {};
41644164
Common.now = function() {
41654165
// http://stackoverflow.com/questions/221294/how-do-you-get-a-timestamp-in-javascript
41664166
// https://gist.github.com/davidwaterston/2982531
4167-
4168-
var perf = window.performance;
41694167

4170-
if (perf) {
4171-
perf.now = perf.now || perf.webkitNow || perf.msNow || perf.oNow || perf.mozNow;
4172-
return +(perf.now());
4173-
}
4174-
4175-
return +(new Date());
4168+
var performance = window.performance || {};
4169+
4170+
performance.now = (function() {
4171+
return performance.now ||
4172+
performance.webkitNow ||
4173+
performance.msNow ||
4174+
performance.oNow ||
4175+
performance.mozNow ||
4176+
function() { return +(new Date()); };
4177+
})();
4178+
4179+
return performance.now();
41764180
};
41774181

41784182

@@ -4569,11 +4573,6 @@ var Engine = {};
45694573
if (body.isStatic || body.isSleeping)
45704574
continue;
45714575

4572-
// don't update out of world bodies
4573-
if (body.bounds.max.x < worldBounds.min.x || body.bounds.min.x > worldBounds.max.x
4574-
|| body.bounds.max.y < worldBounds.min.y || body.bounds.min.y > worldBounds.max.y)
4575-
continue;
4576-
45774576
Body.update(body, deltaTime, timeScale, correction);
45784577
}
45794578
};
@@ -5319,7 +5318,7 @@ var Sleeping = {};
53195318
motion = body.speed * body.speed + body.angularSpeed * body.angularSpeed;
53205319

53215320
// wake up bodies if they have a force applied
5322-
if (body.force.x > 0 || body.force.y > 0) {
5321+
if (body.force.x !== 0 || body.force.y !== 0) {
53235322
Sleeping.set(body, false);
53245323
continue;
53255324
}
@@ -5376,7 +5375,7 @@ var Sleeping = {};
53765375
}
53775376
}
53785377
};
5379-
5378+
53805379
/**
53815380
* Description
53825381
* @method set
@@ -5853,16 +5852,14 @@ var Composites = {};
58535852
bodyC;
58545853

58555854
for (row = 0; row < rows; row++) {
5856-
for (col = 0; col < columns; col++) {
5857-
if (col > 0) {
5858-
bodyA = bodies[(col - 1) + (row * columns)];
5859-
bodyB = bodies[col + (row * columns)];
5860-
Composite.addConstraint(composite, Constraint.create(Common.extend({ bodyA: bodyA, bodyB: bodyB }, options)));
5861-
}
5855+
for (col = 1; col < columns; col++) {
5856+
bodyA = bodies[(col - 1) + (row * columns)];
5857+
bodyB = bodies[col + (row * columns)];
5858+
Composite.addConstraint(composite, Constraint.create(Common.extend({ bodyA: bodyA, bodyB: bodyB }, options)));
58625859
}
58635860

5864-
for (col = 0; col < columns; col++) {
5865-
if (row > 0) {
5861+
if (row > 0) {
5862+
for (col = 0; col < columns; col++) {
58665863
bodyA = bodies[col + ((row - 1) * columns)];
58675864
bodyB = bodies[col + (row * columns)];
58685865
Composite.addConstraint(composite, Constraint.create(Common.extend({ bodyA: bodyA, bodyB: bodyB }, options)));
@@ -8394,11 +8391,15 @@ var RenderPixi = {};
83948391
transparent = !render.options.wireframes && render.options.background === 'transparent';
83958392

83968393
// init pixi
8397-
render.context = new PIXI.WebGLRenderer(render.options.width, render.options.height, render.canvas, transparent, true);
8394+
render.context = new PIXI.WebGLRenderer(render.options.width, render.options.height, {
8395+
view: render.canvas,
8396+
transparent: transparent,
8397+
antialias: true,
8398+
backgroundColor: options.background
8399+
});
8400+
83988401
render.canvas = render.context.view;
8399-
render.container = new PIXI.DisplayObjectContainer();
8400-
render.stage = new PIXI.Stage();
8401-
render.stage.addChild(render.container);
8402+
render.container = new PIXI.Container();
84028403
render.bounds = render.bounds || {
84038404
min: {
84048405
x: 0,
@@ -8416,8 +8417,8 @@ var RenderPixi = {};
84168417
render.primitives = {};
84178418

84188419
// use a sprite batch for performance
8419-
render.spriteBatch = new PIXI.SpriteBatch();
8420-
render.container.addChild(render.spriteBatch);
8420+
render.spriteContainer = new PIXI.Container();
8421+
render.container.addChild(render.spriteContainer);
84218422

84228423
// insert canvas
84238424
if (Common.isElement(render.element)) {
@@ -8440,16 +8441,16 @@ var RenderPixi = {};
84408441
*/
84418442
RenderPixi.clear = function(render) {
84428443
var container = render.container,
8443-
spriteBatch = render.spriteBatch;
8444+
spriteContainer = render.spriteContainer;
84448445

84458446
// clear stage container
84468447
while (container.children[0]) {
84478448
container.removeChild(container.children[0]);
84488449
}
84498450

84508451
// clear sprite batch
8451-
while (spriteBatch.children[0]) {
8452-
spriteBatch.removeChild(spriteBatch.children[0]);
8452+
while (spriteContainer.children[0]) {
8453+
spriteContainer.removeChild(spriteContainer.children[0]);
84538454
}
84548455

84558456
var bgSprite = render.sprites['bg-0'];
@@ -8462,10 +8463,10 @@ var RenderPixi = {};
84628463
// set background sprite
84638464
render.sprites['bg-0'] = bgSprite;
84648465
if (bgSprite)
8465-
spriteBatch.addChildAt(bgSprite, 0);
8466+
container.addChildAt(bgSprite, 0);
84668467

84678468
// add sprite batch back into container
8468-
render.container.addChild(render.spriteBatch);
8469+
render.container.addChild(render.spriteContainer);
84698470

84708471
// reset background state
84718472
render.currentBackground = null;
@@ -8489,11 +8490,11 @@ var RenderPixi = {};
84898490
if (isColor) {
84908491
// if solid background color
84918492
var color = Common.colorToNumber(background);
8492-
render.stage.setBackgroundColor(color);
8493+
render.context.backgroundColor = color;
84938494

84948495
// remove background sprite if existing
84958496
if (bgSprite)
8496-
render.spriteBatch.removeChild(bgSprite);
8497+
render.container.removeChild(bgSprite);
84978498
} else {
84988499
// initialise background sprite if needed
84998500
if (!bgSprite) {
@@ -8502,7 +8503,7 @@ var RenderPixi = {};
85028503
bgSprite = render.sprites['bg-0'] = new PIXI.Sprite(texture);
85038504
bgSprite.position.x = 0;
85048505
bgSprite.position.y = 0;
8505-
render.spriteBatch.addChildAt(bgSprite, 0);
8506+
render.container.addChildAt(bgSprite, 0);
85068507
}
85078508
}
85088509

@@ -8519,7 +8520,6 @@ var RenderPixi = {};
85198520
var render = engine.render,
85208521
world = engine.world,
85218522
context = render.context,
8522-
stage = render.stage,
85238523
container = render.container,
85248524
options = render.options,
85258525
bodies = Composite.allBodies(world),
@@ -8577,7 +8577,7 @@ var RenderPixi = {};
85778577
for (i = 0; i < constraints.length; i++)
85788578
RenderPixi.constraint(engine, constraints[i]);
85798579

8580-
context.render(stage);
8580+
context.render(container);
85818581
};
85828582

85838583

@@ -8648,15 +8648,15 @@ var RenderPixi = {};
86488648
if (bodyRender.sprite && bodyRender.sprite.texture) {
86498649
var spriteId = 'b-' + body.id,
86508650
sprite = render.sprites[spriteId],
8651-
spriteBatch = render.spriteBatch;
8651+
spriteContainer = render.spriteContainer;
86528652

86538653
// initialise body sprite if not existing
86548654
if (!sprite)
86558655
sprite = render.sprites[spriteId] = _createBodySprite(render, body);
86568656

86578657
// add to scene graph if not already there
8658-
if (Common.indexOf(spriteBatch.children, sprite) === -1)
8659-
spriteBatch.addChild(sprite);
8658+
if (Common.indexOf(spriteContainer.children, sprite) === -1)
8659+
spriteContainer.addChild(sprite);
86608660

86618661
// update body sprite
86628662
sprite.position.x = body.position.x;

0 commit comments

Comments
 (0)