diff options
author | hwc487 | 2012-03-02 09:36:31 -0800 |
---|---|---|
committer | hwc487 | 2012-03-02 09:36:31 -0800 |
commit | d044b6d9755d8ca686501fc3dd5644180e2ffbf0 (patch) | |
tree | 0ff6ca04987639417c0188ca8af2580b62d65f9f /js/helper-classes/RDGE/GLRectangle.js | |
parent | cf32843b1d64c631e6e7c808cc4f13ac316e1baf (diff) | |
download | ninja-d044b6d9755d8ca686501fc3dd5644180e2ffbf0.tar.gz |
WebGL File IO
Diffstat (limited to 'js/helper-classes/RDGE/GLRectangle.js')
-rwxr-xr-x | js/helper-classes/RDGE/GLRectangle.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/js/helper-classes/RDGE/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js index f44350df..2caa7080 100755 --- a/js/helper-classes/RDGE/GLRectangle.js +++ b/js/helper-classes/RDGE/GLRectangle.js | |||
@@ -166,6 +166,8 @@ function GLRectangle() | |||
166 | rtnStr += "flatMaterial"; | 166 | rtnStr += "flatMaterial"; |
167 | rtnStr += "\n"; | 167 | rtnStr += "\n"; |
168 | 168 | ||
169 | rtnStr += this.exportMaterials(); | ||
170 | |||
169 | return rtnStr; | 171 | return rtnStr; |
170 | } | 172 | } |
171 | 173 | ||
@@ -274,10 +276,10 @@ function GLRectangle() | |||
274 | brRadius = -z*(r-l)/(2.0*zn)*brRadiusNDC; | 276 | brRadius = -z*(r-l)/(2.0*zn)*brRadiusNDC; |
275 | 277 | ||
276 | // stroke | 278 | // stroke |
277 | // var strokeMaterial = this.makeStrokeMaterial(); | 279 | var strokeMaterial = this.makeStrokeMaterial(); |
278 | // var strokePrim = this.createStroke([x,y], 2*xFill, 2*yFill, strokeSize, tlRadius, blRadius, brRadius, trRadius, strokeMaterial); | 280 | var strokePrim = this.createStroke([x,y], 2*xFill, 2*yFill, strokeSize, tlRadius, blRadius, brRadius, trRadius, strokeMaterial); |
279 | // this._primArray.push( strokePrim ); | 281 | this._primArray.push( strokePrim ); |
280 | // this._materialNodeArray.push( strokeMaterial.getMaterialNode() ); | 282 | this._materialNodeArray.push( strokeMaterial.getMaterialNode() ); |
281 | 283 | ||
282 | // fill | 284 | // fill |
283 | tlRadius -= strokeSize; if (tlRadius < 0) tlRadius = 0.0; | 285 | tlRadius -= strokeSize; if (tlRadius < 0) tlRadius = 0.0; |