Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/rdge/materials/cloud-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js

1 files changed, 44 insertions, 44 deletions

diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js
index c7bfe67a..a7a0c178 100644
--- a/js/lib/rdge/materials/deform-material.js
+++ b/js/lib/rdge/materials/deform-material.js
@@ -11,20 +11,20 @@ var DeformMaterial = function DeformMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "DeformMaterial";
-        this._shaderName = "deform";
+    this._name = "DeformMaterial";
+    this._shaderName = "deform";
 
-        this._texMap = 'assets/images/rocky-normal.jpg';
+    this._texMap = 'assets/images/rocky-normal.jpg';
 
-        this._time = 0.0;
-        this._dTime = 0.01;
+    this._time = 0.0;
+    this._dTime = 0.01;
 
     ///////////////////////////////////////////////////////////////////////
     // Properties
     ///////////////////////////////////////////////////////////////////////
-        // all defined in parent PulseMaterial.js
-        // load the local default value
-        this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+    // all defined in parent PulseMaterial.js
+    // load the local default value
+    this._propValues[this._propNames[0]] = this._texMap.slice(0);
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
@@ -36,48 +36,48 @@ var DeformMaterial = function DeformMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-        // duplcate method requirde
-        this.dup = function( world ) {
-                // allocate a new uber material
-                var newMat = new DeformMaterial();
-
-                // copy over the current values;
-                var propNames = [],  propValues = [],  propTypes = [],  propLabels = [];
-                this.getAllProperties( propNames,  propValues,  propTypes,  propLabels);
-                var n = propNames.length;
-                for (var i=0;  i<n;  i++)
-                        newMat.setProperty( propNames[i], propValues[i] );
-
-                return newMat;
-        };
-
-        this.init = function( world ) {
-                // save the world
-                if (world)  this.setWorld( world );
-
-                // set up the shader
-                this._shader = new jshader();
-                this._shader.def = deformMaterialDef;
-                this._shader.init();
-
-                // set up the material node
-                this._materialNode = createMaterialNode("deformMaterial" + "_" + world.generateUniqueNodeID());
-                this._materialNode.setShader(this._shader);
-
-                this._time = 0;
-                if (this._shader && this._shader['default']) {
-                        this._shader['default'].u_time.set( [this._time] );
+    // duplcate method requirde
+    this.dup = function (world) {
+        // allocate a new uber material
+        var newMat = new DeformMaterial();
+
+        // copy over the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        var n = propNames.length;
+        for (var i = 0; i < n; i++)
+            newMat.setProperty(propNames[i], propValues[i]);
+
+        return newMat;
+    };
+
+    this.init = function (world) {
+        // save the world
+        if (world) this.setWorld(world);
+
+        // set up the shader
+        this._shader = new RDGE.jshader();
+        this._shader.def = deformMaterialDef;
+        this._shader.init();
+
+        // set up the material node
+        this._materialNode = RDGE.createMaterialNode("deformMaterial" + "_" + world.generateUniqueNodeID());
+        this._materialNode.setShader(this._shader);
+
+        this._time = 0;
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_time.set([this._time]);
         }
 
         // set up the texture
         var texMapName = this._propValues[this._propNames[0]];
         this._glTex = new Texture( world, texMapName );
 
-                // set the shader values in the shader
-                this.updateTexture();
-                this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
-                this.update( 0 );
-        }
+        // set the shader values in the shader
+        this.updateTexture();
+        this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
+        this.update(0);
+    };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////