Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/helper-classes/RDGE/rdge-compiled.js
	js/helper-classes/RDGE/runtime/GLRuntime.js
	js/helper-classes/RDGE/src/core/script/MeshManager.js
	js/helper-classes/RDGE/src/core/script/engine.js
	js/helper-classes/RDGE/src/core/script/fx/ssao.js
	js/helper-classes/RDGE/src/core/script/init_state.js
	js/helper-classes/RDGE/src/core/script/run_state.js
	js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
	js/helper-classes/RDGE/src/core/script/utilities.js
	js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
	js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/lib/drawing/world.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-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/linear-gradient-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-blur-material.js
	js/lib/rdge/materials/radial-gradient-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
	js/preloader/Preloader.js

9 files changed, 486 insertions, 142 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 752aa2a3..f7f0e4bf 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -5,6 +5,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var ShapeTool = require("js/tools/ShapeTool").ShapeTool;
+var ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController;
 var DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase;
 var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager;
 var Montage = require("montage/core/core").Montage;
@@ -15,6 +16,9 @@ var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
 
 var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke;
 
+//whether or not we want the mouse move to be handled all the time (not just while drawing) inside the brush tool
+var g_DoBrushToolMouseMove = true;
+
 exports.BrushTool = Montage.create(ShapeTool, {
     hasReel: { value: false },
         _toolID: { value: "brushTool" },
@@ -35,6 +39,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
         //view options
         _brushStrokeCanvas: {value: null, writable: true},
         _brushStrokePlaneMat: {value: null, writable: true},
+        _draggingPlane: {value: null, writable: true},
 
         //the current brush stroke
         _selectedBrushStroke: {value: null, writable: true},
@@ -60,23 +65,61 @@ exports.BrushTool = Montage.create(ShapeTool, {
                 }
 
                 this.startDraw(event);
-                if (this._brushStrokePlaneMat === null) {
-                    this._brushStrokePlaneMat = this.mouseDownHitRec.getPlaneMatrix();
-                }
+                this._brushStrokePlaneMat = this.mouseDownHitRec.getPlaneMatrix();
+
                 //start a new brush stroke
                 if (this._selectedBrushStroke === null){
                     this._selectedBrushStroke = new BrushStroke();
                     if (this.application.ninja.colorController.colorToolbar.stroke.webGlColor){
                         this._selectedBrushStroke.setStrokeColor(this.application.ninja.colorController.colorToolbar.stroke.webGlColor);
                     }
+                    if (this.application.ninja.colorController.colorToolbar.fill.webGlColor){
+                        this._selectedBrushStroke.setSecondStrokeColor(this.application.ninja.colorController.colorToolbar.fill.webGlColor);
+                    }
+                    
                     //add this point to the brush stroke in case the user does a mouse up before doing a mouse move
                     var currMousePos = this._getUnsnappedPosition(event.pageX, event.pageY);
                     this._selectedBrushStroke.addPoint(currMousePos);
 
-                    //TODO get these values from the options
-                    this._selectedBrushStroke.setStrokeWidth(20);
+                    var strokeSize = 1;
+                    if (this.options.strokeSize) {
+                        strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units);
+                    }
+                    this._selectedBrushStroke.setStrokeWidth(strokeSize);
+
+                    var strokeHardness = 100;
+                    if (this.options.strokeHardness){
+                        strokeHardness = this.options.strokeHardness.value;
+                    }
+                    this._selectedBrushStroke.setStrokeHardness(strokeHardness);
+
+                    var doSmoothing = false;
+                    if (this.options.doSmoothing){
+                        doSmoothing = this.options.doSmoothing;
+                    }
+                    this._selectedBrushStroke.setDoSmoothing(doSmoothing);
+                    if (doSmoothing){
+                        this._selectedBrushStroke.setSmoothingAmount(this.options.smoothingAmount.value);
+                    }
+                    
+                    var useCalligraphic = false;
+                    if (this.options.useCalligraphic){
+                        useCalligraphic = this.options.useCalligraphic;
+                    }
+                    if (useCalligraphic) {
+                        this._selectedBrushStroke.setStrokeUseCalligraphic(true);
+                        var strokeAngle = 0;
+                        if (this.options.strokeAngle){
+                            strokeAngle= this.options.strokeAngle.value;
+                        }
+                        this._selectedBrushStroke.setStrokeAngle(Math.PI * strokeAngle/180);
+                    } else {
+                        this._selectedBrushStroke.setStrokeUseCalligraphic(false);
+                    }
+                    
                 }
-                NJevent("enableStageMove");//stageManagerModule.stageManager.enableMouseMove();
+                if (!g_DoBrushToolMouseMove)
+                    NJevent("enableStageMove");//stageManagerModule.stageManager.enableMouseMove();
             } //value: function (event) {
         }, //HandleLeftButtonDown
 
@@ -91,7 +134,9 @@ exports.BrushTool = Montage.create(ShapeTool, {
                 snapManager.enableSnapAlign(false);
 
                 var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(x,y));
+                //todo fix this function to allow us to get the correct location (in 3D) for the mouse position
                 var unsnappedpos = DrawingToolBase.getHitRecPos(snapManager.snap(point.x, point.y, false));
+                this._draggingPlane = snapManager.getDragPlane();
 
                 snapManager.enableElementSnap(elemSnap);
                 snapManager.enableGridSnap(gridSnap);
@@ -112,13 +157,15 @@ exports.BrushTool = Montage.create(ShapeTool, {
                    return;
                 }
 
+                var currMousePos = this._getUnsnappedPosition(event.pageX, event.pageY);
                 if (this._isDrawing) {
-                    var currMousePos = this._getUnsnappedPosition(event.pageX, event.pageY);
-                    if (this._selectedBrushStroke && this._selectedBrushStroke.getNumPoints()<100){
+                    if (this._selectedBrushStroke && this._selectedBrushStroke.getNumPoints()<1000){
                        this._selectedBrushStroke.addPoint(currMousePos);
                     }
                     this.ShowCurrentBrushStrokeOnStage();
-                } //if (this._isDrawing) {
+                } else {
+                    this.ShowCurrentBrushIconOnStage(currMousePos);
+                }
 
                 //this.drawLastSnap();        //TODO.. is this line necessary if we're not snapping? // Required cleanup for both Draw/Feedbacks
 
@@ -129,27 +176,69 @@ exports.BrushTool = Montage.create(ShapeTool, {
 
         HandleLeftButtonUp: {
             value: function (event) {
-                /*var drawData = this.getDrawingData();
-                if (drawData) {
-                    if (this._brushStrokePlaneMat === null) {
-                        this._brushStrokePlaneMat = drawData.planeMat;
-                    }
-                }
-                if (this._isDrawing) {
-                   this.doDraw(event);
-                }*/
                 this.endDraw(event);
 
                 this._isDrawing = false;
                 this._hasDraw = false;
 
-
+                //finish giving enough info. to the brush stroke
+                this._selectedBrushStroke.setPlaneMatrix(this._brushStrokePlaneMat);
+                this._selectedBrushStroke.setPlaneMatrixInverse(glmat4.inverse(this._brushStrokePlaneMat,[]));
+                this._selectedBrushStroke.setDragPlane(this._draggingPlane);
+                
                 //display the previously drawn stroke in a separate canvas
                 this.RenderCurrentBrushStroke();
 
                 this._selectedBrushStroke = null;
                 this._brushStrokeCanvas = null;
-                NJevent("disableStageMove");
+                if (!g_DoBrushToolMouseMove)
+                    NJevent("disableStageMove");
+            }
+        },
+
+        ShowCurrentBrushIconOnStage:{
+            value: function(currMousePos) {
+                //clear the canvas before we draw anything else
+                this.application.ninja.stage.clearDrawingCanvas();
+                //display the brush icon of proper size (query the options bar)
+                var strokeSize = 1;
+                if (this.options.strokeSize) {
+                    strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units);
+                }
+                var useCalligraphic = false;
+                if (this.options.useCalligraphic){
+                    useCalligraphic = this.options.useCalligraphic;
+                }
+                var ctx = this.application.ninja.stage.drawingContext;//stageManagerModule.stageManager.drawingContext;
+                if (ctx === null)
+                    throw ("null drawing context in Brushtool::ShowCurrentBrushStrokeOnStage");
+                ctx.save();
+
+                var horizontalOffset = this.application.ninja.stage.userContentLeft;
+                var verticalOffset = this.application.ninja.stage.userContentTop;
+                var halfStrokeWidth = 0.5*strokeSize;
+                ctx.beginPath();
+                if (!useCalligraphic) {