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, 178 insertions, 248 deletions

diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index 0db6fc90..51a7430c 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -11,36 +11,36 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "LinearGradientMaterial";
-        this._shaderName = "linearGradient";
-
-        this._color1            = [1,0,0,1];
-        this._color2            = [0,1,0,1];
-        this._color3            = [0,0,1,1];
-        this._color4            = [0,1,1,1];
-        this._colorStop1        = 0.0;
-        this._colorStop2        = 0.3;
-        this._colorStop3        = 0.6;
-        this._colorStop4        = 1.0;
-//      this._colorCount        = 4;
-        this._angle                     = 0.0;  // the shader takes [cos(a), sin(a)]
+    this._name = "LinearGradientMaterial";
+    this._shaderName = "linearGradient";
+
+    this._color1 = [1, 0, 0, 1];
+    this._color2 = [0, 1, 0, 1];
+    this._color3 = [0, 0, 1, 1];
+    this._color4 = [0, 1, 1, 1];
+    this._colorStop1 = 0.0;
+    this._colorStop2 = 0.3;
+    this._colorStop3 = 0.6;
+    this._colorStop4 = 1.0;
+    //  this._colorCount        = 4;
+    this._angle = 0.0; // the shader takes [cos(a), sin(a)]
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this.getShaderName      = function() {
+    this.getShaderName = function () {
         return this._shaderName;
     };
 
-        this.getName            = function() {
+    this.getName = function () {
         return this._name;
     };
 
-        this.getColor1  = function() {
+    this.getColor1 = function () {
         return this._color1;
     };
 
-        this.setColor1  = function(c) {
+    this.setColor1 = function (c) {
         this._color1 = c.slice();
 
         if (this._shader && this._shader['default']) {
@@ -48,11 +48,11 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-        this.getColor2  = function() {
+    this.getColor2 = function () {
         return this._color2;
     };
 
-        this.setColor2  = function(c) {
+    this.setColor2 = function (c) {
         this._color2 = c.slice();
 
         if (this._shader && this._shader['default']) {
@@ -60,23 +60,23 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-        this.getColor3  = function() {
+    this.getColor3 = function () {
         return this._color3;
     };
 
-        this.setColor3  = function(c) {
+    this.setColor3 = function (c) {
         this._color3 = c.slice();
-        
+
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_color3.set(c);
         }
     };
 
-        this.getColor4  = function() {  
-        return this._color4;            
+    this.getColor4 = function () {
+        return this._color4;
     };
-    
-        this.setColor4  = function(c) { 
+
+    this.setColor4 = function (c) {
         this._color4 = c.slice();
 
         if (this._shader && this._shader['default']) {
@@ -84,11 +84,11 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-        this.getColorStop1 = function() {  
-        return this._colorStop1;                
+    this.getColorStop1 = function () {
+        return this._colorStop1;
     };
-    
-        this.setColorStop1 = function(s) {  
+
+    this.setColorStop1 = function (s) {
         this._colorStop1 = s;
 
         if (this._shader && this._shader['default']) {
@@ -96,11 +96,11 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-        this.getColorStop2 = function() {  
-        return this._colorStop2;                
+    this.getColorStop2 = function () {
+        return this._colorStop2;
     };
-    
-        this.setColorStop2 = function(s) {
+
+    this.setColorStop2 = function (s) {
         this._colorStop2 = s;
 
         if (this._shader && this._shader['default']) {
@@ -108,23 +108,23 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-        this.getColorStop3 = function() {  
-        return this._colorStop3;                
+    this.getColorStop3 = function () {
+        return this._colorStop3;
     };
-    
-        this.setColorStop3 = function(s) {
+
+    this.setColorStop3 = function (s) {
         this._colorStop3 = s;
 
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_colorStop3.set([s]);
         }
-    }
+    };
 
-        this.getColorStop4 = function() {  
-        return this._colorStop4;                
+    this.getColorStop4 = function () {
+        return this._colorStop4;
     };
-    
-        this.setColorStop4 = function(s) {
+
+    this.setColorStop4 = function (s) {
         this._colorStop4 = s;
 
         if (this._shader && this._shader['default']) {
@@ -132,17 +132,17 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-//      this.getColorCount      = function()    {  return this._colorCount;             };
-//      this.setColorCount      = function(c)   {  this._colorCount = c;
-//                                                                                              if (this._shader && this._shader['default'])
-//                                                                                                      this._shader['default'].u_colorCount.set([c]);
-//                                                                              };
+    //  this.getColorCount      = function()    {  return this._colorCount;             };
+    //  this.setColorCount      = function(c)   {  this._colorCount = c;
+    //                                                                                          if (this._shader && this._shader['default'])
+    //                                                                                                  this._shader['default'].u_colorCount.set([c]);
+    //                                                                          };
 
-        this.getAngle = function() {
+    this.getAngle = function () {
         return this._angle;
     };