Merge branch 'master' into brushtool

7 files changed, 115 insertions, 106 deletions

diff --git a/js/helper-classes/RDGE/GLLine.js b/js/helper-classes/RDGE/GLLine.js
index bd3cbc26..67379b52 100644
--- a/js/helper-classes/RDGE/GLLine.js
+++ b/js/helper-classes/RDGE/GLLine.js
@@ -77,11 +77,16 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
         this.getStrokeMaterial  = function()            {  return this._strokeMaterial; }
         this.setStrokeMaterial  = function(m)           {  this._strokeMaterial = m;    }
 
-    this.getStrokeColor = function()            {  return this._strokeColor;    }
+    this.getStrokeColor         = function()            {  return this._strokeColor;    }
         //this.setStrokeColor   = function(c)           {  this._strokeColor = c;               }
 
-    this.getStrokeStyle = function()            {  return this._strokeStyle;    }
-        this.setStrokeStyle     = function(s)           {  this._strokeStyle = s;               }
+    this.getStrokeStyle         = function()            {  return this._strokeStyle;    }
+        this.setStrokeStyle             = function(s)           {  this._strokeStyle = s;               }
+
+        this.getFillMaterial    = function()            {  return null;         }
+        
+        this.setStrokeMaterial  = function(m)            {  this._strokeMaterial = m;            }
+        this.getStrokeMaterial  = function()            {  return this._strokeMaterial;         }
 
     this.getWidth                       = function()            {  return this._width;                          }
         this.setWidth                   = function(w)           {  this._width = w;                                     }
@@ -184,9 +189,9 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
                     xFill+x, yFill+y,  0.0,
                     -xFill+x, -yFill+y,  0.0,
 
-                    xFill+x, yFill+y,  0.0,
+                    xFill+x, -yFill+y,  0.0,
                     -xFill+x, -yFill+y,  0.0,
-                    xFill+x, -yFill+y,  0.0
+                    xFill+x, yFill+y,  0.0
                 ];
             }
             else if(this._slope === "horizontal")
@@ -199,10 +204,10 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
                     xFill+x, yFill+y,  0.0,
                     -xFill+x, -yFill+y,  0.0,
 
-                    xFill+x, yFill+y,  0.0,
+                     xFill+x, -yFill+y,  0.0,
                     -xFill+x, -yFill+y,  0.0,
-                    xFill+x, -yFill+y,  0.0
-                ];
+                    xFill+x, yFill+y,  0.0
+               ];
             }
             else if(this._slope > 0)
             {
@@ -212,9 +217,9 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
                     -xFill+2*xAdj+x, yFill+y,  0.0,
                     xFill-2*xAdj+x, -yFill+y,  0.0,
 
-                    -xFill+2*xAdj+x, yFill+y,  0.0,
+                    xFill+x, -yFill+2*yAdj+y,  0.0,
                     xFill-2*xAdj+x, -yFill+y,  0.0,
-                    xFill+x, -yFill+2*yAdj+y,  0.0
+                    -xFill+2*xAdj+x, yFill+y,  0.0
                 ];
             }
             else
@@ -225,9 +230,9 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
                     -xFill+2*xAdj+x, -yFill+y,  0.0,
                     xFill-2*xAdj+x, yFill+y,  0.0,
 
-                    -xFill+2*xAdj+x, -yFill+y,  0.0,
+                    xFill+x, yFill-2*yAdj+y,  0.0,
                     xFill-2*xAdj+x, yFill+y,  0.0,
-                    xFill+x, yFill-2*yAdj+y,  0.0
+                    -xFill+2*xAdj+x, -yFill+y,  0.0
                 ];
             }
         }
diff --git a/js/helper-classes/RDGE/GLMaterial.js b/js/helper-classes/RDGE/GLMaterial.js
index c633f679..e72b7908 100644
--- a/js/helper-classes/RDGE/GLMaterial.js
+++ b/js/helper-classes/RDGE/GLMaterial.js
@@ -215,7 +215,7 @@ function GLMaterial( world )
                 var endKey = "endMaterial\n";
                 var index = importStr.indexOf( endKey );
                 index += endKey.length;
-                rtnStr = importStr.substr( index );
+                var rtnStr = importStr.substr( index );
 
                 return rtnStr;
         }
diff --git a/js/helper-classes/RDGE/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js
index 871e9ae4..2899e476 100644
--- a/js/helper-classes/RDGE/GLRectangle.js
+++ b/js/helper-classes/RDGE/GLRectangle.js
@@ -178,8 +178,8 @@ function GLRectangle()
                 this._strokeWidth               = Number( this.getPropertyFromString( "strokeWidth: ",  importStr )  );
                 this._innerRadius               = Number( this.getPropertyFromString( "innerRadius: ",  importStr )  );
                 this._strokeStyle               = Number( this.getPropertyFromString( "strokeStyle: ",  importStr )  );
-                var strokeMaterialName  = Number( this.getPropertyFromString( "strokeMat: ",    importStr )  );
-                var fillMaterialName    = Number( this.getPropertyFromString( "fillMat: ",              importStr )  );
+                var strokeMaterialName  = this.getPropertyFromString( "strokeMat: ",    importStr );
+                var fillMaterialName    = this.getPropertyFromString( "fillMat: ",              importStr );
                 this._strokeStyle               =  Number( this.getPropertyFromString( "strokeColor: ", importStr )  );
                 this._fillColor                 =  eval( "[" + this.getPropertyFromString( "fillColor: ",       importStr ) + "]" );
                 this._strokeColor               =  eval( "[" + this.getPropertyFromString( "strokeColor: ",     importStr ) + "]" );
@@ -313,72 +313,71 @@ function GLRectangle()
                 var width  = Math.round(this.getWidth()),
                         height = Math.round(this.getHeight());
 
-                // get the top left point
                 pt = [inset, inset];    // top left corner
-                rad = this.getTLRadius() - inset;
-                if (rad < 0)  rad = 0;
-                pt[1] += rad;
-                if (MathUtils.fpSign(rad) == 0)  pt[1] = 0;
-                ctx.moveTo( pt[0],  pt[1] );
-
-                // get the bottom left point
-                pt = [inset, height - inset];
-                rad = this.getBLRadius() - inset;
-                if (rad < 0)  rad = 0;
-                pt[1] -= rad;
-                ctx.lineTo( pt[0],  pt[1] );
-
-                // get the bottom left arc
-                if (MathUtils.fpSign(rad) > 0)
-                {
-                        ctr = [ this.getBLRadius(),  height - this.getBLRadius() ];
-                        //this.renderQuadraticBezier( MathUtils.circularArcToBezier( ctr, pt, -0.5*Math.PI ), ctx  );
-                        ctx.arc( ctr[0], ctr[1],    rad,    Math.PI,   0.5*Math.PI,  true );
-                }
-
-                // do the bottom of the rectangle
-                pt = [width - inset,  height - inset];
-                rad = this.getBRRadius() - inset;
-                if (rad < 0)  rad = 0;
-                pt[0] -= rad;
-                ctx.lineTo( pt[0], pt[1] );
-
-                // get the bottom right arc
-                if (MathUtils.fpSign(rad) > 0)
-                {
-                        ctr = [width - this.getBRRadius(),  height - this.getBRRadius()];
-                        //this.renderQuadraticBezier( MathUtils.circularArcToBezier( ctr, pt, -0.5*Math.PI ), ctx  );
-                        ctx.arc( ctr[0], ctr[1],   rad,   0.5*Math.PI,  0.0,  true );
-                }
 
-                // get the right of the rectangle
-                pt = [width - inset,  inset];
-                rad = this.getTRRadius() - inset;
-                if (rad < 0)  rad = 0;
-                pt[1] += rad;
-                ctx.lineTo( pt[0], pt[1] );
+                var tlRad = this._tlRadius; //top-left radius
+                var trRad = this._trRadius;
+                var blRad = this._blRadius;
+                var brRad = this._brRadius;
 
-                // do the top right corner
-                if (MathUtils.fpSign(rad) > 0)
+                if ((tlRad <= 0) && (blRad <= 0) && (brRad <= 0) && (trRad <= 0))
                 {
-                        ctr = [width - this.getTRRadius(),  this.getTRRadius()];
-                        //this.renderQuadraticBezier( MathUtils.circularArcToBezier( ctr, pt, -0.5*Math.PI ), ctx );
-                        ctx.arc( ctr[0], ctr[1],   rad,   0.0,  -0.5*Math.PI,  true );
+                        ctx.rect(pt[0], pt[1], width - 2*inset, height - 2*inset);
                 }
-
-                // do the top of the rectangle
-                pt = [inset, inset]
-                rad = this.getTLRadius() - inset;
-                if (rad < 0)  rad = 0;
-                pt[0] += rad;
-                ctx.lineTo( pt[0], pt[1] );
-
-                // do the top left corner
-                if (MathUtils.fpSign(rad) > 0)
+                else
                 {
-                        ctr = [this.getTLRadius(),  this.getTLRadius()];
-                        //this.renderQuadraticBezier( MathUtils.circularArcToBezier( ctr, pt, -0.5*Math.PI ), ctx );
-                        ctx.arc( ctr[0], ctr[1],   rad,   -0.5*Math.PI,  Math.PI,  true );
+                        // get the top left point
+                        rad = tlRad - inset;
+                        if (rad < 0)  rad = 0;
+                        pt[1] += rad;
+                        if (MathUtils.fpSign(rad) == 0)  pt[1] = inset;
+                        ctx.moveTo( pt[0],  pt[1] );
+
+                        // get the bottom left point
+                        pt = [inset, height - inset];
+                        rad = blRad - inset;
+                        if (rad < 0)  rad = 0;