diff options
author | hwc487 | 2012-04-05 05:30:55 -0700 |
---|---|---|
committer | hwc487 | 2012-04-05 05:30:55 -0700 |
commit | b6a8f72f670a8edee35554a4ca3a0618c526d651 (patch) | |
tree | ca10bd5b870bd318270ad32093c87e768612d830 /js/models | |
parent | 32c973351bc6f4d682205b788dc6235fc9452e07 (diff) | |
download | ninja-b6a8f72f670a8edee35554a4ca3a0618c526d651.tar.gz |
Re-added taper and twist-vert materials.
Diffstat (limited to 'js/models')
-rwxr-xr-x | js/models/materials-model.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/js/models/materials-model.js b/js/models/materials-model.js index b4595bd6..a06f692b 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js | |||
@@ -31,6 +31,8 @@ var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvert | |||
31 | var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial; | 31 | var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial; |
32 | var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial; | 32 | var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial; |
33 | var TwistMaterial = require("js/lib/rdge/materials/twist-material").TwistMaterial; | 33 | var TwistMaterial = require("js/lib/rdge/materials/twist-material").TwistMaterial; |
34 | var TwistVertMaterial = require("js/lib/rdge/materials/twist-vert-material").TwistVertMaterial; | ||
35 | var TaperMaterial = require("js/lib/rdge/materials/taper-material").TaperMaterial; | ||
34 | var JuliaMaterial = require("js/lib/rdge/materials/julia-material").JuliaMaterial; | 36 | var JuliaMaterial = require("js/lib/rdge/materials/julia-material").JuliaMaterial; |
35 | var KeleidoscopeMaterial = require("js/lib/rdge/materials/keleidoscope-material").KeleidoscopeMaterial; | 37 | var KeleidoscopeMaterial = require("js/lib/rdge/materials/keleidoscope-material").KeleidoscopeMaterial; |
36 | var MandelMaterial = require("js/lib/rdge/materials/mandel-material").MandelMaterial; | 38 | var MandelMaterial = require("js/lib/rdge/materials/mandel-material").MandelMaterial; |
@@ -65,6 +67,8 @@ exports.MaterialsModel = Montage.create(Component, { | |||
65 | this.addMaterial(new DeformMaterial()); | 67 | this.addMaterial(new DeformMaterial()); |
66 | this.addMaterial(new StarMaterial()); | 68 | this.addMaterial(new StarMaterial()); |
67 | this.addMaterial(new TwistMaterial()); | 69 | this.addMaterial(new TwistMaterial()); |
70 | this.addMaterial(new TwistVertMaterial()); | ||
71 | this.addMaterial(new TaperMaterial()); | ||
68 | this.addMaterial(new JuliaMaterial()); | 72 | this.addMaterial(new JuliaMaterial()); |
69 | this.addMaterial(new KeleidoscopeMaterial()); | 73 | this.addMaterial(new KeleidoscopeMaterial()); |
70 | this.addMaterial(new MandelMaterial()); | 74 | this.addMaterial(new MandelMaterial()); |