Mirrors/Tone.js
2
0
Fork 0
mirror of https://github.com/Tonejs/Tone.js synced 2024-11-16 08:38:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

evaluate time with .valueOf

Browse source
This commit is contained in:
Yotam Mann 2017-12-17 12:53:34 -05:00
parent 410eb5727d
commit 92c7638786
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Tone/core/IntervalTimeline.js
View file

@ -4,7 +4,7 @@ define(["Tone/core/Tone", "Tone/type/Type"], function (Tone) {
/** /**
* @class Similar to Tone.Timeline, but all events represent * @class Similar to Tone.Timeline, but all events represent
* intervals with both "time" and "duration" times. The * intervals with both "time" and "duration" times. The
* events are placed in a tree structure optimized * events are placed in a tree structure optimized
* for querying an intersection point with the timeline * for querying an intersection point with the timeline
* events. Internally uses an [Interval Tree](https://en.wikipedia.org/wiki/Interval_tree) * events. Internally uses an [Interval Tree](https://en.wikipedia.org/wiki/Interval_tree)
@ -33,7 +33,7 @@ define(["Tone/core/Tone", "Tone/type/Type"], function (Tone) {
Tone.extend(Tone.IntervalTimeline); Tone.extend(Tone.IntervalTimeline);
/** /**
* The event to add to the timeline. All events must * The event to add to the timeline. All events must
* have a time and duration value * have a time and duration value
* @param {Object} event The event to add to the timeline * @param {Object} event The event to add to the timeline
* @return {Tone.IntervalTimeline} this * @return {Tone.IntervalTimeline} this
@ -42,6 +42,7 @@ define(["Tone/core/Tone", "Tone/type/Type"], function (Tone) {
if (Tone.isUndef(event.time) || Tone.isUndef(event.duration)){ if (Tone.isUndef(event.time) || Tone.isUndef(event.duration)){
throw new Error("Tone.IntervalTimeline: events must have time and duration parameters"); throw new Error("Tone.IntervalTimeline: events must have time and duration parameters");
} }
event.time = event.time.valueOf();
var node = new IntervalNode(event.time, event.time + event.duration, event); var node = new IntervalNode(event.time, event.time + event.duration, event);
if (this._root === null){ if (this._root === null){
this._root = node; this._root = node;
@ -120,8 +121,8 @@ define(["Tone/core/Tone", "Tone/type/Type"], function (Tone) {
/** /**
* Replace the references to the node in the node's parent * Replace the references to the node in the node's parent
* with the replacement node. * with the replacement node.
* @param {IntervalNode} node * @param {IntervalNode} node
* @param {IntervalNode} replacement * @param {IntervalNode} replacement
* @private * @private
*/ */
Tone.IntervalTimeline.prototype._replaceNodeInParent = function(node, replacement){ Tone.IntervalTimeline.prototype._replaceNodeInParent = function(node, replacement){
@ -138,7 +139,7 @@ define(["Tone/core/Tone", "Tone/type/Type"], function (Tone) {
}; };
/** /**
* Remove the node from the tree and replace it with * Remove the node from the tree and replace it with
* a successor which follows the schema. * a successor which follows the schema.
* @param {IntervalNode} node * @param {IntervalNode} node
* @private * @private
@ -231,7 +232,7 @@ define(["Tone/core/Tone", "Tone/type/Type"], function (Tone) {
Tone.IntervalTimeline.prototype._rotateRight = function(node){ Tone.IntervalTimeline.prototype._rotateRight = function(node){
var parent = node.parent; var parent = node.parent;
var isLeftChild = node.isLeftChild(); var isLeftChild = node.isLeftChild();
// Make node.left the new root of this sub tree (instead of node) // Make node.left the new root of this sub tree (instead of node)
var pivotNode = node.left; var pivotNode = node.left;
node.left = pivotNode.right; node.left = pivotNode.right;
@ -288,7 +289,7 @@ define(["Tone/core/Tone", "Tone/type/Type"], function (Tone) {
} }
} }
return max.event; return max.event;
} }
} }
return null; return null;
}; };
@ -380,8 +381,8 @@ define(["Tone/core/Tone", "Tone/type/Type"], function (Tone) {
/** /**
* Represents a node in the binary search tree, with the addition * Represents a node in the binary search tree, with the addition
* of a "high" value which keeps track of the highest value of * of a "high" value which keeps track of the highest value of
* its children. * its children.
* References: * References:
* https://brooknovak.wordpress.com/2013/12/07/augmented-interval-tree-in-c/ * https://brooknovak.wordpress.com/2013/12/07/augmented-interval-tree-in-c/
* http://www.mif.vu.lt/~valdas/ALGORITMAI/LITERATURA/Cormen/Cormen.pdf * http://www.mif.vu.lt/~valdas/ALGORITMAI/LITERATURA/Cormen/Cormen.pdf
* @param {Number} low * @param {Number} low
@ -407,7 +408,7 @@ define(["Tone/core/Tone", "Tone/type/Type"], function (Tone) {
this.height = 0; this.height = 0;
}; };
/** /**
* Insert a node into the correct spot in the tree * Insert a node into the correct spot in the tree
* @param {IntervalNode} node * @param {IntervalNode} node
*/ */
@ -426,7 +427,7 @@ define(["Tone/core/Tone", "Tone/type/Type"], function (Tone) {
}; };
/** /**
* Search the tree for nodes which overlap * Search the tree for nodes which overlap
* with the given point * with the given point
* @param {Number} point The point to query * @param {Number} point The point to query
* @param {Array} results The array to put the results * @param {Array} results The array to put the results
@ -457,7 +458,7 @@ define(["Tone/core/Tone", "Tone/type/Type"], function (Tone) {
}; };
/** /**
* Search the tree for nodes which are less * Search the tree for nodes which are less
* than the given point * than the given point
* @param {Number} point The point to query * @param {Number} point The point to query
* @param {Array} results The array to put the results * @param {Array} results The array to put the results
@ -469,7 +470,7 @@ define(["Tone/core/Tone", "Tone/type/Type"], function (Tone) {
if (this.left !== null){ if (this.left !== null){
this.left.searchAfter(point, results); this.left.searchAfter(point, results);
} }
} }
// search the right side // search the right side
if (this.right !== null){ if (this.right !== null){
this.right.searchAfter(point, results); this.right.searchAfter(point, results);

1
Tone/core/Timeline.js
View file

@ -86,6 +86,7 @@ define(["Tone/core/Tone"], function (Tone) {
if (Tone.isUndef(event.time)){ if (Tone.isUndef(event.time)){
throw new Error("Tone.Timeline: events must have a time attribute"); throw new Error("Tone.Timeline: events must have a time attribute");
} }
event.time = event.time.valueOf();
if (this._iterating){ if (this._iterating){
this._toAdd.push(event); this._toAdd.push(event);
} else { } else {