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, 306 insertions, 286 deletions

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 34d3aa1f..0f6f6c92 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/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
@@ -39,160 +40,156 @@ var Material = function GLMaterial( world ) {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "GLMaterial";
-        this._shaderName = "undefined";
+    this._name = "GLMaterial";
+    this._shaderName = "undefined";
 
-        this._time = 0.0;
-        this._dTime = 0.01;
+    this._time = 0.0;
+    this._dTime = 0.01;
 
-        // keep a reference to the owning GLWorld
-        this._world = null;
+    // keep a reference to the owning GLWorld
+    this._world = null;
     if(world) {
         this._world = world;
     }
 
-        this._glTextures = [];          // indexed by uniform name
+    this._glTextures = [];      // indexed by uniform name
 
-        // vertex deformation variables
-        this._hasVertexDeformation = false;
-        this._vertexDeformationRange = [0, 0, 1, 1];    // (xMin, yMin, xMax, yMax)
-        this._vertexDeformationTolerance = 0.1;
+    // vertex deformation variables
+    this._hasVertexDeformation = false;
+    this._vertexDeformationRange = [0, 0, 1, 1];    // (xMin, yMin, xMax, yMax)
+        this._vertexDeformationTolerance = 0.02;
 
-        // RDGE variables
-        this._shader = null;
-        this._materialNode = null;
+    // RDGE variables
+    this._shader = null;
+    this._materialNode = null;
 
-        // vertex deformation variables
-        this._hasVertexDeformation = false;
-        this._vertexDeformationRange = [0, 0, 1, 1];    // (xMin, yMin, xMax, yMax)
-        this._vertexDeformationTolerance = 0.02;
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
 
-        this.setName = function(n) {
+    this.setName = function(n) {
         this._name = n;
     };
 
-        this.getName = function() {
+    this.getName = function() {
         return this._name;
     };
 
-        this.setShaderName = function(n) {
+    this.setShaderName = function(n) {
         this._shaderName = n;
     };
 
-        this.getShaderName = function() {
+    this.getShaderName = function() {
         return this._shaderName;
     };
 
-        this.setWorld = function(world) {
+    this.setWorld = function(world) {
         this._world = world;
     };
 
-        this.getWorld = function() {
+    this.getWorld = function() {
         return this._world;
     };
 
-        this.getShader = function() {
+    this.getShader = function() {
         return this._shader;
     };
 
-        this.getMaterialNode = function() {
+    this.getMaterialNode = function() {
         return this._materialNode;
     };
 
-        // a material can be animated or not. default is not.  
-        // Any material needing continuous rendering should override this method
-        this.isAnimated = function() {
+    // a material can be animated or not. default is not.
+    // Any material needing continuous rendering should override this method
+    this.isAnimated = function() {
         return false;
     };
 
-        this.getTechniqueName   = function() {
-                return 'default'
-        };
+    this.getTechniqueName   = function() {
+        return 'default'
+    };
 
-        // the vertex shader can apply deformations requiring refinement in
-        // certain areas.
-        this.hasVertexDeformation = function()  {
+    // the vertex shader can apply deformations requiring refinement in
+    // certain areas.
+    this.hasVertexDeformation = function()  {
         return this._hasVertexDeformation;
     };
 
-        this.getVertexDeformationRange = function()     {
+    this.getVertexDeformationRange = function() {
         return this._vertexDeformationRange.slice();
     };
 
-        this.getVertexDeformationTolerance = function() {
+    this.getVertexDeformationTolerance = function() {
         return this._vertexDeformationTolerance;
     };
 
     ///////////////////////////////////////////////////////////////////////
     // Common Material Methods
     ///////////////////////////////////////////////////////////////////////
-        this.getProperty = function( propName ) {
-                return this._propValues[propName];
-        };
+    this.getProperty = function( propName ) {
+        return this._propValues[propName];
+    };
 
-        this.getPropertyCount = function() {
-                return this._propNames.length;
-        };
+    this.getPropertyCount = function() {
+        return this._propNames.length;
+    };
 
-        this.getPropertyAtIndex = function( index ) {
-                var rtnArr = [];
-                if ((index < 0) || (index >= this.getPropertyCount())) {
-                        throw new Error( "property index " + index + " is out of range for material" );
+    this.getPropertyAtIndex = function( index ) {
+        var rtnArr = [];
+        if ((index < 0) || (index >= this.getPropertyCount())) {
+            throw new Error( "property index " + index + " is out of range for material" );
         }
 
-                return [ this._propNames[index],  this._propLabels[index],  this._propTypes[index],  this._propValues[index] ];
-        };
+        return [ this._propNames[index],  this._propLabels[index],  this._propTypes[index],  this._propValues[index] ];
+    };
 
-        this.getAllProperties = function( propNames,  propValues,  propTypes,  propLabels) {
-                // clear all the input arrays if there is junk in them
-                propNames.length        = 0;
-                propValues.length       = 0;
-                propTypes.length        = 0;
-                propLabels.length       = 0;
+    this.getAllProperties = function( propNames,  propValues,  propTypes,  propLabels) {
+        // clear all the input arrays if there is junk in them
+        propNames.length    = 0;
+        propValues.length   = 0;
+        propTypes.length    = 0;
+        propLabels.length   = 0;