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, 333 insertions, 153 deletions

diff --git a/js/lib/geom/shape-primitive.js b/js/lib/geom/shape-primitive.js
index 34db60e8..3e9b0a0b 100644
--- a/js/lib/geom/shape-primitive.js
+++ b/js/lib/geom/shape-primitive.js
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 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.
+* 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 OWNER OR CONTRIBUTORS BE
+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
@@ -32,106 +33,319 @@ POSSIBILITY OF SUCH DAMAGE.
 var ShapePrimitive = {};
 
 ShapePrimitive.create = function(coords,  normals,  uvs,  indices, primType, vertexCount) {
-        var renderer = RDGE.globals.engine.getContext().renderer;
+    var renderer = RDGE.globals.engine.getContext().renderer;
 
-        // to setup a primitive you must define it
-        // create a new primitive definition here to then fill out
-        var prim = new RDGE.rdgePrimitiveDefinition();
+    // to setup a primitive you must define it
+    // create a new primitive definition here to then fill out
+    var prim = new RDGE.rdgePrimitiveDefinition();
 
-        // the vertex definition declares how the data will be delivered to the shader
-        // the position of an element in array determines which attribute in a shader the
-        // data is bound to
-        prim.vertexDefinition = {
-                // this shows two ways to map this data to an attribute
-                "vert":{'type':renderer.VS_ELEMENT_POS, 'bufferIndex':0, 'bufferUsage': renderer.BUFFER_STATIC},
-                "a_pos":{'type':renderer.VS_ELEMENT_POS, 'bufferIndex':0, 'bufferUsage': renderer.BUFFER_STATIC},
+    // the vertex definition declares how the data will be delivered to the shader
+    // the position of an element in array determines which attribute in a shader the
+    // data is bound to
+    prim.vertexDefinition = {
+        // this shows two ways to map this data to an attribute
+        "vert":{'type':renderer.VS_ELEMENT_POS, 'bufferIndex':0, 'bufferUsage': renderer.BUFFER_STATIC},
+        "a_pos":{'type':renderer.VS_ELEMENT_POS, 'bufferIndex':0, 'bufferUsage': renderer.BUFFER_STATIC},
 
-                "normal":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC},
-                "a_nrm":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC},
-                "a_normal":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC},
+        "normal":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC},
+        "a_nrm":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC},
+        "a_normal":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC},
 
-                "texcoord":{'type':renderer.VS_ELEMENT_FLOAT2, 'bufferIndex':2, 'bufferUsage': renderer.BUFFER_STATIC},
-                "a_texcoord":{'type':renderer.VS_ELEMENT_FLOAT2, 'bufferIndex':2, 'bufferUsage': renderer.BUFFER_STATIC}
-        };
+        "texcoord":{'type':renderer.VS_ELEMENT_FLOAT2, 'bufferIndex':2, 'bufferUsage': renderer.BUFFER_STATIC},
+        "a_texcoord":{'type':renderer.VS_ELEMENT_FLOAT2, 'bufferIndex':2, 'bufferUsage': renderer.BUFFER_STATIC}
+    };
 
-        // the actual data that correlates to the vertex definition
-        prim.bufferStreams = [ coords, normals, uvs ];
+    // the actual data that correlates to the vertex definition
+    prim.bufferStreams = [ coords, normals, uvs ];
 
-        // what type of buffers the data resides in, static is the most common case
-        prim.streamUsage = [ renderer.BUFFER_STATIC, renderer.BUFFER_STATIC, renderer.BUFFER_STATIC ];
+    // what type of buffers the data resides in, static is the most common case
+    prim.streamUsage = [ renderer.BUFFER_STATIC, renderer.BUFFER_STATIC, renderer.BUFFER_STATIC ];
 
-        // this tells the renderer to draw the primitive as a list of triangles
-        prim.type = primType;
+    // this tells the renderer to draw the primitive as a list of triangles
+    prim.type = primType;
 
-        prim.indexUsage = renderer.BUFFER_STREAM;
-        prim.indexBuffer = indices;
+    prim.indexUsage = renderer.BUFFER_STREAM;
+    prim.indexBuffer = indices;
 
-        // finally the primitive is created, buffers are generated and the system determines
-        // the data it needs to draw this primitive according to the previous definition
-        renderer.createPrimitive(prim, vertexCount);
+    // finally the primitive is created, buffers are generated and the system determines
+    // the data it needs to draw this primitive according to the previous definition
+    renderer.createPrimitive(prim, vertexCount);
 
-        return prim;
+    return prim;
 };
 
 ShapePrimitive.getMeshBounds = function( verts,  nVerts )
 {
-        if (!verts || (nVerts <= 0))  return null;
+    if (!verts || (nVerts <= 0))  return null;
+
+    var bounds = [verts[0], verts[1], verts[2],  verts[0], verts[1], verts[2]];
+    var index = 3;
+    for (var i=1;  i<nVerts;  i++)
+    {
+        var x = verts[index],  y = verts[index+1],  z = verts[index+2];
+        index += 3;
+
+        if      (x < bounds[0])  bounds[0] = x;
+        else if (x > bounds[3])  bounds[3] = x;
+        if      (y < bounds[1])  bounds[1] = y;
+        else if (y > bounds[4])  bounds[4] = y;
+        if      (z < bounds[2])  bounds[2] = z;
+        else if (z > bounds[5])  bounds[5] = z;
+    }
+
+    return bounds;
+};
 
-        var bounds = [verts[0], verts[1], verts[2],  verts[0], verts[1], verts[2]];
-        var index = 3;
-        for (var i=1;  i<nVerts;  i++)
-        {
-                var x = verts[index],  y = verts[index+1],  z = verts[index+2];
-                index += 3;
+ShapePrimitive.getBounds = function( prim )
+{
+    var verts = prim.bufferStreams[0];
+    var nVerts = verts.length;
+    var xMin = verts[0],  xMax = verts[0],
+        yMin = verts[1],  yMax = verts[1],
+        zMin = verts[2],  zMax = verts[2];
+
+    for (var index=3;  index<verts.length;  )
+    {
+        if (verts[index] < xMin)  xMin = verts[index];
+        else if (verts[index] > xMax)  xMax = verts[index];
+
+        index++;
+        if (verts[index] < yMin)  yMin = verts[index];
+        else if (verts[index] > yMax)  yMax = verts[index];
+
+        index++;
+        if (verts[index] < zMin)  zMin = verts[index];
+        else if (verts[index] > zMax)  zMax = verts[index];
+
+        index++;
+    }
+
+    return [xMin, yMin, zMin,  xMax, yMax, zMax];
+};
 
-                if      (x < bounds[0])  bounds[0] = x;
-                else if (x > bounds[3])  bounds[3] = x;
-                if      (y < bounds[1])  bounds[1] = y;
-                else if (y > bounds[4])  bounds[4] = y;
-                if      (z < bounds[2])  bounds[2] = z;
-                else if (z > bounds[5])  bounds[5] = z;
+ShapePrimitive.refineMesh = function( verts, norms, uvs, indices, nVertices,  paramRange,  tolerance )
+{
+    var oldVrtCount = nVertices;
+
+    // get the param range
+    var pUMin = paramRange[0],  pVMin = paramRange[1],
+        pUMax = paramRange[2],  pVMax = paramRange[3];
+    var iTriangle = 0;
+    var nTriangles = indices.length/3;
+    var index = 0;
+    while (iTriangle < nTriangles)
+    {
+        // get the indices of the 3 vertices
+        var i0 = indices[index],
+            i1 = indices[index+1],
+            i2 = indices[index+2];
+
+        // get the uv values
+        //var vrtIndex = 3*iTriangle;
+        var iuv0 = 2 * i0,
+            iuv1 = 2 * i1,
+            iuv2 = 2 * i2;
+        var u0 = uvs[iuv0],  v0 = uvs[iuv0+1],
+            u1 = uvs[iuv1],  v1 = uvs[iuv1+1],
+            u2 = uvs[iuv2],  v2 = uvs[iuv2+1];
+
+        // find the u and v range
+        var uMin = u0,  vMin = v0;
+        if (u1 < uMin)  uMin = u1;  if (v1 < vMin)  vMin = v1;
+        if (u2 < uMin)  uMin = u2;  if (v2 < vMin)  vMin = v2;
+        var uMax = u0,  vMax = v0;
+        if (u1 > uMax)  uMax = u1;  if (v1 > vMax)  vMax = v1;
+        if (u2 > uMax)  uMax = u2;  if (v2 > vMax)  vMax = v2;
+
+        // if the parameter range of the triangle is outside the
+        // desired parameter range, advance to the next polygon and continue
+        if ((uMin > pUMax) || (uMax < pUMin) || (vMin > pVMax) || (vMax < pVMin))
+        {
+            // go to the next triangle
+            iTriangle++;
+            index += 3;
+        }
+        else
+        {
+            // check thesize of the triangle in uv space.  If small enough, advance
+            // to the next triangle.  If not small enough, split the triangle into 3;
+                        var du = Math.abs(uMax) - u