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, 54 insertions, 53 deletions

diff --git a/assets/shaders/TwistVert.vert.glsl b/assets/shaders/TwistVert.vert.glsl
index 94d22020..b56e1318 100644
--- a/assets/shaders/TwistVert.vert.glsl
+++ b/assets/shaders/TwistVert.vert.glsl
@@ -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
@@ -64,51 +65,51 @@ varying vec2 v_texcoord;
 
 float GetAngle( float t )
 {
-        float angle= 0.0;
-        if (t < u_limit2)
-        {
-                if (t < u_limit1)
-                {
-                        angle = u_twistAmount;
-                }
-                else
-                {
-                        angle = (t - u_limit2)/(u_limit1 - u_limit2)*u_twistAmount;
-                }
-        }
-
-        return angle;
+    float angle= 0.0;
+    if (t < u_limit2)
+    {
+        if (t < u_limit1)
+        {
+            angle = u_twistAmount;
+        }
+        else
+        {
+            angle = (t - u_limit2)/(u_limit1 - u_limit2)*u_twistAmount;
+        }
+    }
+
+    return angle;
 }
 
 
 void main(void)
 {
-        vec3 pos = vert;
-        vec2 uv = texcoord;
-        v_texcoord = texcoord;
-
-        v_zNormal = 1.0;
-        if (uv.x < u_limit2)
-        {
-                float angle = GetAngle( uv.x );
-                float cs = cos(angle),  sn = sin(angle);
-
-                vec3 ctrPt = pos;
-                float y = pos.y*cs - pos.z*sn;  // + u_center;
-                pos.z   = pos.y*sn + pos.z*cs;
-                pos.y = y;
-
-                // rotate the normal
-                mat3 rotMat = mat3( vec3( 1.0,  0.0,  0.0 ),  vec3( 0.0,   cs,   sn ),  vec3( 0.0,  -sn,   cs ) );
-                vec3 pt0 = ctrPt, pt1 = vec3(ctrPt.x, ctrPt.y+1.0, ctrPt.z),  pt2 = vec3( ctrPt.x+1.0, ctrPt.y, ctrPt.z);
-                pt0 = rotMat * pt0;  pt1 = rotMat * pt1;
-                angle = GetAngle(1.0);
-                cs = cos(angle); sn = sin(angle);
-                rotMat = mat3( vec3( 1.0,  0.0,  0.0 ),  vec3( 0.0,   cs,   sn ),  vec3( 0.0,  -sn,   cs ) );
-                pt2 = rotMat * pt2;
-                vec4 nrm = vec4( cross(pt1-pt0, pt2-pt0), 1.0 );
-                v_zNormal   = -nrm.z;
-        }
-
-        gl_Position = u_projMatrix * u_mvMatrix * vec4(pos,1.0) ;
+    vec3 pos = vert;
+    vec2 uv = texcoord;
+    v_texcoord = texcoord;
+
+    v_zNormal = 1.0;
+    if (uv.x < u_limit2)
+    {
+        float angle = GetAngle( uv.x );
+        float cs = cos(angle),  sn = sin(angle);
+
+        vec3 ctrPt = pos;
+        float y = pos.y*cs - pos.z*sn;  // + u_center;
+        pos.z   = pos.y*sn + pos.z*cs;
+        pos.y = y;
+
+        // rotate the normal
+        mat3 rotMat = mat3( vec3( 1.0,  0.0,  0.0 ),  vec3( 0.0,   cs,   sn ),  vec3( 0.0,  -sn,   cs ) );
+        vec3 pt0 = ctrPt, pt1 = vec3(ctrPt.x, ctrPt.y+1.0, ctrPt.z),  pt2 = vec3( ctrPt.x+1.0, ctrPt.y, ctrPt.z);
+        pt0 = rotMat * pt0;  pt1 = rotMat * pt1;
+        angle = GetAngle(1.0);
+        cs = cos(angle); sn = sin(angle);
+        rotMat = mat3( vec3( 1.0,  0.0,  0.0 ),  vec3( 0.0,   cs,   sn ),  vec3( 0.0,  -sn,   cs ) );
+        pt2 = rotMat * pt2;
+        vec4 nrm = vec4( cross(pt1-pt0, pt2-pt0), 1.0 );
+        v_zNormal   = -nrm.z;
+    }
+
+    gl_Position = u_projMatrix * u_mvMatrix * vec4(pos,1.0) ;
 }