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>

2 files changed, 358 insertions, 356 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/fx/blur.js b/js/helper-classes/RDGE/src/core/script/fx/blur.js
index f105a391..72fc22ea 100755
--- a/js/helper-classes/RDGE/src/core/script/fx/blur.js
+++ b/js/helper-classes/RDGE/src/core/script/fx/blur.js
@@ -1,217 +1,218 @@
-/* <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.fx = RDGE.fx || {};

-

-/**

-* Implements a 5x5 blur.

-* See http://prideout.net/archive/bloom/

-* @param mipSizes - up to three pow2 mip sizes to be separately blurred

-*          and combined with the src image, e.g. [256,128,64]

-* @param enAuxTexture - true to enable an extra texture to be added to 

-*          the weighted blur mips (see doBlur)

-*/

-RDGE.fx.fxBlur = function (mipSizes, enAuxTexture) {

-    var separableBlurCombine_fshader = [

-    "#ifdef GL_ES",

-      "precision highp float;",

-    "#endif",

-

-    "varying vec2 vTexcoord;", // base tex coord

-    "uniform vec4 vWeights;",  // blend weights

-

-    enAuxTexture ? "uniform sampler2D sTextureAux;" : "", // aux image (unweighted)

-                   "uniform sampler2D sTexture1;",        // source texture #1

-    mipSizes[0] ? "uniform sampler2D sTexture2;" : "",   // source texture #2

-    mipSizes[1] ? "uniform sampler2D sTexture3;" : "",   // source texture #3

-    mipSizes[2] ? "uniform sampler2D sTexture4;" : "",   // source texture #4

-

-    "void main()",

-    "{",

-      "vec4 blurCol = vWeights.x * texture2D(sTexture1, vTexcoord, -32.0);",

-      mipSizes[0] ? "blurCol += vWeights.y * texture2D(sTexture2, vTexcoord, -32.0);" : "",

-      mipSizes[1] ? "blurCol += vWeights.z * texture2D(sTexture3, vTexcoord, -32.0);" : "",

-      mipSizes[2] ? "blurCol += vWeights.w * texture2D(sTexture4, vTexcoord, -32.0);" : "",

-

-      enAuxTexture ? "gl_FragColor = texture2D(sTextureAux, vTexcoord, -32.0) + blurCol;" : "gl_FragColor = blurCol;",

-    "}"

-

-    ].join("\n");

-

-

-    function renderInitBlur(quad) {

-        quad.shader = RDGE.createShader(gl, 'separableBlur_vshader', 'separableBlur_fshader', ["vert", "texcoord"]);

-        quad.renderObj = new RDGE.RenderObject(quad.shader);

-

-        quad.vertBuffer = quadBuf.vertexObject;

-        quad.uvBuffer = quadBuf.texCoordObject;

-

-        quad.renderObj.addTexture("sTexture", 0, RDGE.UNIFORMTYPE.TEXTURE2D);

-

-        quad.renderObj.addBuffers(quad.vertBuffer, gl.ARRAY_BUFFER, 3, 0, gl.FLOAT);

-        quad.renderObj.addBuffers(quad.uvBuffer, gl.ARRAY_BUFFER, 2, 2, gl.FLOAT);

-    };

-

-    function renderInitCombine(quad) {

-        quad.shader = RDGE.createShader(gl, 'separableBlur_vshader', separableBlurCombine_fshader, ["vert", "texcoord"]);

-        quad.renderObj = new RDGE.RenderObject(quad.shader);

-

-        quad.vertBuffer = quadBuf.vertexObject;

-        quad.uvBuffer = quadBuf.texCoordObject;

-

-        quad.renderObj.addTexture("sTexture1", 0, RDGE.UNIFORMTYPE.TEXTURE2D);

-        quad.renderObj.addTexture("sTexture2", 1, RDGE.UNIFORMTYPE.TEXTURE2D);

-        quad.renderObj.addTexture("sTexture3", 2, RDGE.UNIFORMTYPE.TEXTURE2D);

-        quad.renderObj.addTexture("sTexture4", 3, RDGE.UNIFORMTYPE.TEXTURE2D);

-        quad.renderObj.addTexture("sTextureAux", 4, RDGE.UNIFORMTYPE.TEXTURE2D);

-

-        quad.renderObj.addBuffers(quad.vertBuffer, gl.ARRAY_BUFFER, 3, 0, gl.FLOAT);

-        quad.renderObj.addBuffers(quad.uvBuffer, gl.ARRAY_BUFFER, 2, 2, gl.FLOAT);

-    };

-

-    // Screen aligned quad geometry

-    var quadBuf = getScreenAlignedQuad();

-

-    // Fbos for each mip level; two sets are used to pingpong horizontal and vertical blur

-    mipSizes = mipSizes || [128, 64, 32];

-

-    this.fboSet1 = [];

-    this.fboSet2 = [];

-

-    for (var i in mipSizes) {

-        this.fboSet1.push(createRenderTargetTexture(mipSizes[i], mipSizes[i]));

-        this.fboSet2.push(createRenderTargetTexture(mipSizes[i], mipSizes[i]));

-    };

-

-    // Blitter for downsampling

-    this.blitQuad = new RDGE.ScreenQuad(null);

-    this.blitQuad.initialize(RDGE.renderInitScreenQuad);

-

-    // Blur shader

-    this.blurQuad = new RDGE.ScreenQuad(null);

-    this.blurQuad.initialize(renderInitBlur);

-

-    this.v3Kernel = [5.0 / 16.0, 6.0 / 16.0, 5.0 / 16.0];

-    this.blurQuad.renderObj.addUniform("vCoeffs", this.v3Kernel, RDGE.UNIFORMTYPE.FLOAT3);

+/* <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.fx = RDGE.fx || {};
+
+/**
+* Implements a 5x5 blur.
+* See http://prideout.net/archive/bloom/
+* @param mipSizes - up to three pow2 mip sizes to be separately blurred
+*          and combined with the src image, e.g. [256,128,64]
+* @param enAuxTexture - true to enable an extra texture to be added to
+*          the weighted blur mips (see doBlur)
+*/
+RDGE.fx.fxBlur = function (mipSizes, enAuxTexture) {
+    var separableBlurCombine_fshader = [
+    "#ifdef GL_ES",
+      "precision highp float;",
+    "#endif",
+
+    "varying vec2 vTexcoord;", // base tex coord
+    "uniform vec4 vWeights;",  // blend weights
+
+    enAuxTexture ? "uniform sampler2D sTextureAux;" : "", // aux image (unweighted)
+                   "uniform sampler2D sTexture1;",        // source texture #1
+    mipSizes[0] ? "uniform sampler2D sTexture2;" : "",   // source texture #2
+    mipSizes[1] ? "uniform sampler2D sTexture3;" : "",   // source texture #3
+    mipSizes[2] ? "uniform sampler2D sTexture4;" : "",   // source texture #4
+
+    "void main()",
+    "{",
+      "vec4 blurCol = vWeights.x * texture2D(sTexture1, vTexcoord, -32.0);",
+      mipSizes[0] ? "blurCol += vWeights.y * texture2D(sTexture2, vTexcoord, -32.0);" : "",
+      mipSizes[1] ? "blurCol += vWeights.z * texture2D(sTexture3, vTexcoord, -32.0);" : "",
+      mipSizes[2] ? "blurCol += vWeights.w * texture2D(sTexture4, vTexcoord, -32.0);" : "",
+
+      enAuxTexture ? "gl_FragColor = texture2D(sTextureAux, vTexcoord, -32.0) + blurCol;" : "gl_FragColor = blurCol;",
+    "}"
+
+    ].join("\n");
+
+
+    function renderInitBlur(quad) {
+        quad.shader = RDGE.createShader(gl, 'separableBlur_vshader', 'separableBlur_fshader', ["vert", "texcoord"]);
+        quad.renderObj = new RDGE.RenderObject(quad.shader);
+
+        quad.vertBuffer = quadBuf.vertexObject;
+        quad.uvBuffer = quadBuf.texCoordObject;
+
+        quad.renderObj.addTexture("sTexture", 0, RDGE.UNIFORMTYPE.TEXTURE2D);
+
+        quad.renderObj.addBuffers(quad.vertBuffer, gl.ARRAY_BUFFER, 3, 0, gl.FLOAT);
+        quad.renderObj.addBuffers(quad.uvBuffer, gl.ARRAY_BUFFER, 2, 2, gl.FLOAT);
+    };
+
+    function renderInitCombine(quad) {
+        quad.shader = RDGE.createShader(gl, 'separableBlur_vshader', separableBlurCombine_fshader, ["vert", "texcoord"]);
+        quad.renderObj = new RDGE.RenderObject(quad.shader);
+
+        quad.vertBuffer = quadBuf.vertexObject;
+        quad.uvBuffer = quadBuf.texCoordObject;
+
+        quad.renderObj.addTexture("sTexture1", 0, RDGE.UNIFORMTYPE.TEXTURE2D);
+        quad.renderObj.addTexture("sTexture2", 1, RDGE.UNIFORMTYPE.TEXTURE2D);
+        quad.renderObj.addTexture("sTexture3", 2, RDGE.UNIFORMTYPE.TEXTURE2D);
+        quad.renderObj.addTexture("sTexture4", 3, RDGE.UNIFORMTYPE.TEXTURE2D);
+        quad.renderObj.addTexture("sTextureAux", 4, RDGE.UNIFORMTYPE.TEXTURE2D);
+
+        quad.renderObj.addBuffers(quad.vertBuffer, gl.ARRAY_BUFFER, 3, 0, gl.FLOAT);
+        quad.renderObj.addBuffers(quad.uvBuffer, gl.ARRAY_BUFFER, 2, 2, gl.FLOAT);
+    };
+
+    // Screen aligned quad geometry
+    var quadBuf = getScreenAlignedQuad();
+
+    // Fbos for each mip level; two sets are used to pingpong horizontal and vertical blur
+    mipSizes = mipSizes || [128, 64, 32];
+
+    this.fboSet1 = [];
+    this.fboSet2 = [];
+
+    for (var i in mipSizes) {
+        this.fboSet1.push(createRenderTargetTexture(mipSizes[i], mipSizes[i]));
+        this.fboSet2.push(createRenderTargetTexture(mipSizes[i], mipSizes[i]));
+    };
+
+    // Blitter for downsampling
+    this.blitQuad = new RDGE.ScreenQuad(null);
+    this.blitQuad.initialize(RDGE.renderInitScreenQuad);
+
+    // Blur shader
+    this.blurQuad = new RDGE.ScreenQuad(null);
+    this.blurQuad.initialize(renderInitBlur);
+
+    this.v3Kernel = [5.0 / 16.0, 6.0 / 16.0, 5.0 / 16.0];