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, 316 insertions, 315 deletions

diff --git a/js/lib/rdge/texture.js b/js/lib/rdge/texture.js
index 30452489..70f337d4 100644
--- a/js/lib/rdge/texture.js
+++ b/js/lib/rdge/texture.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
@@ -38,311 +39,311 @@ var __textureCounter = 0;
 ///////////////////////////////////////////////////////////////////////
 function Texture( dstWorld, texMapName,  wrap, mips )
 {
-        ///////////////////////////////////////////////////////////////////////
-        // Instance variables
-        ///////////////////////////////////////////////////////////////////////
-        this._texture;
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+    this._texture;
 
    // the canvas generating the texture map (if there is one)
-        this._srcCanvas;        
-        this._srcWorld;
-
-        // texture attributes
-        if (typeof texMapName === "string")
-                this._texMapName = texMapName.slice();
-        else
-                this._srcCanvas = texMapName;
-                
-
-        // set default values for wrap and mips
-        if (wrap === undefined)
-                wrap = "REPEAT";
-        if (mips === undefined)
-                mips = true;
-        this._wrap = wrap;
-        this._mips = mips;
-
-        // cache whether or not the source is animated
-        this._isAnimated = false;
-        
-        // the destination world that will use the texture map
-        this._dstWorld = dstWorld;
-
-        this._texCount = __textureCounter;
-        __textureCounter++;
-
-        ///////////////////////////////////////////////////////////////////////
-        // Property Accessors
-        ///////////////////////////////////////////////////////////////////////
-        this.getTexture         = function()    {  return this._texture;        }
-
-        this.setSrcWorld        = function(w)   {  this._srcWorld = w;          }
-        this.getSrcWorld        = function()    {  return this._srcWorld;       }
-
-        this.setDstWorld        = function(w)   {  this._dstWorld = w;          }
-        this.getDstWorld        = function()    {  return this._dstWorld;       }
-
-        this.isAnimated     = function()    {  return this._isAnimated; }
-
-        ///////////////////////////////////////////////////////////////////////
-        // Methods
-        ///////////////////////////////////////////////////////////////////////
-
-        this.init = function()
-        {
-                // determine if the source is a canvas or an image file
-                var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
-                //var root = viewUtils.application.ninja.currentDocument.documentRoot;
-                var root;
-                if (viewUtils.application.ninja.currentDocument)
-                        root = viewUtils.application.ninja.currentDocument.model.documentRoot;
-                var srcCanvas = this._srcCanvas;
-                if (!srcCanvas && root)
-                        srcCanvas = this.findCanvas( this._texMapName, root );
-                if (srcCanvas)
-                {
-                        this._srcCanvas = srcCanvas;
-                        var srcWorld
-                        if (srcCanvas.elementModel && srcCanvas.elementModel.shapeModel  && srcCanvas.elementModel.shapeModel.GLWorld)
-                         srcWorld = srcCanvas.elementModel.shapeModel.GLWorld;
-                        if (!srcWorld)  srcWorld = srcCanvas.__GLWorld;
-                        if (srcWorld)
-                        {
-                                this._srcWorld = srcWorld;
-
-                                // add a notifier to the world
-                                srcWorld.addListener( this,  this.worldCallback,  { srcWorld: this._srcWorld } );
-
-                                // check if the source is animated
-                                this._isAnimated = srcWorld._hasAnimatedMaterials;
-                        }
-
-                        this.loadFromCanvas();
-                }
-                else
-                {
-                        this.loadFromFile();  
-                }
-        }
-
-        this.worldCallback = function( type, callbackObj,  calleeData,  callerData )
-        {
-                console.log( "texture callback, type: " + type );
-                if (calleeData.srcWorld)
-                {
-                        var srcWorld = callbackObj.getSrcWorld();
-                        var dstWorld = callbackObj.getDstWorld();
-                        var notifier = srcWorld._notifier;
-                        var texture = this.callbackObj;
-                        if (texture)
-                        {
-                                switch (type)
-                                {
-                                        case notifier.OBJECT_DELETE:
-                                                texture.rebuildSrcLocally();
-                                                break;
-
-                                        case notifier.OBJECT_REINSTANTIATE:
-                                                break;
-
-                                        case notifier.OBJECT_CHANGE:
-                                                break;
-
-                                        case notifier.FIRST_RENDER:
-                                                texture._isAnimated = srcWorld.hasAnimatedMaterials();
+    this._srcCanvas;
+    this._srcWorld;
+
+    // texture attributes
+    if (typeof texMapName === "string")
+        this._texMapName = texMapName.slice();
+    else
+        this._srcCanvas = texMapName;
+
+
+    // set default values for wrap and mips
+    if (wrap === undefined)
+        wrap = "REPEAT";
+    if (mips === undefined)
+        mips = true;
+    this._wrap = wrap;
+    this._mips = mips;
+
+    // cache whether or not the source is animated
+    this._isAnimated = false;
+
+    // the destination world that will use the texture map
+    this._dstWorld = dstWorld;
+
+    this._texCount = __textureCounter;
+    __textureCounter++;
+
+    ///////////////////////////////////////////////////////////////////////
+    // Property Accessors
+    ///////////////////////////////////////////////////////////////////////
+    this.getTexture     = function()    {  return this._texture;    }
+
+    this.setSrcWorld    = function(w)   {  this._srcWorld = w;      }
+    this.getSrcWorld    = function()    {  return this._srcWorld;   }
+
+    this.setDstWorld    = function(w)   {  this._dstWorld = w;      }
+    this.getDstWorld    = function()    {  return this._dstWorld;   }
+
+    this.isAnimated     = function()    {  return this._isAnimated; }
+
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
+
+    this.init = function()
+    {
+        // determine if the source is a canvas or an image file
+        var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
+        //var root = viewUtils.application.ninja.currentDocument.documentRoot;
+        var root;
+        if (viewUtils.application.ninja.currentDocument)
+            root = viewUtils.application.ninja.currentDocument.model.documentRoot;
+        var srcCanvas = this._srcCanvas;
+        if (!srcCanvas && root)
+            srcCanvas = this.findCanvas( this._texMapName, root );
+        if (srcCanvas)
+        {
+            this._srcCanvas = srcCanvas;
+            var srcWorld
+            if (srcCanvas.elementModel && srcCanvas.elementModel.shapeModel  && srcCanvas.elementModel.shapeModel.GLWorld)
+             srcWorld = srcCanvas.elementModel.shapeModel.GLWorld;
+            if (!srcWorld)  srcWorld = srcCanvas.__GLWorld;
+            if (srcWorld)
+            {
+                this._srcWorld = srcWorld;
+
+                // add a notifier to the world
+                srcWorld.addListener( this,  this.worldCallback,  { srcWorld: this._srcWorld } );
+
+                // check if the source is animated
+                this._isAnimated = srcWorld._hasAnimatedMaterials;
+            }
+
+            this.loadFromCanvas();
+        }
+        else
+        {
+            this.loadFromFile();
+        }
+    }
+
+    this.worldCallback = function( type, callbackObj,  calleeData,  callerData )
+    {
+        console.log( "texture callback, type: " + type );
+        if (calleeData.srcWorld)
+        {
+            var srcWorld = callbackObj.getSrcWorld();
+            var dstWorld = callbackObj.getDstWorld();
+            var notifier = srcWorld._notifier;
+            var texture = this.callbackObj;
+            if (texture)
+            {
+                switch (type)
+                {
+                    case notifier.OBJECT_DELETE:
+                        texture.rebuildSrcLocally();
+                        break;
+
+                    case notifier.OBJECT_REINSTANTIATE:
+                        break;
+
+                    case notifier.OBJECT_CHANGE:
+                        break;
+
+                    case notifier.FIRST_RENDER:
+                        texture._isAnimated = srcWorld.hasAnimatedMaterials();