Skip to content

Commit 2ab20b0

Browse files
committed
updated edge build
1 parent c46e915 commit 2ab20b0

2 files changed

Lines changed: 18 additions & 10 deletions

File tree

build/matter.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* matter.js edge-master 2015-07-02
2+
* matter.js edge-master 2015-07-05
33
* http://brm.io/matter-js/
44
* License: MIT
55
*/
@@ -4367,14 +4367,16 @@ var Engine = {};
43674367
controller: Grid
43684368
}
43694369
};
4370-
4370+
43714371
var engine = Common.extend(defaults, options);
43724372

4373-
if (element && !engine.render) {
4374-
engine.render = {
4373+
if (element || engine.render) {
4374+
var renderDefaults = {
43754375
element: element,
43764376
controller: Render
43774377
};
4378+
4379+
engine.render = Common.extend(renderDefaults, engine.render);
43784380
}
43794381

43804382
if (engine.render && engine.render.controller) {
@@ -5310,14 +5312,20 @@ var Runner = {};
53105312
Events.trigger(engine, 'tick', event);
53115313

53125314
// if world has been modified, clear the render scene graph
5313-
if (engine.world.isModified && engine.render.controller.clear)
5315+
if (engine.world.isModified
5316+
&& engine.render
5317+
&& engine.render.controller
5318+
&& engine.render.controller.clear) {
53145319
engine.render.controller.clear(engine.render);
5320+
}
53155321

53165322
// update
53175323
Engine.update(engine, delta, correction);
53185324

53195325
// render
5320-
Engine.render(engine);
5326+
if (engine.render) {
5327+
Engine.render(engine);
5328+
}
53215329

53225330
Events.trigger(engine, 'afterTick', event);
53235331
})();

0 commit comments

Comments
 (0)