aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/models/materials-model.js78
-rw-r--r--js/panels/Materials/materials-data.json52
3 files changed, 40 insertions, 92 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 7f8ee94f..bbf53144 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
1{ 1{
2 "libraries": [ 2 "libraries": [
3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.1"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.1"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.4"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index 833eb08f..cc3c3fa1 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -42,26 +42,26 @@ var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-mate
42var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial; 42var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial;
43var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; 43var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial;
44//var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; 44//var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial;
45var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; 45//var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
46var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; 46//var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial;
47var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; 47var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial;
48var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial; 48var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
49var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial; 49//var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial;
50var ReliefTunnelMaterial = require("js/lib/rdge/materials/relief-tunnel-material").ReliefTunnelMaterial; 50//var ReliefTunnelMaterial = require("js/lib/rdge/materials/relief-tunnel-material").ReliefTunnelMaterial;
51var FlagMaterial = require("js/lib/rdge/materials/flag-material").FlagMaterial; 51var FlagMaterial = require("js/lib/rdge/materials/flag-material").FlagMaterial;
52var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial; 52//var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial;
53var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial; 53//var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial;
54var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial; 54var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial;
55var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial; 55var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial;
56var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial; 56//var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial;
57var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial; 57//var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial;
58var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial; 58//var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial;
59var TwistMaterial = require("js/lib/rdge/materials/twist-material").TwistMaterial; 59//var TwistMaterial = require("js/lib/rdge/materials/twist-material").TwistMaterial;
60var TwistVertMaterial = require("js/lib/rdge/materials/twist-vert-material").TwistVertMaterial; 60var TwistVertMaterial = require("js/lib/rdge/materials/twist-vert-material").TwistVertMaterial;
61var TaperMaterial = require("js/lib/rdge/materials/taper-material").TaperMaterial; 61var TaperMaterial = require("js/lib/rdge/materials/taper-material").TaperMaterial;
62var JuliaMaterial = require("js/lib/rdge/materials/julia-material").JuliaMaterial; 62//var JuliaMaterial = require("js/lib/rdge/materials/julia-material").JuliaMaterial;
63var KeleidoscopeMaterial = require("js/lib/rdge/materials/keleidoscope-material").KeleidoscopeMaterial; 63//var KeleidoscopeMaterial = require("js/lib/rdge/materials/keleidoscope-material").KeleidoscopeMaterial;
64var MandelMaterial = require("js/lib/rdge/materials/mandel-material").MandelMaterial; 64//var MandelMaterial = require("js/lib/rdge/materials/mandel-material").MandelMaterial;
65 65
66 66
67exports.MaterialsModel = Montage.create(Component, { 67exports.MaterialsModel = Montage.create(Component, {
@@ -76,29 +76,29 @@ exports.MaterialsModel = Montage.create(Component, {
76 this.addMaterial(new FlatMaterial()); 76 this.addMaterial(new FlatMaterial());
77 this.addMaterial(new BumpMetalMaterial()); 77 this.addMaterial(new BumpMetalMaterial());
78 //this.addMaterial(new CloudMaterial()); 78 //this.addMaterial(new CloudMaterial());
79 this.addMaterial(new DeformMaterial()); 79 //this.addMaterial(new DeformMaterial());
80 this.addMaterial(new FlagMaterial()); 80 this.addMaterial(new FlagMaterial());
81 this.addMaterial(new FlyMaterial()); 81 //this.addMaterial(new FlyMaterial());
82 this.addMaterial(new JuliaMaterial()); 82 //this.addMaterial(new JuliaMaterial());
83 this.addMaterial(new KeleidoscopeMaterial()); 83 //this.addMaterial(new KeleidoscopeMaterial());
84 this.addMaterial(new LinearGradientMaterial()); 84 this.addMaterial(new LinearGradientMaterial());
85 this.addMaterial(new MandelMaterial()); 85 //this.addMaterial(new MandelMaterial());
86 this.addMaterial(new ParisMaterial()); 86 this.addMaterial(new ParisMaterial());
87 this.addMaterial(new PlasmaMaterial()); 87 this.addMaterial(new PlasmaMaterial());
88 this.addMaterial(new PulseMaterial()); 88 this.addMaterial(new PulseMaterial());
89 this.addMaterial(new RadialBlurMaterial()); 89 //this.addMaterial(new RadialBlurMaterial());
90 this.addMaterial(new RadialGradientMaterial()); 90 this.addMaterial(new RadialGradientMaterial());
91 this.addMaterial(new RaidersMaterial()); 91 //this.addMaterial(new RaidersMaterial());
92 this.addMaterial(new ReliefTunnelMaterial()); 92 //this.addMaterial(new ReliefTunnelMaterial());
93 this.addMaterial(new SquareTunnelMaterial()); 93 //this.addMaterial(new SquareTunnelMaterial());
94 this.addMaterial(new StarMaterial()); 94 //this.addMaterial(new StarMaterial());
95 this.addMaterial(new TaperMaterial()); 95 this.addMaterial(new TaperMaterial());
96 this.addMaterial(new TunnelMaterial()); 96 //this.addMaterial(new TunnelMaterial());
97 this.addMaterial(new TwistMaterial()); 97 //this.addMaterial(new TwistMaterial());
98 this.addMaterial(new TwistVertMaterial()); 98 this.addMaterial(new TwistVertMaterial());
99 this.addMaterial(new UberMaterial()); 99 this.addMaterial(new UberMaterial());
100 this.addMaterial(new WaterMaterial()); 100 this.addMaterial(new WaterMaterial());
101 this.addMaterial(new ZInvertMaterial()); 101 //this.addMaterial(new ZInvertMaterial());
102 } 102 }
103 }, 103 },
104 104
@@ -251,24 +251,24 @@ exports.MaterialsModel = Montage.create(Component, {
251 251
252 case "taper": mat = new TaperMaterial(); break; 252 case "taper": mat = new TaperMaterial(); break;
253 case "twistVert": mat = new TwistVertMaterial(); break; 253 case "twistVert": mat = new TwistVertMaterial(); break;
254 case "radialBlur": mat = new RadialBlurMaterial(); break; 254 //case "radialBlur": mat = new RadialBlurMaterial(); break;
255 case "plasma": mat = new PlasmaMaterial(); break; 255 case "plasma": mat = new PlasmaMaterial(); break;
256 case "pulse": mat = new PulseMaterial(); break; 256 case "pulse": mat = new PulseMaterial(); break;
257 case "tunnel": mat = new TunnelMaterial(); break; 257 //case "tunnel": mat = new TunnelMaterial(); break;
258 case "reliefTunnel": mat = new ReliefTunnelMaterial(); break; 258 //case "reliefTunnel": mat = new ReliefTunnelMaterial(); break;
259 case "squareTunnel": mat = new SquareTunnelMaterial(); break; 259 //case "squareTunnel": mat = new SquareTunnelMaterial(); break;
260 case "flag": mat = new FlagMaterial(); break; 260 case "flag": mat = new FlagMaterial(); break;
261 case "fly": mat = new FlyMaterial(); break; 261 //case "fly": mat = new FlyMaterial(); break;
262 case "water": mat = new WaterMaterial(); break; 262 case "water": mat = new WaterMaterial(); break;
263 case "paris": mat = new ParisMaterial(); break; 263 case "paris": mat = new ParisMaterial(); break;
264 case "raiders": mat = new RaidersMaterial(); break; 264 //case "raiders": mat = new RaidersMaterial(); break;
265 case "zinvert": mat = new ZInvertMaterial(); break; 265 //case "zinvert": mat = new ZInvertMaterial(); break;
266 case "deform": mat = new DeformMaterial(); break; 266 //case "deform": mat = new DeformMaterial(); break;
267 case "star": mat = new StarMaterial(); break; 267 //case "star": mat = new StarMaterial(); break;
268 case "twist": mat = new TwistMaterial(); break; 268 //case "twist": mat = new TwistMaterial(); break;
269 case "julia": mat = new JuliaMaterial(); break; 269 //case "julia": mat = new JuliaMaterial(); break;
270 case "keleidoscope": mat = new KeleidoscopeMaterial(); break; 270 //case "keleidoscope": mat = new KeleidoscopeMaterial(); break;
271 case "mandel": mat = new MandelMaterial(); break; 271 //case "mandel": mat = new MandelMaterial(); break;
272 272
273 273
274 default: 274 default:
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index fde82d3d..abdacbe1 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -9,34 +9,14 @@
9 "id" : "Bump Metal" 9 "id" : "Bump Metal"
10 }, 10 },
11 { 11 {
12 "label": "Deform",
13 "id" : "Deform"
14 },
15 {
16 "label": "Flag", 12 "label": "Flag",
17 "id" : "Flag" 13 "id" : "Flag"
18 }, 14 },
19 { 15 {
20 "label": "Fly",
21 "id" : "Fly"
22 },
23 {
24 "label": "Julia",
25 "id" : "Julia"
26 },
27 {
28 "label": "Keleidoscope",
29 "id" : "Keleidoscope"
30 },
31 {
32 "label": "Linear Gradient", 16 "label": "Linear Gradient",
33 "id" : "Linear Gradient" 17 "id" : "Linear Gradient"
34 }, 18 },
35 { 19 {
36 "label": "Mandel",
37 "id" : "Mandel"
38 },
39 {
40 "label": "Paris", 20 "label": "Paris",
41 "id" : "Paris" 21 "id" : "Paris"
42 }, 22 },
@@ -49,42 +29,14 @@
49 "id" : "Pulse" 29 "id" : "Pulse"
50 }, 30 },
51 { 31 {
52 "label": "Radial Blur",
53 "id" : "Radial Blur"
54 },
55 {
56 "label": "Radial Gradient", 32 "label": "Radial Gradient",
57 "id" : "Radial Gradient" 33 "id" : "Radial Gradient"
58 }, 34 },
59 { 35 {
60 "label": "Raiders",
61 "id" : "Raiders"
62 },
63 {
64 "label": "Relief Tunnel",
65 "id" : "Relief Tunnel"
66 },
67 {
68 "label": "Square Tunnel",
69 "id" : "Square Tunnel"
70 },
71 {
72 "label": "Star",
73 "id" : "Star"
74 },
75 {