20 files changed, 365 insertions, 221 deletions

diff --git a/credits.html b/credits.html
index 1cc36c78..082eefd4 100644
--- a/credits.html
+++ b/credits.html
@@ -95,5 +95,14 @@
             <li>License: <a href="http://www.opensource.org/licenses/mit-license.php" target="_blank">http://www.opensource.org/licenses/mit-license.php</a></li>

         </ul>

     </div>

+

+    <div>

+        js-beautify

+        <ul>

+            <li>Written by Einar Lielmanis, <a href="mailto:einar@jsbeautifier.org">einar@jsbeautifier.org</a>. Python version flourished by <a href="http://github.com/satufk">Stefano Sanfilippo</a> with help from <a href="http://jason.diamond.name/weblog/">Jason&nbsp;Diamond</a>, Patrick&nbsp;Hof, Nochum&nbsp;Sossonko, Andreas&nbsp;Schneider, Dave&nbsp;Vasilevsky, <a href="http://my.opera.com/Vital/blog/">Vital&nbsp;Batmanov,</a> Ron&nbsp;Baldwin, Gabriel&nbsp;Harrison, <a href="http://shullian.com">Chris&nbsp;J.&nbsp;Shull</a>, <a href="http://mathiasbynens.be/">Mathias Bynens</a> and others.</li>

+            <li>Code from: <a href="https://github.com/einars/js-beautify" target="_blank">https://github.com/einars/js-beautify</a></li>

+            <li>License: <a href="https://github.com/einars/js-beautify/blob/master/license.txt" target="_blank">https://github.com/einars/js-beautify/blob/master/license.txt</a></li>

+        </ul>

+    </div>

         </body>

 </html>
\ No newline at end of file
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index cf48757d..a3a30b57 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -37,7 +37,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "rotate3DProperties",
                 "spriteSheet":  true,
                 "action":       "Rotate3DTool",
-                "toolTip":      "3D Rotate Object Tool (W)",
+                "toolTip":      "3D Object Rotate Tool (W)",
                 "cursor":       "auto",
                 "lastInGroup":  false,
                 "container":    false,
@@ -48,7 +48,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "translate3DProperties",
                 "spriteSheet":  true,
                 "action":       "Translate3DTool",
-                "toolTip":      "3D Translate Object Tool (G)",
+                "toolTip":      "3D Object Translate Tool (G)",
                 "cursor":       "auto",
                 "lastInGroup":  true,
                 "container":    false,
@@ -195,7 +195,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "rotateStageProperties",
                 "spriteSheet":  true,
                 "action":       "RotateStageTool3D",
-                "toolTip":      "3D Rotate Stage Tool",
+                "toolTip":      "3D Stage Rotate Tool (M)",
                 "cursor":       "auto",
                 "lastInGroup":  false,
                 "container":    false,
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 76436732..75628731 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -679,6 +679,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             if(typeof this.application.ninja.selectedElements !== 'undefined'){
                 this.selectionModel = this.application.ninja.selectedElements;
             }
+
+            this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
         }
     },
 
@@ -700,6 +702,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                 this.application.ninja.stage._scrollLeft = this.savedTopScroll;
             }
             this.application.ninja.stage.handleScroll();
+
+            this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
         }
     }
         ////////////////////////////////////////////////////////////////////
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 712544c0..15ed6b6d 100755
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -47,8 +47,8 @@ function GLCircle()
         
                         this._strokeWidth = strokeSize;
                         this._innerRadius = innerRadius;
-                        this._strokeColor = strokeColor;
-                        this._fillColor = fillColor;
+                        if (strokeColor)  this._strokeColor = strokeColor;
+                        if (fillColor)  this._fillColor = fillColor;
 
                         this._strokeStyle = strokeStyle;
                 }
@@ -398,59 +398,58 @@ function GLCircle()
                         // set up the fill style
                         ctx.beginPath();
                         ctx.lineWidth = 0;
-                        ctx.fillStyle   = "#990000";
                         if (this._fillColor)
                         {
                                 var c = "rgba(" + 255*this._fillColor[0] + "," + 255*this._fillColor[1] + "," + 255*this._fillColor[2] + "," + this._fillColor[3] + ")";  
                                 ctx.fillStyle = c;
-                        }
 
-                        // draw the fill
-                        ctx.beginPath();
-                        var p = MathUtils.transformPoint( bezPts[0],   mat );
-                        ctx.moveTo( p[0],  p[1] );
-                        var index = 1;
-                        while (index < n)
-                        {
-                                p0   = MathUtils.transformPoint( bezPts[index],  mat );
-                                p1 = MathUtils.transformPoint( bezPts[index+1],  mat );
+                                // draw the fill
+                                ctx.beginPath();
+                                var p = MathUtils.transformPoint( bezPts[0],   mat );
+                                ctx.moveTo( p[0],  p[1] );
+                                var index = 1;
+                                while (index < n)
+                                {
+                                        p0   = MathUtils.transformPoint( bezPts[index],  mat );
+                                        p1 = MathUtils.transformPoint( bezPts[index+1],  mat );
 
-                                x0 = p0[0];  y0 = p0[1];
-                                x1 = p1[0];  y1 = p1[1];
-                                ctx.quadraticCurveTo( x0,  y0,  x1, y1 );
-                                index += 2;
-                        }
+                                        x0 = p0[0];  y0 = p0[1];
+                                        x1 = p1[0];  y1 = p1[1];
+                                        ctx.quadraticCurveTo( x0,  y0,  x1, y1 );
+                                        index += 2;
+                                }
 
-                        if ( MathUtils.fpSign(innerRad) > 0)
-                        {
-                                xScale = 0.5*innerRad*this._width;
-                                yScale = 0.5*innerRad*this._height;
-                                mat[0] = xScale;
-                                mat[5] = yScale;
-
-                                // get the bezier points
-                                var bezPts = MathUtils.circularArcToBezier( Vector.create([0,0,0]), Vector.create([1,0,0]), -2.0*Math.PI );
-                                if (bezPts)
+                                if ( MathUtils.fpSign(innerRad) > 0)
                                 {
-                                        var n = bezPts.length;
-                                        p = MathUtils.transformPoint( bezPts[0],   mat );
-                                        ctx.moveTo( p[0],  p[1] );
-                                        index = 1;
-                                        while (index < n)
+                                        xScale = 0.5*innerRad*this._width;
+                                        yScale = 0.5*innerRad*this._height;
+                                        mat[0] = xScale;
+                                        mat[5] = yScale;
+
+                                        // get the bezier points
+                                        var bezPts = MathUtils.circularArcToBezier( Vector.create([0,0,0]), Vector.create([1,0,0]), -2.0*Math.PI );
+                                        if (bezPts)
                                         {
-                                                p0 = MathUtils.transformPoint( bezPts[index],    mat );
-                                                p1 = MathUtils.transformPoint( bezPts[index+1],  mat );
-
-                                                var x0 = p0[0],  y0 = p0[1],
-                                                        x1 = p1[0],  y1 = p1[1];
-                                                ctx.quadraticCurveTo( x0,  y0,  x1, y1 );
-                                                index += 2;
+                                                var n = bezPts.length;
+                                                p = MathUtils.transformPoint( bezPts[0],   mat );
+                                                ctx.moveTo( p[0],  p[1] );
+                                                index = 1;
+                                                while (index < n)
+                                                {
+                                                        p0 = MathUtils.transformPoint( bezPts[index],    mat );
+                                                        p1 = MathUtils.transformPoint( bezPts[index+1],  mat );
+
+                                                        var x0 = p0[0],  y0 = p0[1],
+                                                                x1 = p1[0],  y1 = p1[1];
+                                                        ctx.quadraticCurveTo( x0,  y0,  x1, y1 );
+                                                        index += 2;
+                                                }
                                         }
                                 }
-                        }
 
-                        // fill the path
-                        ctx.fill();
+                                // fill the path
+                                ctx.fill();
+                        }