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

diff --git a/js/helper-classes/RDGE/src/core/script/particle.js b/js/helper-classes/RDGE/src/core/script/particle.js
index d1ab6239..59894e9a 100755
--- a/js/helper-classes/RDGE/src/core/script/particle.js
+++ b/js/helper-classes/RDGE/src/core/script/particle.js
@@ -1,797 +1,797 @@
-/* <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 || {};

-

-RDGE.particle = function (def, id) {

-    this.id = id;

-    this.def = def;

-    if (this.def.numFrames == undefined) {

-        if (this.def.textureSize && this.def.frameSize) {

-            this.def.numFrames = (this.def.textureSize[0] / this.def.frameSize[0]) * (this.def.textureSize[1] / this.def.frameSize[1]);

-        } else {

-            this.def.numFrames = 0;

-        }

-    }

-

-    this.pos = RDGE.vec3.zero();

-    this.delta = RDGE.vec3.zero();

-    this.rotate = 0.0;

-    this.age = 0.0;

-    this.lifespan = 0.0;

-    this.velocity = RDGE.vec3.zero();

-    this.gravity = RDGE.vec3.zero();

-    this.frame = 0;

-    this.frameCount = 0;

-    this.lastPos = RDGE.vec3.zero();

-    this.state = 0;

-    this.hide = false;

-    this.color = RDGE.vec4.zero();

-

-    this.randomize = function (min, max) {

-        return min + (max - min) * Math.random();

-    };

-    this.rate = this.randomize(-1.0, 1.0);

-

-    this.randomize3 = function (min, max) {

-        return [this.randomize(min[0], max[0]),

-                                                        this.randomize(min[1], max[1]),

-                                                        this.randomize(min[2], max[2])];

-    };

-

-    this.spawn = function (spawnMatrix) {

-        if (this.def.initialframe == undefined) {

-            this.frame = this.id % this.def.numFrames;

-        } else {

-            this.frame = this.randomize(this.def.initialframe[0], this.def.initialframe[1]);

-        }

-        this.pos = this.randomize3(this.def.initialpos[0], this.def.initialpos[1]);

-        if (this.def.worldSpace) {

-            // calculate the initial position in world space.

-            this.pos = RDGE.mat4.transformPoint(spawnMatrix, this.pos);

-        }

-        // all other values are assumed to be defined in local or world space depending on 

-        // the particles worldSpace designation.

-        var toRadians = Math.PI / 180.0;

-        if (this.def.initialsize) {

-            this.size = this.randomize(this.def.initialsize[0], this.def.initialsize[1]);

-        } else {

-            this.size = 1.0;

-        }

-        this.velocity = this.randomize3(this.def.initialvel[0], this.def.initialvel[1]);

-        this.gravity = [this.def.gravity[0], this.def.gravity[1], this.def.gravity[2]];

-        this.rotate = this.randomize(this.def.initialrot[0] * toRadians, this.def.initialrot[1] * toRadians);

-        this.lifespan = this.randomize(this.def.lifespan[0], this.def.lifespan[1]);

-        this.age = 0.0;

-        this.delta = [0.0, 0.0, 0.0];

-        this.lastPos = RDGE.vec3.add(this.pos, RDGE.vec3.scale(this.velocity, -1.0 / 30.0));

-        this.color = [1, 1, 1, 1]; //RDGE.vec4.random( [0.0, 0.0, 0.0, 1.0], [1.0, 1.0, 1.0, 1.0] );

-    };

-};

-

-// double buffered array utility class

-RDGE.DoubleBuffer = function (arrType, size) {

-    this.buffer = {};

-    this.buffer[0] = new arrType(size);

-    this.buffer[1] = new arrType(size);

-    this.bufferIndex = 0;

-

-    this.flip = function () {

-        this.bufferIndex = 1 - this.bufferIndex;

-    }

-    this.front = function () {

-        return this.buffer[this.bufferIndex];

-    }

-    this.back = function () {

-        return this.buffer[1 - this.bufferIndex];

-    }

-};

-

-

-// cycling buffer

-RDGE.particleBuffer = function (pdef, emitter, size) {

+/* <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 || {};
+
+RDGE.particle = function (def, id) {
+    this.id = id;
+    this.def = def;
+    if (this.def.numFrames == undefined) {
+        if (this.def.textureSize && this.def.frameSize) {
+            this.def.numFrames = (this.def.textureSize[0] / this.def.frameSize[0]) * (this.def.textureSize[1] / this.def.frameSize[1]);
+        } else {
+            this.def.numFrames = 0;
+        }
+    }
+
+    this.pos = RDGE.vec3.zero();
+    this.delta = RDGE.vec3.zero();
+    this.rotate = 0.0;
+    this.age = 0.0;
+    this.lifespan = 0.0;
+    this.velocity = RDGE.vec3.zero();
+    this.gravity = RDGE.vec3.zero();
+    this.frame = 0;
+    this.frameCount = 0;
+    this.lastPos = RDGE.vec3.zero();
+    this.state = 0;
+    this.hide = false;
+    this.color = RDGE.vec4.zero();
+
+    this.randomize = function (min, max) {
+        return min + (max - min) * Math.random();
+    };
+    this.rate = this.randomize(-1.0, 1.0);
+
+    this.randomize3 = function (min, max) {
+        return [this.randomize(min[0], max[0]),
+                            this.randomize(min[1], max[1]),
+                            this.randomize(min[2], max[2])];
+    };
+
+    this.spawn = function (spawnMatrix) {
+        if (this.def.initialframe == undefined) {
+            this.frame = this.id % this.def.numFrames;
+        } else {
+            this.frame = this.randomize(this.def.initialframe[0], this.def.initialframe[1]);
+        }
+        this.pos = this.randomize3(this.def.initialpos[0], this.def.initialpos[1]);
+        if (this.def.worldSpace) {
+            // calculate the initial position in world space.
+            this.pos = RDGE.mat4.transformPoint(spawnMatrix, this.pos);
+        }
+        // all other values are assumed to be defined in local or world space depending on
+        // the particles worldSpace designation.
+        var toRadians = Math.PI / 180.0;
+        if (this.def.initialsize) {
+            this.size = this.randomize(this.def.initialsize[0], this.def.initialsize[1]);
+        } else {
+            this.size = 1.0;
+        }
+        this.velocity = this.randomize3(this.def.initialvel[0], this.def.initialvel[1]);
+        this.gravity = [this.def.gravity[0], this.def.gravity[1], this.def.gravity[2]];
+        this.rotate = this.randomize(this.def.initialrot[0] * toRadians, this.def.initialrot[1] * toRadians);
+        this.lifespan = this.randomize(this.def.lifespan[0], this.def.lifespan[1]);
+        this.age = 0.0;
+        this.delta = [0.0, 0.0, 0.0];
+        this.lastPos = RDGE.vec3.add(this.pos, RDGE.vec3.scale(this.velocity, -1.0 / 30.0));
+        this.color = [1, 1, 1, 1]; //RDGE.vec4.random( [0.0, 0.0, 0.0, 1.0], [1.0, 1.0, 1.0, 1.0] );
+    };
+};
+
+// double buffered array utility class
+RDGE.DoubleBuffer = function (arrType, size) {
+    this.buffer = {};
+    this.buffer[0] = new arrType(size);
+    this.buffer[1] = new arrType(size);
+    this.bufferIndex = 0;
+
+    this.flip = function () {
+        this.bufferIndex = 1 - this.bufferIndex;
+    }
+    this.front = function () {
+        return this.buffer[this.bufferIndex];
+    }
+    this.back = function () {
+        return this.buffer[1 - this.bufferIndex];
+    }
+};
+
+
+// cycling buffer
+RDGE.particleBuffer = function (pdef, emitter, size) {<