fix handling of engine.render

liabru · Jul 5, 2015 · c46e915 · c46e915
1 parent d22b1b4
commit c46e915
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/core/Engine.js b/src/core/Engine.js
@@ -53,14 +53,16 @@ var Engine = {};
                 controller: Grid
             }
         };
-        
+
         var engine = Common.extend(defaults, options);
 
-        if (element && !engine.render) {
-            engine.render = {
+        if (element || engine.render) {
+            var renderDefaults = {
                 element: element,
                 controller: Render
             };
+
+            engine.render = Common.extend(renderDefaults, engine.render);
         }
 
         if (engine.render && engine.render.controller) {

diff --git a/src/core/Runner.js b/src/core/Runner.js
@@ -105,14 +105,20 @@ var Runner = {};
             Events.trigger(engine, 'tick', event);
 
             // if world has been modified, clear the render scene graph
-            if (engine.world.isModified && engine.render.controller.clear)
+            if (engine.world.isModified 
+                && engine.render
+                && engine.render.controller
+                && engine.render.controller.clear) {
                 engine.render.controller.clear(engine.render);
+            }
 
             // update
             Engine.update(engine, delta, correction);
 
             // render
-            Engine.render(engine);
+            if (engine.render) {
+                Engine.render(engine);
+            }
 
             Events.trigger(engine, 'afterTick', event);
         })();