aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/MaterialsLibrary.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-08 22:15:41 -0800
committerValerio Virgillito2012-02-08 22:15:41 -0800
commitc7df002135328edac03e72a1e4b331b2c72667f8 (patch)
treeee50509df494b069d1769b7b54afd83fd0178e64 /js/helper-classes/RDGE/MaterialsLibrary.js
parent725c54ff4af40f70b7dbd4508da34d2909cea8bd (diff)
parent35ad4d6d2fac4432046141c63c0209cf3d00be5c (diff)
downloadninja-c7df002135328edac03e72a1e4b331b2c72667f8.tar.gz
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js')
-rw-r--r--js/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 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
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);