aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/MaterialsLibrary.js
diff options
context:
space:
mode:
authorAnanya Sen2012-02-08 15:37:23 -0800
committerAnanya Sen2012-02-08 15:37:23 -0800
commitab6f2f7ada39a9b27408575af9a565daf0a9d291 (patch)
tree92a796e34530d1a724ddb24ef22e59ffef13c12a /js/helper-classes/RDGE/MaterialsLibrary.js
parent36b2e540f06cef3887e7d0fea60527fee51e2a40 (diff)
parent5a69d5be181ea98fa842977885ebd8c861dda6ca (diff)
downloadninja-ab6f2f7ada39a9b27408575af9a565daf0a9d291.tar.gz
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Diffstat (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js')
-rwxr-xr-xjs/helper-classes/RDGE/MaterialsLibrary.js2
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 100755
--- 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
172var flatMaterial = new FlatMaterial();
172var uberMaterial = new UberMaterial(); 173var 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();
183var bumpMetalMaterial = new BumpMetalMaterial(); 184var bumpMetalMaterial = new BumpMetalMaterial();
184 185
186MaterialsLibrary.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);