Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor timing: Code review issues, masks refactoring in progress #367

Merged
merged 16 commits into from
Dec 17, 2015
Merged

Refactor timing: Code review issues, masks refactoring in progress #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c3b91ba
notes and fixes from code review
shamansir Dec 15, 2015
de9be2a
fix rewriting next position after the jumps
shamansir Dec 16, 2015
7d9635a
massive renamings in Timeline class, p.1
shamansir Dec 16, 2015
d528e83
massive renamings in Timeline class, p.2
shamansir Dec 16, 2015
751bd9e
massive renamings in Timeline class, p.3 (.time -> .timeline)
shamansir Dec 16, 2015
41892b7
massive renamings in Timeline class, p.4 (timeline.fits() -> timeline…
shamansir Dec 16, 2015
d8eb3ca
move all child-ticking from Element.render to Element.tick, p.1
shamansir Dec 16, 2015
3b4602b
fix syntax error in Timeline class
shamansir Dec 16, 2015
637c9ef
massive renamings in Timeline class, p.5 (.time -> .timeline, continue)
shamansir Dec 16, 2015
a9d1582
move all child-ticking from Element.render to Element.tick, p.2
shamansir Dec 16, 2015
9675b26
refactor masking, p.1
shamansir Dec 17, 2015
a8d3670
fix renaming errors
shamansir Dec 17, 2015
b8c5743
fix more renaming errors
shamansir Dec 17, 2015
097e08d
element.mode duplicates element.repeat, removed the first one
shamansir Dec 17, 2015
b234f3c
avoid using direct calls to timeline methods even more
shamansir Dec 17, 2015
e558ce6
Merge branch 'develop' into refactor-timing
shamansir Dec 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 26 additions & 27 deletions src/anm/animation/animation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function Animation() {
//this.fps = undefined;
this.__lastOverElm = null;
this._laters = [];
this.time = new Timeline(this);
this.timeline = new Timeline(this);

var defaultScene = new Scene(this, '', 0);
this.scenes = [];
Expand Down Expand Up @@ -139,7 +139,7 @@ Animation.prototype.addScene = function(name, duration) {
};

Animation.prototype.getDuration = function() {
return this.time.getDuration();
return this.timeline.getDuration();
};

/*Animation.prototype.getTotalDurationFromScenes = function() {
Expand Down Expand Up @@ -202,9 +202,9 @@ Animation.prototype.traverse = function(visitor, data) {
* @param {Object} [data]
*/
Animation.prototype.traverseVisible = function(visitor, data) {
if (this.currentScene && this.currentScene.time.fits()) {
if (this.currentScene && this.currentScene.isActive()) {
this.currentScene.traverse(function(child) {
return (child.time.fits() && (visitor(child, data) === false)) ? false : true;
return (child.isActive() && (visitor(child, data) === false)) ? false : true;
});
}
return this;
Expand All @@ -225,9 +225,9 @@ Animation.prototype.traverseVisible = function(visitor, data) {
* @param {Object} [data]
*/
Animation.prototype.reverseTraverseVisible = function(visitor, data) {
if (this.currentScene && this.currentScene.time.fits()) {
if (this.currentScene && this.currentScene.isActive()) {
this.currentScene.reverseTraverse(function(child) {
return (child.time.fits() && (visitor(child, data) === false)) ? false : true;
return (child.isActive() && (visitor(child, data) === false)) ? false : true;
});
}
return this;
Expand Down Expand Up @@ -317,10 +317,10 @@ Animation.prototype.render = function(ctx) {
};

Animation.prototype.tick = function(dt) {
var curSceneTime = this.currentScene.time;
if ((curSceneTime.pos + dt) < curSceneTime.duration) {
this.currentScene.tick(dt);
this.time.tick(dt);
var currentScene = this.currentScene;
if ((currentScene.getTime() + dt) < currentScene.getDuration()) {
currentScene.tick(dt);
this.timeline.tick(dt);
} else {
this._changeToNextScene(dt);
}
Expand All @@ -329,26 +329,25 @@ Animation.prototype.tick = function(dt) {
Animation.prototype._changeToNextScene = function(dt) {
var nextScene = (this.currentSceneIdx < this.scenes.length)
? this.scenes[this.currentSceneIdx + 1] : null;
var currentScene = this.currentScene;
var left = (currentScene.getDuration() - currentScene.getTime());
currentScene.tick(left);
if (nextScene) {
var currentSceneTime = this.currentScene.time;
var left = (currentSceneTime.duration - currentSceneTime.pos);
this.currentScene.tick(left);
this.currentSceneIdx++;
this.currentScene = nextScene;
this.currentScene.tick(dt - left); // tick the remainder in the next scene
} else {
this.currentScene.tick(dt);
if (this.endOnLastScene) this.time.endNow();
if (this.endOnLastScene) this.timeline.endNow();
}
};

Animation.prototype.pause = function() {
this.time.pause();
this.timeline.pause();
this.currentScene.pause();
};

Animation.prototype.continue = function() {
this.time.continue();
this.timeline.continue();
this.currentScene.continue();
};

Expand All @@ -363,7 +362,7 @@ Animation.prototype.continue = function() {
*/
Animation.prototype.jump = function(t) {
var prev_time = this.getTime();
this.time.jump(t);
this.timeline.jump(t);
this.goToSceneAt(t);
};

Expand All @@ -379,31 +378,31 @@ Animation.prototype.jump = function(t) {
Animation.prototype.jumpTo = function(selector) {
var elm = is.str(selector) ? this.find(selector) : selector;
if (!elm) return;
//this.jump(elm.time.getGlobalStart());
//this.jump(elm.timeline.getGlobalStart());
if (elm instanceof Scene) {
this.goToScene(elm);
} else {
this.time.jumpTo(elm);
this.timeline.jumpTo(elm);
this.goToSceneAt(this.getTime());
}
};

Animation.prototype.jumpToStart = function() {
this.time.jumpToStart();
this.timeline.jumpToStart();
this.setCurrentScene(0);
this.currentScene.jumpToStart();
};

Animation.prototype.getTime = function() {
return this.time.getLastPosition();
return this.timeline.getLastPosition();
};

Animation.prototype.setDuration = function(duration) {
this.time.setDuration(duration);
this.timeline.setDuration(duration);
};

Animation.prototype.setSpeed = function(speed) {
this.time.setSpeed(speed);
this.timeline.setSpeed(speed);
};

Animation.prototype.goToScene = function(scene) {
Expand All @@ -421,8 +420,8 @@ Animation.prototype.goToSceneAt = function(t) {
var loc_t = t;
var i = 0,
cursor = this.scenes[i];
while (/*(i < this.scenes.length) && */cursor && (loc_t > cursor.time.duration)) {
loc_t = loc_t - cursor.time.duration;
while (/*(i < this.scenes.length) && */cursor && (loc_t > cursor.timeline.getDuration())) {
loc_t = loc_t - cursor.timeline.getDuration();
i++; cursor = this.scenes[i];
}
if (cursor) {
Expand All @@ -445,7 +444,7 @@ Animation.prototype.goToSceneAt = function(t) {
* Reset all render-related data for itself, and the data of all the elements.
*/
Animation.prototype.reset = function() {
this.time.reset();
this.timeline.reset();
this.eachScene(function(scene) {
scene.reset();
});
Expand Down
Loading