Merge remote branch 'origin/master'

This commit is contained in:
Jonathan Puckey 2011-04-22 18:43:21 +02:00
commit c9538e8b53
4 changed files with 6 additions and 6 deletions

View file

@ -264,7 +264,7 @@
groupTogether = false, groupTogether = false,
pathLength = heartPath.length, pathLength = heartPath.length,
mouseDown = false; mouseDown = false;
function onFrameLoop() { function onFrame() {
count++; count++;
for(var i = 0, l = boids.length; i < l; i++) { for(var i = 0, l = boids.length; i < l; i++) {
if (groupTogether) { if (groupTogether) {

View file

@ -30,7 +30,7 @@
var children = document.activeLayer.children; var children = document.activeLayer.children;
var count = 0; var count = 0;
function onFrameLoop() { function onFrame() {
count++; count++;
for (var i = 0, l = children.length; i < l; i++) { for (var i = 0, l = children.length; i < l; i++) {
var item = children[i]; var item = children[i];

View file

@ -36,7 +36,7 @@
} }
var count = 0; var count = 0;
function onFrameLoop() { function onFrame() {
count++; count++;
for (var i = 0, l = layer.children.length; i < l; i++) { for (var i = 0, l = layer.children.length; i < l; i++) {
var item = layer.children[i]; var item = layer.children[i];

View file

@ -145,12 +145,12 @@ var PaperScript = new function() {
}); });
} }
try { try {
var onFrameLoop = eval('onFrameLoop'); var onFrame = eval('onFrame');
if (onFrameLoop) { if (onFrame) {
function loop() { function loop() {
// Request next frame already // Request next frame already
Event.requestAnimationFrame(loop, doc && doc.canvas); Event.requestAnimationFrame(loop, doc && doc.canvas);
onFrameLoop(); onFrame();
// Automatically redraw document each frame. // Automatically redraw document each frame.
doc && doc.redraw(); doc && doc.redraw();
} }