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>

27 files changed, 3362 insertions, 2927 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 3db3df1d..02540033 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.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
@@ -40,92 +41,104 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "Bump Metal";
-        this._shaderName = "bumpMetal";
+    this._name = "Bump Metal";
+    this._shaderName = "bumpMetal";
 
 
+        this._defaultLightDiff = [0.3, 0.3, 0.3, 1.0];
     this._defaultDiffuseTexture = "assets/images/metal.png";
     this._defaultSpecularTexture = "assets/images/silver.png";
-        this._defaultNormalTexture = "assets/images/normalMap.png";
+    this._defaultNormalTexture = "assets/images/normalMap.png";
 
     // array textures indexed by shader uniform name
     this._glTextures = [];
 
-        this._speed = 1.0;
+    this._speed = 1.0;
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this.isAnimated                 = function()            {  return true;                                 };
-        this.getShaderDef               = function()            {  return bumpMetalMaterialDef; };
+    this.isAnimated         = function()        {  return true;                 };
+    this.getShaderDef       = function()        {  return bumpMetalMaterialDef; };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this._propNames                 = ["u_light0Diff",              "u_colMap",                     "u_normalMap",  "u_glowMap" ];
-        this._propLabels                = ["Diffuse Color",             "Diffuse Map",          "Bump Map",             "Specular Map" ];
-        this._propTypes                 = ["color",                             "file",                         "file",                 "file" ];
-        this._propValues                = [];
+    this._propNames         = ["u_light0Diff",      "u_colMap",         "u_normalMap",  "u_glowMap" ];
+    this._propLabels        = ["Diffuse Color",     "Diffuse Map",      "Bump Map",     "Specular Map" ];
+    this._propTypes         = ["color",             "file",             "file",         "file" ];
+    this._propValues        = [];
 
-        this._propValues[ this._propNames[0] ] = [0.3, 0.3, 0.3, 1.0];
-        this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0);
-        this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0);
-        this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0);
+        this._propValues[ this._propNames[0] ] = this._defaultLightDiff;
+    this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0);
+    this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0);
+    this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0);
 
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
 
-        this.init = function( world )
-        {
-                // save the world
-                if (world) {
-                         this.setWorld( world );
+    this.init = function( world )
+    {
+        // save the world
+        if (world) {
+             this.setWorld( world );
         }
 
-                // set up the shader
-                this._shader = new RDGE.jshader();
-                this._shader.def = bumpMetalMaterialDef;
-                this._shader.init();
+        // set up the shader
+        this._shader = new RDGE.jshader();
+        this._shader.def = bumpMetalMaterialDef;
+        this._shader.init();
+
+        // set up the material node
+        this._materialNode = RDGE.createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
+        this._materialNode.setShader(this._shader);
 
-                // set up the material node
-                this._materialNode = RDGE.createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
-                this._materialNode.setShader(this._shader);
+        this.setShaderValues();
+        this.update(0);
+    };
 
-                this.setShaderValues();
-                this.update(0);
-        };
+        this.resetToDefault = function()
+        {
+                this._propValues[ this._propNames[0] ] = this._defaultLightDiff;
+                this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0);
+                this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0);
+                this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0);
+                for (var i=0; i<4;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+};
 };
 
+
 ///////////////////////////////////////////////////////////////////////////////////////
 // RDGE shader
- 
+
 // shader spec (can also be loaded from a .JSON file, or constructed at runtime)
 var bumpMetalMaterialDef = bumpMetalShaderDef =
 {