Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

1 files changed, 346 insertions, 345 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/animation.js b/js/helper-classes/RDGE/src/core/script/animation.js
index 2e13cce6..5564179d 100755
--- a/js/helper-classes/RDGE/src/core/script/animation.js
+++ b/js/helper-classes/RDGE/src/core/script/animation.js
@@ -1,345 +1,346 @@
-/* <copyright>

-Copyright (c) 2012, Motorola Mobility, Inc

-All Rights Reserved.

-BSD License.

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions are met:

-

-  - Redistributions of source code must retain the above copyright notice,

-    this list of conditions and the following disclaimer.

-  - Redistributions in binary form must reproduce the above copyright

-    notice, this list of conditions and the following disclaimer in the

-    documentation and/or other materials provided with the distribution.

-  - Neither the name of Motorola Mobility nor the names of its contributors

-    may be used to endorse or promote products derived from this software

-    without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-POSSIBILITY OF SUCH DAMAGE.

-</copyright> */

-

-// RDGE namespaces

-var RDGE = RDGE || {};

-RDGE.animation = RDGE.animation || {};

-

-/** 

- * channelController 

- * The channel controller is really the workhorse of the RDGE animation system. It handles timing, 

- * interpolation, and sampling of attributes over the lifetime of an animation. Each channel controller 

- * is responsible for animating a single attribute. The current implementation supports animating vector, 

- * boolean, or quaternion attributes. This class is used internally by the animation system.

- *

- * @param _animation - the animation resource

- * @param _channel - the channel id

- *

- */

-RDGE.animation.channelController = function (_animation, _channel) {

-    /** 

-    * this.interpolate - Enable/Disable interpolation between animation frames.  

-    * Typically this should be enabled for smoother looking animation. However, 

-    * there may be applications where interpolation is undesireable. 

-    */

-    this.interpolate = false;

-

-    /** 

-    * this.animation - the animation resource. 

-    * This is where the keyframes for the channel are stored. 

-    */

-    this.animation = _animation;

-

-    /**

-    * this.channel - the channel id. This is used to look up the keyframe data for this channel.

-    */

-    this.channel = _channel;

-

-    /**

-    * this.localTime - the current time, relative to the start time.

-    */

-    this.localTime = 0.0;

-

-    /**

-    * this.startTime - the start time of the animation clip window.

-    */

-    this.startTime = this.animation.clipStart / this.animation.framesPerSec;

-

-    /**

-    * this.endTime - the end time of the animation clip window.

-    */

-    this.endTime = this.animation.clipEnd / this.animation.framesPerSec;

-

-    /** 

-    * this.cachedFrame - cached frame index, this optimizes best case scenario computeFrame calls.

-    */

-    this.cachedFrame = -1;

-

-    /** 

-    * oneFrameInSecs - stores the interval of a single frame in seconds. This is used for internal calculations.

-    */

-    oneFrameInSecs = 1.0 / _animation.framesPerSec;

-

-    /** 

-    * this.channel.timeline - stores the animation timeline. 

-    * Currently this is calculated based on the framePerSec settings of the animation. 

-    * Eventually the timeline should be exported with the animation. Individual channels 

-    * may have different timelines depending on which frames are keyed.

-    */

-    this.channel.timeline = new Array(this.channel.numKeys + 1);

-    for (i = 0; i <= this.channel.numKeys; ++i) {

-        this.channel.timeline[i] = i / this.animation.framesPerSec;

-    }

-

-    /** this.computeFrame 

-    * Calculates the current frame index of the animation at the current time. 

-    * In the worst case, this function will perform a binary search for the frame 

-    * whose time is closest to and less than the current time. In the best case, 

-    * the current frame is near the most recently cached frame, or it remains unchanged. 

-    */

-    this.computeFrame = function () {

-        var absTime = this.localTime + this.startTime;

-        var start = this.animation.clipStart;

-        var end = this.animation.clipEnd;

-

-        if (this.cachedFrame != -1) {

-            // if the current time is reasonably close to the last frame processed try searching

-            // forward or backward. best case it is the next frame.

-            if (Math.abs(absTime - this.channel.timeline[this.cachedFrame]) < 5 * oneFrameInSecs) {

-                if (this.channel.timeline[this.cachedFrame] < absTime) {

-                    while (this.channel.timeline[this.cachedFrame + 1] <= absTime) {

-                        this.cachedFrame++;

-                        if (this.animation.looping) {

-                            if (this.cachedFrame > this.numFrames - 1) {

-                                this.cachedFrame -= this.numFrames - 1;

-                            }

-                        } else {

-                            if (this.cachedFrame > this.numFrames - 1) {

-                                this.cachedFrame = this.numFrames - 1;

-                            }

+/* <copyright>
+Copyright (c) 2012, Motorola Mobility LLC.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</copyright> */
+
+// RDGE namespaces
+var RDGE = RDGE || {};
+RDGE.animation = RDGE.animation || {};
+
+/**
+ * channelController
+ * The channel controller is really the workhorse of the RDGE animation system. It handles timing,
+ * interpolation, and sampling of attributes over the lifetime of an animation. Each channel controller
+ * is responsible for animating a single attribute. The current implementation supports animating vector,
+ * boolean, or quaternion attributes. This class is used internally by the animation system.
+ *
+ * @param _animation - the animation resource
+ * @param _channel - the channel id
+ *
+ */
+RDGE.animation.channelController = function (_animation, _channel) {
+    /**
+    * this.interpolate - Enable/Disable interpolation between animation frames.
+    * Typically this should be enabled for smoother looking animation. However,
+    * there may be applications where interpolation is undesireable.
+    */
+    this.interpolate = false;
+
+    /**
+    * this.animation - the animation resource.
+    * This is where the keyframes for the channel are stored.
+    */
+    this.animation = _animation;
+
+    /**
+    * this.channel - the channel id. This is used to look up the keyframe data for this channel.
+    */
+    this.channel = _channel;
+
+    /**
+    * this.localTime - the current time, relative to the start time.
+    */
+    this.localTime = 0.0;
+
+    /**
+    * this.startTime - the start time of the animation clip window.
+    */
+    this.startTime = this.animation.clipStart / this.animation.framesPerSec;
+
+    /**
+    * this.endTime - the end time of the animation clip window.
+    */
+    this.endTime = this.animation.clipEnd / this.animation.framesPerSec;
+
+    /**
+    * this.cachedFrame - cached frame index, this optimizes best case scenario computeFrame calls.
+    */
+    this.cachedFrame = -1;
+
+    /**
+    * oneFrameInSecs - stores the interval of a single frame in seconds. This is used for internal calculations.
+    */
+    oneFrameInSecs = 1.0 / _animation.framesPerSec;
+
+    /**
+    * this.channel.timeline - stores the animation timeline.
+    * Currently this is calculated based on the framePerSec settings of the animation.
+    * Eventually the timeline should be exported with the animation. Individual channels
+    * may have different timelines depending on which frames are keyed.
+    */
+    this.channel.timeline = new Array(this.channel.numKeys + 1);
+    for (i = 0; i <= this.channel.numKeys; ++i) {
+        this.channel.timeline[i] = i / this.animation.framesPerSec;
+    }
+
+    /** this.computeFrame
+    * Calculates the current frame index of the animation at the current time.
+    * In the worst case, this function will perform a binary search for the frame
+    * whose time is closest to and less than the current time. In the best case,
+    * the current frame is near the most recently cached frame, or it remains unchanged.
+    */
+    this.computeFrame = function () {
+        var absTime = this.localTime + this.startTime;
+        var start = this.animation.clipStart;
+        var end = this.animation.clipEnd;
+
+        if (this.cachedFrame != -1) {
+            // if the current time is reasonably close to the last frame processed try searching
+            // forward or backward. best case it is the next frame.
+            if (Math.abs(absTime - this.channel.timeline[this.cachedFrame]) < 5 * oneFrameInSecs) {
+                if (this.channel.timeline[this.cachedFrame] < absTime) {
+                    while (this.channel.timeline[this.cachedFrame + 1] <= absTime) {
+                        this.cachedFrame++;
+                        if (this.animation.looping) {
+                            if (this.cachedFrame > this.numFrames - 1) {
+                                this.cachedFrame -= this.numFrames - 1;
+                            }
+                        } else {
+                            if (this.cachedFrame > this.numFrames - 1) {
+                                this.cachedFrame = this.numFrames - 1;