mirror of
https://github.com/scratchfoundation/scratch-vm.git
synced 2025-07-26 22:20:41 -04:00
Merge pull request #102 from tmickel/feature/fps-counter
Add stats.js meter to playground
This commit is contained in:
commit
c969b51dee
3 changed files with 11 additions and 1 deletions
|
@ -23,6 +23,7 @@
|
||||||
"json-loader": "0.5.4",
|
"json-loader": "0.5.4",
|
||||||
"scratch-blocks": "git+https://git@github.com/LLK/scratch-blocks.git",
|
"scratch-blocks": "git+https://git@github.com/LLK/scratch-blocks.git",
|
||||||
"scratch-render": "git+https://git@github.com/LLK/scratch-render.git",
|
"scratch-render": "git+https://git@github.com/LLK/scratch-render.git",
|
||||||
|
"stats.js": "0.16.0",
|
||||||
"tap": "5.7.1",
|
"tap": "5.7.1",
|
||||||
"webpack": "1.13.0",
|
"webpack": "1.13.0",
|
||||||
"webpack-dev-server": "1.14.1"
|
"webpack-dev-server": "1.14.1"
|
||||||
|
|
|
@ -725,7 +725,8 @@
|
||||||
</category>
|
</category>
|
||||||
<category name="More Blocks" colour="#FF6680"></category>
|
<category name="More Blocks" colour="#FF6680"></category>
|
||||||
</xml>
|
</xml>
|
||||||
|
<!-- FPS counter -->
|
||||||
|
<script src="../node_modules/stats.js/build/stats.min.js"></script>
|
||||||
<!-- Syntax highlighter -->
|
<!-- Syntax highlighter -->
|
||||||
<script src="../node_modules/highlightjs/highlight.pack.min.js"></script>
|
<script src="../node_modules/highlightjs/highlight.pack.min.js"></script>
|
||||||
<!-- Scratch Blocks -->
|
<!-- Scratch Blocks -->
|
||||||
|
|
|
@ -29,6 +29,12 @@ window.onload = function() {
|
||||||
});
|
});
|
||||||
window.workspace = workspace;
|
window.workspace = workspace;
|
||||||
|
|
||||||
|
// FPS counter.
|
||||||
|
var stats = new window.Stats();
|
||||||
|
document.getElementById('tab-renderexplorer').appendChild(stats.dom);
|
||||||
|
stats.dom.style.position = 'relative';
|
||||||
|
stats.begin();
|
||||||
|
|
||||||
// Block events.
|
// Block events.
|
||||||
// @todo: Re-enable flyout listening after fixing GH-69.
|
// @todo: Re-enable flyout listening after fixing GH-69.
|
||||||
workspace.addChangeListener(vm.blockListener);
|
workspace.addChangeListener(vm.blockListener);
|
||||||
|
@ -87,6 +93,8 @@ window.onload = function() {
|
||||||
|
|
||||||
// Inform VM of animation frames.
|
// Inform VM of animation frames.
|
||||||
var animate = function() {
|
var animate = function() {
|
||||||
|
stats.end();
|
||||||
|
stats.begin();
|
||||||
window.vm.animationFrame();
|
window.vm.animationFrame();
|
||||||
requestAnimationFrame(animate);
|
requestAnimationFrame(animate);
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue