diff options
author | Nivesh Rajbhandari | 2012-02-07 10:58:14 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-07 10:58:14 -0800 |
commit | 486842239c71e7964f38a09aacda4970f2a82e1a (patch) | |
tree | 20a6688d296b1ef09bf32add9dfdef586bfe4207 /js/helper-classes/RDGE | |
parent | 789eaf5a92c903f27462c69a8890fbec695ab14e (diff) | |
download | ninja-486842239c71e7964f38a09aacda4970f2a82e1a.tar.gz |
Updated tools and PI to get/set materials by binding to appModel's materials property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/helper-classes/RDGE')
-rw-r--r-- | js/helper-classes/RDGE/MaterialsLibrary.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js index edc4f7da..9616b525 100644 --- a/js/helper-classes/RDGE/MaterialsLibrary.js +++ b/js/helper-classes/RDGE/MaterialsLibrary.js | |||
@@ -169,6 +169,7 @@ var MaterialsLibrary = Object.create(Object.prototype, { | |||
169 | 169 | ||
170 | // create the library of stroke and fill materials | 170 | // create the library of stroke and fill materials |
171 | 171 | ||
172 | var flatMaterial = new FlatMaterial(); | ||
172 | var uberMaterial = new UberMaterial(); | 173 | var uberMaterial = new UberMaterial(); |
173 | //var linearGradientMaterial = new LinearGradientMaterial(); | 174 | //var linearGradientMaterial = new LinearGradientMaterial(); |
174 | //var radialGradientMaterial = new RadialGradientMaterial(); | 175 | //var radialGradientMaterial = new RadialGradientMaterial(); |
@@ -182,6 +183,7 @@ var uberMaterial = new UberMaterial(); | |||
182 | //var plasmaMaterial = new PlasmaMaterial(); | 183 | //var plasmaMaterial = new PlasmaMaterial(); |
183 | var bumpMetalMaterial = new BumpMetalMaterial(); | 184 | var bumpMetalMaterial = new BumpMetalMaterial(); |
184 | 185 | ||
186 | MaterialsLibrary.addMaterial(flatMaterial); | ||
185 | //MaterialsLibrary.addMaterial(linearGradientMaterial); | 187 | //MaterialsLibrary.addMaterial(linearGradientMaterial); |
186 | //MaterialsLibrary.addMaterial(radialGradientMaterial); | 188 | //MaterialsLibrary.addMaterial(radialGradientMaterial); |
187 | //MaterialsLibrary.addMaterial(radialBlurMaterial); | 189 | //MaterialsLibrary.addMaterial(radialBlurMaterial); |