Skip to content

Commit c46e915

Browse files
committed
fix handling of engine.render
1 parent d22b1b4 commit c46e915

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

src/core/Engine.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,16 @@ var Engine = {};
5353
controller: Grid
5454
}
5555
};
56-
56+
5757
var engine = Common.extend(defaults, options);
5858

59-
if (element && !engine.render) {
60-
engine.render = {
59+
if (element || engine.render) {
60+
var renderDefaults = {
6161
element: element,
6262
controller: Render
6363
};
64+
65+
engine.render = Common.extend(renderDefaults, engine.render);
6466
}
6567

6668
if (engine.render && engine.render.controller) {

src/core/Runner.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,20 @@ var Runner = {};
105105
Events.trigger(engine, 'tick', event);
106106

107107
// if world has been modified, clear the render scene graph
108-
if (engine.world.isModified && engine.render.controller.clear)
108+
if (engine.world.isModified
109+
&& engine.render
110+
&& engine.render.controller
111+
&& engine.render.controller.clear) {
109112
engine.render.controller.clear(engine.render);
113+
}
110114

111115
// update
112116
Engine.update(engine, delta, correction);
113117

114118
// render
115-
Engine.render(engine);
119+
if (engine.render) {
120+
Engine.render(engine);
121+
}
116122

117123
Events.trigger(engine, 'afterTick', event);
118124
})();

0 commit comments

Comments
 (0)