aboutsummaryrefslogtreecommitdiff
path: root/js/models/materials-model.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/models/materials-model.js')
-rwxr-xr-xjs/models/materials-model.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index 95f152e3..0f214356 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -16,7 +16,7 @@ var LinearGradientMaterial = require("js/lib/rdge/materials/linear-gradient-mate
16var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-material").RadialGradientMaterial; 16var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-material").RadialGradientMaterial;
17var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial; 17var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial;
18var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; 18var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial;
19var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; 19//var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial;
20var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; 20var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
21var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; 21var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial;
22var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; 22var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial;
@@ -50,7 +50,7 @@ exports.MaterialsModel = Montage.create(Component, {
50 // Load all the materials 50 // Load all the materials
51 this.addMaterial(new FlatMaterial()); 51 this.addMaterial(new FlatMaterial());
52 this.addMaterial(new BumpMetalMaterial()); 52 this.addMaterial(new BumpMetalMaterial());
53 this.addMaterial(new CloudMaterial()); 53 //this.addMaterial(new CloudMaterial());
54 this.addMaterial(new DeformMaterial()); 54 this.addMaterial(new DeformMaterial());
55 this.addMaterial(new FlagMaterial()); 55 this.addMaterial(new FlagMaterial());
56 this.addMaterial(new FlyMaterial()); 56 this.addMaterial(new FlyMaterial());
@@ -222,7 +222,7 @@ exports.MaterialsModel = Montage.create(Component, {
222 case "radialGradient": mat = new RadialGradientMaterial(); break; 222 case "radialGradient": mat = new RadialGradientMaterial(); break;
223 case "bumpMetal": mat = new BumpMetalMaterial(); break; 223 case "bumpMetal": mat = new BumpMetalMaterial(); break;
224 case "uber": mat = new UberMaterial(); break; 224 case "uber": mat = new UberMaterial(); break;
225 case "cloud": mat = new CloudMaterial(); break; 225 //case "cloud": mat = new CloudMaterial(); break;
226 226
227 case "taper": mat = new TaperMaterial(); break; 227 case "taper": mat = new TaperMaterial(); break;
228 case "twistVert": mat = new TwistVertMaterial(); break; 228 case "twistVert": mat = new TwistVertMaterial(); break;