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, 461 insertions, 461 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/engine.js b/js/helper-classes/RDGE/src/core/script/engine.js
index 36a34689..919a1e9c 100755
--- a/js/helper-classes/RDGE/src/core/script/engine.js
+++ b/js/helper-classes/RDGE/src/core/script/engine.js
@@ -1,461 +1,461 @@
-/* <copyright>

-Copyright (c) 2012, Motorola Mobility, Inc

-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.

-

-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

-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

-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-POSSIBILITY OF SUCH DAMAGE.

-</copyright> */

-

-var RDGE = RDGE || {};

-

-/*

- *      Manage state instances

- */

-RDGE.stateManager = function () {

-        // a stack of states

-        this.stateStack = [];

-        

-        // number of states on the stack

-    this.stateTop       = undefined;

-    

-    // the states of the context

-    this.RDGEInitState  = null;

-    this.RDGERunState   = null;

-    

-    this.currentState = function () {

-                if(this.stateTop != undefined)

-                        return this.stateStack[this.stateTop];

-                        

-                return null;

-    };

-        

-        /*

-         *  Push new IRuntime state - engine executes the new state

-         */

-    this.PushState = function (state, flags) {

-        if (state != null && typeof state.Init == 'function') {

-                        if(this.stateTop != undefined)

-                                this.stateStack[this.stateTop].LeaveState();

-                        

-                        if(flags == undefined || flags != "noInit")

-                                state.Init();

-                                

-                        this.stateTop = this.stateStack.push(state) - 1;

-                }

-    };

-

-        /*

-         *  Remove IRuntime state from stack, engine executes previous state

-         */

-    this.PopState = function () {

-                state = this.stateStack.pop();

-        if (state != null) {

-                        state.Shutdown();

-                }

-                

-                this.stateTop = this.stateTop > 0 ? this.stateTop - 1 : 0;

-            

-        if (this.stateStack[this.stateTop]) {

-                        this.stateStack[this.stateTop].ReInit();

-                }

-    };

-

-        /*

-         *  Remove all states from the stack

-         */

-    this.PopAll = function () {

-        while (this.stateStack[this.stateTop] != null) {

-                        this.PopState();

-                }

-    };

-        

-    this.tick = function (dt) {

-        if (this.stateStack[this.stateTop] != null) {

-                        this.stateStack[this.stateTop].Update(dt);

-                        this.stateStack[this.stateTop].Resize();

-                        this.stateStack[this.stateTop].Draw();

-                }

-    };

-};

-

-RDGE.Engine = function () {

-    this._assetPath = "assets/";

-

-    // map of scene graphs to names

-    this.sceneMap = [];

-

-    // number of states on the stack

-    this.stateTop = undefined;

-

-    // size of the browser window

-    this.lastWindowWidth = window.innerWidth;

-    this.lastWindowHeight = window.innerHeight;

-

-    this.defaultContext = null;

-

-    this.lightManager = null;

-

-    clearColor = [0.0, 0.0, 0.0, 0.0];

-

-    this.initializeComplete = false;

+/* <copyright>
+Copyright (c) 2012, Motorola Mobility, Inc
+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.
+
+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
+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
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</copyright> */
+
+var RDGE = RDGE || {};
+
+/*
+ *  Manage state instances
+ */
+RDGE.stateManager = function () {
+    // a stack of states
+    this.stateStack = [];
+
+    // number of states on the stack
+    this.stateTop       = undefined;
+
+    // the states of the context
+    this.RDGEInitState  = null;
+    this.RDGERunState   = null;
+
+    this.currentState = function () {
+        if(this.stateTop != undefined)
+            return this.stateStack[this.stateTop];
+
+        return null;
+    };
+
+    /*
+     *  Push new IRuntime state - engine executes the new state
+     */
+    this.PushState = function (state, flags) {
+        if (state != null && typeof state.Init == 'function') {
+            if(this.stateTop != undefined)
+                this.stateStack[this.stateTop].LeaveState();
+
+            if(flags == undefined || flags != "noInit")
+                state.Init();
+
+            this.stateTop = this.stateStack.push(state) - 1;
+        }
+    };
+
+    /*
+     *  Remove IRuntime state from stack, engine executes previous state
+     */
+    this.PopState = function () {
+        state = this.stateStack.pop();
+        if (state != null) {
+            state.Shutdown();
+        }
+
+        this.stateTop = this.stateTop > 0 ? this.stateTop - 1 : 0;
+
+        if (this.stateStack[this.stateTop]) {
+            this.stateStack[this.stateTop].ReInit();
+        }
+    };
+
+    /*
+     *  Remove all states from the stack
+     */
+    this.PopAll = function () {
+        while (this.stateStack[this.stateTop] != null) {
+            this.PopState();
+        }
+    };
+
+    this.tick = function (dt) {
+        if (this.stateStack[this.stateTop] != null) {
+            this.stateStack[this.stateTop].Update(dt);
+            this.stateStack[this.stateTop].Resize();
+            this.stateStack[this.stateTop].Draw();
+        }
+    };
+};
+
+RDGE.Engine = function () {
+    this._assetPath = "assets/";
+
+    // map of scene graphs to names
+    this.sceneMap = [];
+
+    // number of states on the stack
+    this.stateTop = undefined;
+
+    // size of the browser window
+    this.lastWindowWidth = window.innerWidth;
+    this.lastWindowHeight = window.innerHeight;
+
+    this.defaultContext = null;
+
+    this.lightManager = null;
+
+    clearColor = [0.0, 0.0, 0.0, 0.0];
+
+    this.initializeComplete = false;