aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhwc4872012-02-27 12:14:29 -0800
committerhwc4872012-02-27 12:14:29 -0800
commita8bd1585ae83d4d304b9f9f41823bb3dcbff9e01 (patch)
treecef97647a15dacbd54bb19ebcb8667e642657c36
parentbfa895634324a78652f2a7eecf725d9c6030023f (diff)
downloadninja-a8bd1585ae83d4d304b9f9f41823bb3dcbff9e01.tar.gz
Color fix for line shapes.
-rwxr-xr-xjs/helper-classes/RDGE/GLLine.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/helper-classes/RDGE/GLLine.js b/js/helper-classes/RDGE/GLLine.js
index 5b966896..65e6ab1c 100755
--- a/js/helper-classes/RDGE/GLLine.js
+++ b/js/helper-classes/RDGE/GLLine.js
@@ -11,6 +11,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
11/////////////////////////////////////////////////////////////////////// 11///////////////////////////////////////////////////////////////////////
12function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj) 12function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj)
13{ 13{
14 // initialize the inherited members
15 this.inheritedFrom = GLGeomObj;
16 this.inheritedFrom();
17
14 /////////////////////////////////////////////////////////////////////// 18 ///////////////////////////////////////////////////////////////////////
15 // Instance variables 19 // Instance variables
16 /////////////////////////////////////////////////////////////////////// 20 ///////////////////////////////////////////////////////////////////////
@@ -43,7 +47,7 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
43 47
44 this._slope = slope; 48 this._slope = slope;
45 this._strokeWidth = strokeSize; 49 this._strokeWidth = strokeSize;
46 if (strokeCOlor)this._strokeColor = strokeColor; 50 if (strokeColor) this._strokeColor = strokeColor.slice();
47 51
48 this._strokeStyle = strokeStyle; 52 this._strokeStyle = strokeStyle;
49 this._scaleX = (world.getViewportWidth())/(world.getViewportHeight()); 53 this._scaleX = (world.getViewportWidth())/(world.getViewportHeight());
@@ -57,10 +61,6 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
57 this._materialDiffuse = [0.4, 0.4, 0.4, 1.0]; 61 this._materialDiffuse = [0.4, 0.4, 0.4, 1.0];
58 this._materialSpecular = [0.4, 0.4, 0.4, 1.0]; 62 this._materialSpecular = [0.4, 0.4, 0.4, 1.0];
59 63
60 // initialize the inherited members
61 this.inheritedFrom = GLGeomObj;
62 this.inheritedFrom();
63
64 if(strokeMaterial) 64 if(strokeMaterial)
65 { 65 {
66 this._strokeMaterial = strokeMaterial; 66 this._strokeMaterial = strokeMaterial;