diff options
author | Jonathan Duran | 2012-07-23 08:25:56 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-07-23 08:25:56 -0700 |
commit | e7268388a99722dd7bb64506893538fd0ee96a71 (patch) | |
tree | 9e0f960030f1625f730bbd60ca79ce449a788df0 /js/lib/geom/geom-obj.js | |
parent | 3487c690d526534f27578acdffe1a45f2526cbf6 (diff) | |
parent | 2b05717e49bafc4b401441d9a55153b9e4ae7e43 (diff) | |
download | ninja-e7268388a99722dd7bb64506893538fd0ee96a71.tar.gz |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'js/lib/geom/geom-obj.js')
-rwxr-xr-x | js/lib/geom/geom-obj.js | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js index e0ed51fb..7b4e49fa 100755 --- a/js/lib/geom/geom-obj.js +++ b/js/lib/geom/geom-obj.js | |||
@@ -205,6 +205,26 @@ exports.GeomObj = Object.create(Object.prototype, { | |||
205 | /////////////////////////////////////////////////////////////////////// | 205 | /////////////////////////////////////////////////////////////////////// |
206 | // Methods | 206 | // Methods |
207 | /////////////////////////////////////////////////////////////////////// | 207 | /////////////////////////////////////////////////////////////////////// |
208 | initColors: { | ||
209 | value: function() { | ||
210 | if(this._strokeColor && this._strokeMaterial) { | ||
211 | if(this._strokeMaterial.hasProperty("color")) { | ||
212 | this._strokeMaterial.setProperty( "color", this._strokeColor ); | ||
213 | } else if (this._strokeMaterial && (this._strokeMaterial.gradientType === this._strokeColor.gradientMode)) { | ||
214 | this._strokeMaterial.setGradientData(this._strokeColor.color); | ||
215 | } | ||
216 | } | ||
217 | |||
218 | if(this._fillColor && this._fillMaterial) { | ||
219 | if(this._fillMaterial.hasProperty("color")) { | ||
220 | this._fillMaterial.setProperty( "color", this._fillColor ); | ||
221 | } else if (this._fillMaterial && (this._fillMaterial.gradientType === this._fillColor.gradientMode)) { | ||
222 | this._fillMaterial.setGradientData(this._fillColor.color); | ||
223 | } | ||
224 | } | ||
225 | } | ||
226 | }, | ||
227 | |||
208 | setMaterialColor: { | 228 | setMaterialColor: { |
209 | value: function(c, type) { | 229 | value: function(c, type) { |
210 | var i = 0, | 230 | var i = 0, |