diff options
author | Nivesh Rajbhandari | 2012-04-02 13:16:27 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-02 13:16:27 -0700 |
commit | c4e83a61311db75c7a1c307553262e77ecaae662 (patch) | |
tree | 68bdcbaa6af2488dd708de7675f0c5f51066d109 /js/lib | |
parent | c2e9ed5bc4cbef870283784fa2a91f43ff72cade (diff) | |
download | ninja-c4e83a61311db75c7a1c307553262e77ecaae662.tar.gz |
IKNinna-1409 - Should dirty document when changing shape properties. IKNinja-1391 - Shapes need to support no-color.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/lib')
-rwxr-xr-x | js/lib/geom/geom-obj.js | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js index ce06498d..44daa291 100755 --- a/js/lib/geom/geom-obj.js +++ b/js/lib/geom/geom-obj.js | |||
@@ -196,6 +196,24 @@ var GeomObj = function GLGeomObj() { | |||
196 | } | 196 | } |
197 | } | 197 | } |
198 | } | 198 | } |
199 | } else { | ||
200 | if (type === "fill") { | ||
201 | this._fillColor = null; | ||
202 | } else { | ||
203 | this._strokeColor = null; | ||
204 | } | ||
205 | |||
206 | if (this._materialArray && this._materialTypeArray) { | ||
207 | nMats = this._materialArray.length; | ||
208 | if (nMats === this._materialTypeArray.length) { | ||
209 | for (i=0; i<nMats; i++) { | ||
210 | if (this._materialTypeArray[i] == type) { | ||
211 | // TODO - Not sure how to set color to null values in shaders | ||
212 | this._materialArray[i].setProperty( "color", [0,0,0,0] ); | ||
213 | } | ||
214 | } | ||
215 | } | ||
216 | } | ||
199 | } | 217 | } |
200 | 218 | ||
201 | var world = this.getWorld(); | 219 | var world = this.getWorld(); |