Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts:
	js/panels/Timeline/DragDrop.js
	js/panels/Timeline/Keyframe.reel/Keyframe.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
	js/panels/Timeline/Span.reel/Span.js
	js/panels/Timeline/Style.reel/Style.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
	js/panels/Timeline/Track.reel/Track.html
	js/panels/Timeline/Track.reel/Track.js
	js/panels/Timeline/Track.reel/css/Track.css
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
	js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
	js/panels/Timeline/Tween.reel/Tween.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 266 insertions, 265 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/utilities.js b/js/helper-classes/RDGE/src/core/script/utilities.js
index 7dfe5e44..d4ac226e 100755
--- a/js/helper-classes/RDGE/src/core/script/utilities.js
+++ b/js/helper-classes/RDGE/src/core/script/utilities.js
@@ -1,265 +1,266 @@
-/* <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 || {};

-

-

-/* 

-// Methods not currently used in Ninja

-RDGE.getRandColor = function () {

-  var r = Math.random();

-  var g = Math.random();

-  var b =Math.random();

-  

-  return [r, g, b, 1.0];

-};

-

-RDGE.unProject = function (winx, winy, winz, modelMatrix, projMatrix, viewport) {

-    var inVal   = [0,0,0,0];

-

-    var finalMatrix = RDGE.mat4.mul(modelMatrix, projMatrix);

-    

-    finalMatrix = RDGE.mat4.inverse(finalMatrix);

-    if(!finalMatrix)

-      return  null;

-

-    inVal[0]=winx;

-    inVal[1]=winy;

-    inVal[2]=winz;

-    inVal[3]=1.0;

-

-    // Map x and y from window coordinates 

-    inVal[0] = (inVal[0] - viewport[0]) / viewport[2];

-    inVal[1] = (inVal[1] - viewport[1]) / viewport[3];

-

-    // Map to range -1 to 1 

-    inVal[0] = inVal[0] * 2 - 1;

-    inVal[1] = inVal[1] * 2 - 1;

-    inVal[2] = inVal[2] * 2 - 1;

-

-    var v4Out = RDGE.mat4.transformPoint(finalMatrix, inVal);

-    

-    if (v4Out[3] <= 0.0001) 

-                return null;

-    

-    v4Out[0] /= v4Out[3];

-    v4Out[1] /= v4Out[3];

-    v4Out[2] /= v4Out[3];

-    

-    return [ v4Out[0], v4Out[1], v4Out[2] ];

-};

-

-RDGE.AABB2LineSegment = function (box, startPoint, endPoint) {

-    c = RDGE.vec3.scale(RDGE.vec3.add(box.min, box.max), 0.5);

-    e = RDGE.vec3.sub(box.max, box.min);

-    d = RDGE.vec3.sub(endPoint, startPoint);

-    m = RDGE.vec3.sub(startPoint, endPoint);

-    m = RDGE.vec3.sub(m, box.min),

-  m = RDGE.vec3.sub(m, box.max);

-

-  var adx = Math.abs(d[0]);

-  if( Math.abs(m[0]) > e[0] + adx ) return false;

-  

-  var ady = Math.abs(d[1]);

-  if( Math.abs(m[1]) > e[1] + ady ) return false;

-

-  var adz = Math.abs(d[2]);

-  if( Math.abs(m[2]) > e[2] + adz ) return false;

-

-  adx += 1.192092896e-07;

-  ady += 1.192092896e-07;

-  adz += 1.192092896e-07;

-

-  if( Math.abs(m[1] * d[2] - m[2] * d[1]) > e[1] * adz + e[2] * ady ) return false;

-  if( Math.abs(m[2] * d[0] - m[0] * d[2]) > e[0] * adz + e[2] * adx ) return false;

-  if( Math.abs(m[0] * d[1] - m[1] * d[0]) > e[0] * ady + e[1] * adx ) return false;

-

-  return true;

-};

-

-RDGE.hitTest = function (mesh, near, far) {

-    // holds distance to the nearest BV

-  var dist = null;

-  var BV = null;

-  

-    for (var index = 0; index < mesh.BVL.length; index++) {

-        if (AABB2LineSegment(mesh.BVL[index], near, far)) {

-            var center = RDGE.vec3.scale(RDGE.vec3.add(mesh.BVL[index].min, mesh.BVL[index].max), 0.5);

-            var newDist = RDGE.vec3.dot(RDGE.mat4.row(RDGE.globals.cam.world, 2), center);

-            if (newDist < dist || dist == null) {

-        dist = newDist;

-        BV = mesh.BVL[index];

-      }

-    }

-  }

-  return BV;

-};

-

-

-

-*/

-

-

-

+/* <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 || {};
+
+
+/*
+// Methods not currently used in Ninja
+RDGE.getRandColor = function () {
+  var r = Math.random();
+  var g = Math.random();
+  var b =Math.random();
+
+  return [r, g, b, 1.0];
+};
+
+RDGE.unProject = function (winx, winy, winz, modelMatrix, projMatrix, viewport) {
+    var inVal   = [0,0,0,0];
+
+    var finalMatrix = RDGE.mat4.mul(modelMatrix, projMatrix);
+
+    finalMatrix = RDGE.mat4.inverse(finalMatrix);
+    if(!finalMatrix)
+      return  null;
+
+    inVal[0]=winx;
+    inVal[1]=winy;
+    inVal[2]=winz;
+    inVal[3]=1.0;
+
+    // Map x and y from window coordinates
+    inVal[0] = (inVal[0] - viewport[0]) / viewport[2];
+    inVal[1] = (inVal[1] - viewport[1]) / viewport[3];
+
+    // Map to range -1 to 1
+    inVal[0] = inVal[0] * 2 - 1;
+    inVal[1] = inVal[1] * 2 - 1;
+    inVal[2] = inVal[2] * 2 - 1;
+
+    var v4Out = RDGE.mat4.transformPoint(finalMatrix, inVal);
+
+    if (v4Out[3] <= 0.0001)
+        return null;
+
+    v4Out[0] /= v4Out[3];
+    v4Out[1] /= v4Out[3];
+    v4Out[2] /= v4Out[3];
+
+    return [ v4Out[0], v4Out[1], v4Out[2] ];
+};
+
+RDGE.AABB2LineSegment = function (box, startPoint, endPoint) {
+    c = RDGE.vec3.scale(RDGE.vec3.add(box.min, box.max), 0.5);
+    e = RDGE.vec3.sub(box.max, box.min);
+    d = RDGE.vec3.sub(endPoint, startPoint);
+    m = RDGE.vec3.sub(startPoint, endPoint);
+    m = RDGE.vec3.sub(m, box.min),
+  m = RDGE.vec3.sub(m, box.max);
+
+  var adx = Math.abs(d[0]);
+  if( Math.abs(m[0]) > e[0] + adx ) return false;
+
+  var ady = Math.abs(d[1]);
+  if( Math.abs(m[1]) > e[1] + ady ) return false;
+
+  var adz = Math.abs(d[2]);
+  if( Math.abs(m[2]) > e[2] + adz ) return false;
+
+  adx += 1.192092896e-07;
+  ady += 1.192092896e-07;
+  adz += 1.192092896e-07;
+
+  if( Math.abs(m[1] * d[2] - m[2] * d[1]) > e[1] * adz + e[2] * ady ) return false;
+  if( Math.abs(m[2] * d[0] - m[0] * d[2]) > e[0] * adz + e[2] * adx ) return false;
+  if( Math.abs(m[0] * d[1] - m[1] * d[0]) > e[0] * ady + e[1] * adx ) return false;
+
+  return true;
+};
+
+RDGE.hitTest = function (mesh, near, far) {
+    // holds distance to the nearest BV
+  var dist = null;
+  var BV = null;
+
+    for (var index = 0; index < mesh.BVL.length; index++) {
+        if (AABB2LineSegment(mesh.BVL[index], near, far)) {
+            var center = RDGE.vec3.scale(RDGE.vec3.add(mesh.BVL[index].min, mesh.BVL[index].max), 0.5);
+            var newDist = RDGE.vec3.dot(RDGE.mat4.row(RDGE.globals.cam.world, 2), center);
+            if (newDist < dist || dist == null) {
+        dist = newDist;
+        BV = mesh.BVL[index];
+      }
+    }
+  }
+  return BV;
+};
+
+
+
+*/
+
+