Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal

Conflicts:
	js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
	js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 92 insertions, 81 deletions

diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js
index b4bf0972..d5298120 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-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
@@ -35,13 +36,13 @@ var FlyMaterial = function FlyMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "Fly";
-        this._shaderName = "fly";
+    this._name = "Fly";
+    this._shaderName = "fly";
 
-        this._defaultTexMap = 'assets/images/rocky-normal.jpg';
+    this._defaultTexMap = 'assets/images/rocky-normal.jpg';
 
-        this._time = 0.0;
-        this._dTime = 0.01;
+    this._time = 0.0;
+    this._dTime = 0.01;
 
     // array textures indexed by shader uniform name
     this._glTextures = [];
@@ -49,95 +50,105 @@ var FlyMaterial = function FlyMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Properties
     ///////////////////////////////////////////////////////////////////////
-        // all defined in parent PulseMaterial.js
-        // load the local default value
-        var u_tex0_index        = 0,  u_speed_index = 1;
-        this._propNames                 = ["u_tex0",            "u_speed" ];
-        this._propLabels                = ["Texture map",       "Speed" ];
-        this._propTypes                 = ["file",                      "float" ];
-        this._propValues                = [];
+    // all defined in parent PulseMaterial.js
+    // load the local default value
+    var u_tex0_index    = 0,  u_speed_index = 1;
+    this._propNames         = ["u_tex0",        "u_speed" ];
+    this._propLabels        = ["Texture map",   "Speed" ];
+    this._propTypes         = ["file",          "float" ];
+    this._propValues        = [];
     this._propValues[this._propNames[u_tex0_index]] = this._defaultTexMap.slice(0);
     this._propValues[this._propNames[u_speed_index]] = 1.0;
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this.isAnimated                 = function()                    {  return true;         };
-        this.getShaderDef               = function()                    {  return flyMaterialDef;       };
+    this.isAnimated         = function()            {  return true;     };
+    this.getShaderDef       = function()            {  return flyMaterialDef;   };
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-        // duplcate method requirde
+    // duplcate method requirde
 
-        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 = flyMaterialDef;
-                this._shader.init();
+        // set up the shader
+        this._shader = new RDGE.jshader();
+        this._shader.def = flyMaterialDef;
+        this._shader.init();
 
-                // set up the material node
-                this._materialNode = RDGE.createMaterialNode("flyMaterial" + "_" + world.generateUniqueNodeID());
-                this._materialNode.setShader(this._shader);
+        // set up the material node
+        this._materialNode = RDGE.createMaterialNode("flyMaterial" + "_" + world.generateUniqueNodeID());
+        this._materialNode.setShader(this._shader);
 
-                this._time = 0;
-                if (this._shader && this._shader['default']) {
-                        this._shader['default'].u_time.set( [this._time] );
+        this._time = 0;
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_time.set( [this._time] );
         }
 
-                // set the shader values in the shader
+        // set the shader values in the shader
         this.setShaderValues();
-                this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
-                this.update( 0 );
-        };
+        this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
+        this.update( 0 );
+    };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[u_tex0_index]] = this._defaultTexMap.slice(0);
+                this._propValues[this._propNames[u_speed_index]] = 1.0;
+
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  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 flyMaterialDef =
 {
-    'shaders': 
-        {
-                'defaultVShader':"assets/shaders/Basic.vert.glsl",
-                'defaultFShader':"assets/shaders/Fly.frag.glsl"
-        },
-        'techniques':
-        { 
-                'default':
-                [
-                        {
-                                'vshader' : 'defaultVShader',
-                                'fshader' : 'defaultFShader',
-                                // attributes
-                                'attributes' :
-                                {
-                                        'vert'  :   { 'type' : 'vec3' },
-                                        'normal' :  { 'type' : 'vec3' },
-                                        'texcoord'  :   { 'type' : 'vec2' }
-                                },
-                                // parameters
-                                'params' : 
-                                {
-                                        'u_tex0': { 'type' : 'tex2d' },
-                                        'u_time' : { 'type' : 'float' },
-                                        'u_speed'  : { 'type' : 'float' },
-                                        'u_resolution'  :   { 'type' : 'vec2' },
-                                },
-
-                                // render states
-                                'states' : 
-                                {
+    'shaders':
+    {
+        'defaultVShader':"assets/shaders/Basic.vert.glsl",
+        'defaultFShader':"assets/shaders/Fly.frag.glsl"
+    },
+    'techniques':
+    {
+        'default':
+        [
+            {
+                'vshader' : 'defaultVShader',
+                'fshader' : 'defaultFShader',
+                // attributes
+                'attributes' :
+                {
+                    'vert'  :   { 'type' : 'vec3' },
+                    'normal' :  { 'type' : 'vec3' },
+                    'texcoord'  :   { 'type' : 'vec2' }
+                },
+                // parameters
+                'params' :
+                {
+                    'u_tex0': { 'type' : 'tex2d' },
+                    'u_time' : { 'type' : 'float' },
+                    'u_speed'  : { 'type' : 'float' },
+                    'u_resolution'  :   { 'type' : 'vec2' },
+                },
+
+                // render states
+                'states' :
+                {