scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-06 04:42:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Separate requesting and handling of animation frames.

Browse source 
Closes #176.
This commit is contained in:
Jürg Lehni 2013-07-19 17:33:32 -07:00
parent cd40bd2c9d
commit ec121ca04c
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/ui/View.js
View file

@ -145,11 +145,11 @@ var View = Base.extend(Callback, /** @lends View# */{
onFrame: { onFrame: {
install: function() { install: function() {
/*#*/ if (options.browser) { /*#*/ if (options.browser) {
// Call the onFrame handler straight away and initialize the // Request a frame handler straight away to initialize the
// sequence of onFrame calls. // sequence of onFrame calls.
if (!this._requested) { if (!this._requested) {
this._animate = true; this._animate = true;
this._handleFrame(true); this._requestFrame();
} }
/*#*/ } // options.browser /*#*/ } // options.browser
}, },
@ -169,21 +169,23 @@ var View = Base.extend(Callback, /** @lends View# */{
_time: 0, _time: 0,
_count: 0, _count: 0,
_handleFrame: function(request) { _requestFrame: function() {
this._requested = false; var that = this;
// See if we need to stop due to a call to uninstall() DomEvent.requestAnimationFrame(function() {
if (!this._animate) that._requested = false;
return; // Do we need to stop due to a call to the frame event's uninstall()
if (!that._animate)
return;
// Request next frame already before handling the current frame
that._requestFrame();
that._handleFrame();
}, this._element);
this._requested = true;
},
_handleFrame: function() {
// Set the global paper object to the current scope // Set the global paper object to the current scope
paper = this._scope; paper = this._scope;
if (request) {
// Request next frame already
this._requested = true;
var that = this;
DomEvent.requestAnimationFrame(function() {
that._handleFrame(true);
}, this._element);
}
var now = Date.now() / 1000, var now = Date.now() / 1000,
delta = this._before ? now - this._before : 0; delta = this._before ? now - this._before : 0;
this._before = now; this._before = now;
@ -213,11 +215,11 @@ var View = Base.extend(Callback, /** @lends View# */{
time: 0, time: 0,
count: 0 count: 0
}; };
if (++this._frameItemCount == 1) if (++this._frameItemCount === 1)
this.attach('frame', this._handleFrameItems); this.attach('frame', this._handleFrameItems);
} else { } else {
delete items[item._id]; delete items[item._id];
if (--this._frameItemCount == 0) { if (--this._frameItemCount === 0) {
// If this is the last one, just stop animating straight away. // If this is the last one, just stop animating straight away.
this.detach('frame', this._handleFrameItems); this.detach('frame', this._handleFrameItems);
} }