1 files changed, 20 insertions, 36 deletions

diff --git a/js/helper-classes/RDGE/GLLine.js b/js/helper-classes/RDGE/GLLine.js
index 9eaa69d1..67379b52 100644
--- a/js/helper-classes/RDGE/GLLine.js
+++ b/js/helper-classes/RDGE/GLLine.js
@@ -27,12 +27,6 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
 
     this._strokeWidth = 0.25;
 
-    // stroke colors
-        this._strokeColor = [0.4, 0.4, 0.4, 1.0];
-
-        // stroke materials
-        this._strokeMaterial;
-
     this._strokeStyle = "Solid";
 
     if (arguments.length > 0)
@@ -83,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;                                     }
@@ -190,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")
@@ -205,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)
             {
@@ -218,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
@@ -231,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
                 ];
             }
         }
@@ -267,26 +266,11 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
         }
 
                 var prim = ShapePrimitive.create(strokeVertices, strokeNormals, strokeTextures, indices, g_Engine.getContext().renderer.TRIANGLES, indices.length);
-                this._primArray.push( prim );
 
-                var strokeMaterial;
-                if (this.getStrokeMaterial())
-                        strokeMaterial = this.getStrokeMaterial().dup();
-                else
-                        strokeMaterial = new FlatMaterial();
+        var strokeMaterial = this.makeStrokeMaterial();
 
-                if (strokeMaterial)
-        {
-                        strokeMaterial.init( this.getWorld() );
-            if(!this.getStrokeMaterial() && this._strokeColor)
-            {
-                strokeMaterial.setProperty("color", this._strokeColor);
-            }
-        }
-                
-                this._materialArray.push( strokeMaterial );
-                this._materialTypeArray.push( "stroke" );
-                this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
+        this._primArray.push( prim );
+        this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
 
         world.updateObject(this);
     }