0
0
Fork 0
mirror of https://github.com/liabru/matter-js.git synced 2024-11-27 09:50:52 -05:00

added Demo.setManualControl

This commit is contained in:
liabru 2015-12-02 22:33:31 +00:00
parent df5f16ca5f
commit 203252a872
2 changed files with 61 additions and 4 deletions

View file

@ -31,7 +31,8 @@
Bodies = Matter.Bodies, Bodies = Matter.Bodies,
Events = Matter.Events, Events = Matter.Events,
Mouse = Matter.Mouse, Mouse = Matter.Mouse,
MouseConstraint = Matter.MouseConstraint; MouseConstraint = Matter.MouseConstraint,
Runner = Matter.Runner;
// MatterTools aliases // MatterTools aliases
if (window.MatterTools) { if (window.MatterTools) {
@ -41,6 +42,7 @@
Demo.create = function(options) { Demo.create = function(options) {
var defaults = { var defaults = {
isManual: false,
sceneName: 'mixed', sceneName: 'mixed',
sceneEvents: [] sceneEvents: []
}; };
@ -73,7 +75,7 @@
// set up a scene with bodies // set up a scene with bodies
Demo.reset(demo); Demo.reset(demo);
Example[demo.sceneName](demo); Demo.setScene(demo, demo.sceneName);
// set up demo interface (see end of this file) // set up demo interface (see end of this file)
Demo.initControls(demo); Demo.initControls(demo);
@ -93,6 +95,10 @@
} }
} }
Demo.setScene = function(demo, sceneName) {
Example[sceneName](demo);
};
// the functions for the demo interface and controls below // the functions for the demo interface and controls below
Demo.initControls = function(demo) { Demo.initControls = function(demo) {
var demoSelect = document.getElementById('demo-select'), var demoSelect = document.getElementById('demo-select'),
@ -162,13 +168,30 @@
document.addEventListener('fullscreenchange', fullscreenChange); 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 // initialise demo selector
demoSelect.value = demo.sceneName; demoSelect.value = demo.sceneName;
Demo.setUpdateSourceLink(demo.sceneName); Demo.setUpdateSourceLink(demo.sceneName);
demoSelect.addEventListener('change', function(e) { demoSelect.addEventListener('change', function(e) {
Demo.reset(demo); Demo.reset(demo);
Example[demo.sceneName = e.target.value](demo); Demo.setScene(demo,demo.sceneName = e.target.value);
Gui.update(demo.gui); Gui.update(demo.gui);
var scrollY = window.scrollY; var scrollY = window.scrollY;
@ -179,7 +202,7 @@
demoReset.addEventListener('click', function(e) { demoReset.addEventListener('click', function(e) {
Demo.reset(demo); Demo.reset(demo);
Example[demo.sceneName](demo); Demo.setScene(demo, demo.sceneName);
Gui.update(demo.gui); Gui.update(demo.gui);
Demo.setUpdateSourceLink(demo.sceneName); Demo.setUpdateSourceLink(demo.sceneName);
}); });
@ -191,6 +214,30 @@
demoViewSource.setAttribute('href', sourceUrl + '/' + sceneName + '.js'); 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) { Demo.fullscreen = function(demo) {
var _fullscreenElement = demo.engine.render.canvas; var _fullscreenElement = demo.engine.render.canvas;

View file

@ -193,6 +193,16 @@ var Common = require('./Common');
_cancelAnimationFrame(runner.frameRequestId); _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 * Events Documentation