Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts:
	js/components/gradientpicker.reel/gradientpicker.js
	js/components/tools-properties/text-properties.reel/text-properties.js
	js/document/views/base.js
	js/document/views/design.js
	js/helper-classes/3D/StageLine.js
	js/helper-classes/3D/draw-utils.js
	js/lib/drawing/world.js
	js/lib/geom/circle.js
	js/lib/geom/line.js
	js/lib/geom/rectangle.js
	js/lib/geom/shape-primitive.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/flag-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/water-material.js
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
	js/panels/Materials/materials-popup.reel/materials-popup.html
	js/panels/Materials/materials-popup.reel/materials-popup.js
	js/tools/LineTool.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 20 insertions, 20 deletions

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 5373c78a..d859d025 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -288,13 +288,13 @@ exports.GeomObj = Object.create(Object.prototype, {
             this._materialArray.push(strokeMaterial);
             this._materialTypeArray.push("stroke");
 
-                        // don't set the value here.  The material editor may set a color directly
-                        // to the material without setting this value in the obj.  The following
-                        // lines of code will clobber the value in the material
+            // don't set the value here.  The material editor may set a color directly
+            // to the material without setting this value in the obj.  The following
+            // lines of code will clobber the value in the material
             //if (this._strokeColor)
             //    this.setStrokeColor(this._strokeColor);
 
-                        this._strokeMaterial = strokeMaterial;
+            this._strokeMaterial = strokeMaterial;
 
             return strokeMaterial;
         }
@@ -315,14 +315,14 @@ exports.GeomObj = Object.create(Object.prototype, {
 
             this._materialArray.push(fillMaterial);
             this._materialTypeArray.push("fill");
-                        
-                        // don't set the value here.  The material editor may set a color directly
-                        // to the material without setting this value in the obj.  The following
-                        // lines of code will clobber the value in the material
+
+            // don't set the value here.  The material editor may set a color directly
+            // to the material without setting this value in the obj.  The following
+            // lines of code will clobber the value in the material
             //if (this._fillColor)
             //     this.setFillColor(this._fillColor);
 
-                        this._fillMaterial = fillMaterial;
+            this._fillMaterial = fillMaterial;
 
             return fillMaterial;
         }
@@ -330,7 +330,7 @@ exports.GeomObj = Object.create(Object.prototype, {
 
     exportMaterialsJSON: {
         value: function() {
-                        MaterialsModel = require("js/models/materials-model").MaterialsModel;
+            MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
             var jObj;
             if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL()) {
@@ -362,7 +362,7 @@ exports.GeomObj = Object.create(Object.prototype, {
 
     importMaterialsJSON: {
         value: function(jObj) {
-                        MaterialsModel = require("js/models/materials-model").MaterialsModel;
+            MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
             this._materialArray = [];
             this._materialTypeArray = [];
@@ -389,7 +389,7 @@ exports.GeomObj = Object.create(Object.prototype, {
                     case "tunnel":
                     case "reliefTunnel":
                     case "squareTunnel":
-                                        case "flag":
+                    case "flag":
                     case "twist":
                     case "fly":
                     case "julia":
@@ -399,8 +399,8 @@ exports.GeomObj = Object.create(Object.prototype, {
                     case "keleidoscope":
                     case "radialBlur":
                     case "pulse":
-                                        case "twistVert":
-                                        case "taper":
+                    case "twistVert":
+                    case "taper":
                         mat = MaterialsModel.getMaterialByShader(shaderName);
                         if (mat)  mat = mat.dup();
                         break;
@@ -454,12 +454,12 @@ exports.GeomObj = Object.create(Object.prototype, {
             // get the normalized device coordinates (NDC) for
             // all position and dimensions.
             var world = this.getWorld();
-            var vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
-            var xNDC = 2*this._xOffset/vpw,  yNDC = -2*this._yOffset/vph;
+            var vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
+            var xNDC = 2*this._xOffset/vpw,  yNDC = -2*this._yOffset/vph;
 
             var aspect = world.getAspect();
             var zn = world.getZNear(),  zf = world.getZFar();
-            var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0),
+            var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0),
                 b = -t,
                 r = aspect*t,
                 l = -r;
@@ -484,12 +484,12 @@ exports.GeomObj = Object.create(Object.prototype, {
             // get the normalized device coordinates (NDC) for
             // all position and dimensions.
             var world = this.getWorld();
-            var vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
-            var xNDC = 2*preViewPt[0]/vpw,  yNDC = -2*preViewPt[1]/vph;
+            var vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
+            var xNDC = 2*preViewPt[0]/vpw,  yNDC = -2*preViewPt[1]/vph;
 
             var aspect = world.getAspect();
             var zn = world.getZNear(),  zf = world.getZFar();
-            var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0),
+            var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0),
                 b = -t,
                 r = aspect*t,
                 l = -r;