Merge branch 'refs/heads/ToolFixes' into WebGLMaterials

Conflicts:
	js/document/templates/montage-html/default_html.css
	js/mediators/element-mediator.js
	js/panels/properties.reel/properties.js
	js/tools/BrushTool.js
	js/tools/LineTool.js
	js/tools/PenTool.js
	js/tools/SelectionTool.js
	js/tools/ShapeTool.js
	js/tools/TranslateObject3DTool.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 183 insertions, 231 deletions

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index fee02a1d..6e1c024b 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -1,8 +1,8 @@
 /* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
@@ -11,263 +11,217 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "RadialBlurMaterial";
-        this._shaderName = "radialBlur";
+    this._name = "RadialBlurMaterial";
+    this._shaderName = "radialBlur";
 
-        this._texMap = 'assets/images/cubelight.png';
-        this._color = [1,0,0,1];
+    this._texMap = 'assets/images/cubelight.png';
+    this._color = [1, 0, 0, 1];
 
-        this._time = 0.0;
-        this._dTime = 0.01;
+    this._time = 0.0;
+    this._dTime = 0.01;
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this.getName            = function()    { return this._name;                    };
-        this.getShaderName      = function()    {  return this._shaderName;             };
+    this.getName = function () { return this._name; };
+    this.getShaderName = function () { return this._shaderName; };
 
-        this.getTextureMap                      = function()            {  return this._texMap.slice(0);        };
-        this.setTextureMap                      = function(m)           {  this._propValues[this._propNames[0]] = m.slice(0);  this.updateTexture();    };
+    this.getTextureMap = function () { return this._texMap.slice(0); };
+    this.setTextureMap = function (m) { this._propValues[this._propNames[0]] = m.slice(0); this.updateTexture(); };
 
-        this.isAnimated                         = function()            {  return true;         };
+    this.isAnimated = function () { return true; };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this._propNames                 = ["texmap",                    "color"];
-        this._propLabels                = ["Texture map",               "Color"];
-        this._propTypes                 = ["file",                              "color"];
-        this._propValues                = [];
-
-        this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-        this._propValues[ this._propNames[1] ] = this._color.slice(0);
-
-    this.setProperty = function( prop, value ) {
-                // make sure we have legitimate imput
-                var ok = this.validateProperty( prop, value );
-                if (!ok) {
-                        console.log( "invalid property in Radial Gradient Material:" + prop + " : " + value );
+    this._propNames = ["texmap", "color"];
+    this._propLabels = ["Texture map", "Color"];
+    this._propTypes = ["file", "color"];
+    this._propValues = [];
+
+    this._propValues[this._propNames[0]] = this._texMap.slice(0);
+    this._propValues[this._propNames[1]] = this._color.slice(0);
+
+    this.setProperty = function (prop, value) {
+        // make sure we have legitimate imput
+        var ok = this.validateProperty(prop, value);
+        if (!ok) {
+            console.log("invalid property in Radial Gradient Material:" + prop + " : " + value);
         }
 
-                switch (prop)
-                {
-                        case "texmap":
-                                this.setTextureMap(value);
-                                break;
-
-                        case "color":
-                                this._propValues[prop] = value.slice(0);
-                                if (this._shader && this._shader['default']) {
-                                        this._shader['default'][prop].set(value);
+        switch (prop) {
+            case "texmap":
+                this.setTextureMap(value);
+                break;
+
+            case "color":
+                this._propValues[prop] = value.slice(0);
+                if (this._shader && this._shader['default']) {
+                    this._shader['default'][prop].set(value);
                 }
-                                break;
-                }
-        };
+                break;
+        }
+    };
     ///////////////////////////////////////////////////////////////////////
 
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-        // duplcate method requirde
-        this.dup = function( ) {
-                // allocate a new uber material
-                var newMat = new RadialBlurMaterial();
-
-                // 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 = radialBlurMaterialDef;
-                this._shader.init();
-
-                // set up the material node
-                this._materialNode = createMaterialNode("radialBlurMaterial" + "_" + world.generateUniqueNodeID());
-                this._materialNode.setShader(this._shader);
-
-                this._time = 0;
-                if (this._shader && this._shader['default'])
-                        this._shader['default'].u_time.set( [this._time] );
-                this.setProperty( "color", [this._time, 0, 0,  1] );
-
-                // set the shader values in the shader
-                this.updateTexture();
-                this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
-                this.update( 0 );
-        };
-
-        this.updateTexture = function() {
-                var material = this._materialNode;
-                if (material) {
-                        var technique = material.shaderProgram['default'];
-                        var renderer = g_Engine.getContext().renderer;
-                        if (renderer && technique) {
-                                var texMapName = this._propValues[this._propNames[0]];
-                                var tex = renderer.getTextureByName(texMapName, 'REPEAT');
-//                              if (tex)
-//                              {
-//                                      var res = [tex.image.naturalWidth, tex.image.naturalHeight];
-//                                      this.setResoloution( res );
-//                              }
+    // duplicate method required
+    this.dup = function () {
+        // allocate a new uber material
+        var newMat = new RadialBlurMaterial();
+
+        // 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 = radialBlurMaterialDef;
+        this._shader.init();
+
+        // set up the material node
+        this._materialNode = RDGE.createMaterialNode("radialBlurMaterial" + "_" + world.generateUniqueNodeID());
+        this._materialNode.setShader(this._shader);
+
+        this._time = 0;
+        if (this._shader && this._shader['default'])
+            this._shader['default'].u_time.set([this._time]);
+        this.setProperty("color", [this._time, 0, 0, 1]);
+
+        // set the shader values in the shader
+        this.updateTexture();
+        this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
+        this.update(0);
+    };
+
+    this.updateTexture = function () {
+        var material = this._materialNode;
+        if (material) {
+            var technique = material.shaderProgram['default'];
+            var renderer = RDGE.globals.engine.getContext().renderer;
+            if (renderer && technique) {
+                var texMapName = this._propValues[this._propNames[0]];
+                var tex = renderer.getTextureByName(texMapName, 'REPEAT');
+                //                              if (tex)
+                //                              {
+                //                                      var res = [tex.image.naturalWidth, tex.image.naturalHeight];
+                //                                      this.setResoloution( res );
+