added Demo.setManualControl

liabru · Dec 2, 2015 · 203252a · 203252a
1 parent df5f16c
commit 203252a
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 4 deletions.
diff --git a/demo/js/Demo.js b/demo/js/Demo.js
@@ -31,7 +31,8 @@
         Bodies = Matter.Bodies,
         Events = Matter.Events,
         Mouse = Matter.Mouse,
-        MouseConstraint = Matter.MouseConstraint;
+        MouseConstraint = Matter.MouseConstraint,
+        Runner = Matter.Runner;
 
     // MatterTools aliases
     if (window.MatterTools) {
@@ -41,6 +42,7 @@
 
     Demo.create = function(options) {
         var defaults = {
+            isManual: false,
             sceneName: 'mixed',
             sceneEvents: []
         };
@@ -73,7 +75,7 @@
 
         // set up a scene with bodies
         Demo.reset(demo);
-        Example[demo.sceneName](demo);
+        Demo.setScene(demo, demo.sceneName);
 
         // set up demo interface (see end of this file)
         Demo.initControls(demo);
@@ -93,6 +95,10 @@
         }
     }
 
+    Demo.setScene = function(demo, sceneName) {
+        Example[sceneName](demo);
+    };
+
     // the functions for the demo interface and controls below
     Demo.initControls = function(demo) {
         var demoSelect = document.getElementById('demo-select'),
@@ -162,13 +168,30 @@
             document.addEventListener('fullscreenchange', fullscreenChange);
         }
 
+        // keyboard controls
+        document.onkeypress = function(keys) {
+            // shift + a = toggle manual
+            if (keys.shiftKey && keys.keyCode === 65) {
+                Demo.setManualControl(demo, !demo.isManual);
+            }
+
+            // shift + q = step
+            if (keys.shiftKey && keys.keyCode === 81) {
+                if (!demo.isManual) {
+                    Demo.setManualControl(demo, true);
+                }
+
+                Runner.tick(demo.runner, demo.engine);
+            }
+        };
+
         // initialise demo selector
         demoSelect.value = demo.sceneName;
         Demo.setUpdateSourceLink(demo.sceneName);
 
         demoSelect.addEventListener('change', function(e) {
             Demo.reset(demo);
-            Example[demo.sceneName = e.target.value](demo);
+            Demo.setScene(demo,demo.sceneName = e.target.value);
             Gui.update(demo.gui);
 
             var scrollY = window.scrollY;
@@ -179,7 +202,7 @@
 
         demoReset.addEventListener('click', function(e) {
             Demo.reset(demo);
-            Example[demo.sceneName](demo);
+            Demo.setScene(demo, demo.sceneName);
             Gui.update(demo.gui);
             Demo.setUpdateSourceLink(demo.sceneName);
         });
@@ -191,6 +214,30 @@
         demoViewSource.setAttribute('href', sourceUrl + '/' + sceneName + '.js');
     };
 
+    Demo.setManualControl = function(demo, isManual) {
+        var engine = demo.engine,
+            world = engine.world,
+            runner = demo.runner;
+
+        demo.isManual = isManual;
+
+        if (demo.isManual) {
+            Runner.stop(runner);
+
+            // continue rendering but not updating
+            (function render(time){
+                runner.frameRequestId = window.requestAnimationFrame(render);
+                Events.trigger(engine, 'beforeUpdate');
+                Events.trigger(engine, 'tick');
+                engine.render.controller.world(engine);
+                Events.trigger(engine, 'afterUpdate');
+            })();
+        } else {
+            Runner.stop(runner);
+            Runner.start(runner, engine);
+        }
+    };
+
     Demo.fullscreen = function(demo) {
         var _fullscreenElement = demo.engine.render.canvas;
 

diff --git a/src/core/Runner.js b/src/core/Runner.js
@@ -193,6 +193,16 @@ var Common = require('./Common');
         _cancelAnimationFrame(runner.frameRequestId);
     };
 
+    /**
+     * Alias for `Runner.run`.
+     * @method start
+     * @param {runner} runner
+     * @param {engine} engine
+     */
+    Runner.start = function(runner, engine) {
+        Runner.run(runner, engine);
+    };
+
     /*
     *
     *  Events Documentation