diff options
author | Jose Antonio Marquez | 2012-04-10 11:24:35 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-04-10 11:24:35 -0700 |
commit | e663e336ee7e832b5059a82748061506b414cb04 (patch) | |
tree | a09d932319365067f437780e90aeab4ef19f74b4 /js/lib/geom/line.js | |
parent | c3022de5ba2e24737184dba7454233b165da0a20 (diff) | |
parent | bd43ce383b050d03b0f92cc923c517febc66ca28 (diff) | |
download | ninja-e663e336ee7e832b5059a82748061506b414cb04.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/lib/geom/line.js')
-rwxr-xr-x | js/lib/geom/line.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js index 1b2dd4fc..8ee39098 100755 --- a/js/lib/geom/line.js +++ b/js/lib/geom/line.js | |||
@@ -44,7 +44,7 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok | |||
44 | 44 | ||
45 | this._slope = slope; | 45 | this._slope = slope; |
46 | this._strokeWidth = strokeSize; | 46 | this._strokeWidth = strokeSize; |
47 | if (strokeColor) this._strokeColor = strokeColor.slice(); | 47 | this._strokeColor = strokeColor; |
48 | 48 | ||
49 | this._strokeStyle = strokeStyle; | 49 | this._strokeStyle = strokeStyle; |
50 | this._scaleX = (world.getViewportWidth())/(world.getViewportHeight()); | 50 | this._scaleX = (world.getViewportWidth())/(world.getViewportHeight()); |
@@ -137,6 +137,14 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok | |||
137 | this._strokeStyle = jObj.strokeStyle; | 137 | this._strokeStyle = jObj.strokeStyle; |
138 | this._strokeColor = jObj.strokeColor; | 138 | this._strokeColor = jObj.strokeColor; |
139 | var strokeMaterialName = jObj.strokeMat; | 139 | var strokeMaterialName = jObj.strokeMat; |
140 | |||
141 | var strokeMat = MaterialsModel.getMaterial( strokeMaterialName ); | ||
142 | if (!strokeMat) { | ||
143 | console.log( "object material not found in library: " + strokeMaterialName ); | ||
144 | strokeMat = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ); | ||
145 | } | ||
146 | this._strokeMaterial = strokeMat; | ||
147 | |||
140 | this.importMaterialsJSON( jObj.materials ); | 148 | this.importMaterialsJSON( jObj.materials ); |
141 | }; | 149 | }; |
142 | 150 | ||