diff options
author | Jose Antonio Marquez | 2012-06-19 10:25:16 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-19 10:25:16 -0700 |
commit | 4d2a5acd1631f0cf4e38f127c886f481668ddce0 (patch) | |
tree | 3bc8f2b21826c0ee6d37bc77753d45a882783cbf /js/panels/Materials/materials-data.json | |
parent | 616b31a644ee221edcbc19f821b2194e8edf9fad (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-4d2a5acd1631f0cf4e38f127c886f481668ddce0.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/panels/Materials/materials-data.json')
-rw-r--r-- | js/panels/Materials/materials-data.json | 99 |
1 files changed, 81 insertions, 18 deletions
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index f06ab6c8..a5d8997b 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json | |||
@@ -5,37 +5,100 @@ | |||
5 | "label": "Ninja Materials", | 5 | "label": "Ninja Materials", |
6 | "children": [ | 6 | "children": [ |
7 | { | 7 | { |
8 | "label": "Uber", | 8 | "label": "Bump Metal", |
9 | "id" : "UberMaterial" | 9 | "id" : "Bump Metal" |
10 | }, | 10 | }, |
11 | { | 11 | { |
12 | "label": "Bump Metal", | 12 | "label": "Deform", |
13 | "id" : "BumpMetalMaterial" | 13 | "id" : "Deform" |
14 | }, | ||
15 | { | ||
16 | "label": "Flag", | ||
17 | "id" : "Flag" | ||
18 | }, | ||
19 | { | ||
20 | "label": "Fly", | ||
21 | "id" : "Fly" | ||
22 | }, | ||
23 | { | ||
24 | "label": "Julia", | ||
25 | "id" : "Julia" | ||
26 | }, | ||
27 | { | ||
28 | "label": "Keleidoscope", | ||
29 | "id" : "Keleidoscope" | ||
14 | }, | 30 | }, |
15 | { | 31 | { |
16 | "label": "Linear Gradient", | 32 | "label": "Linear Gradient", |
17 | "id" : "LinearGradientMaterial" | 33 | "id" : "Linear Gradient" |
34 | }, | ||
35 | { | ||
36 | "label": "Mandel", | ||
37 | "id" : "Mandel" | ||
38 | }, | ||
39 | { | ||
40 | "label": "Paris", | ||
41 | "id" : "Paris" | ||
42 | }, | ||
43 | { | ||
44 | "label": "Plasma", | ||
45 | "id" : "Plasma" | ||
46 | }, | ||
47 | { | ||
48 | "label": "Pulse", | ||
49 | "id" : "Pulse" | ||
50 | }, | ||
51 | { | ||
52 | "label": "Radial Blur", | ||
53 | "id" : "Radial Blur" | ||
18 | }, | 54 | }, |
19 | { | 55 | { |
20 | "label": "Radial Gradient", | 56 | "label": "Radial Gradient", |
21 | "id" : "RadialGradientMaterial" | 57 | "id" : "Radial Gradient" |
22 | }, | 58 | }, |
23 | { | 59 | { |
24 | "label": "Flat", | 60 | "label": "Raiders", |
25 | "id" : "FlatMaterial" | 61 | "id" : "Raiders" |
26 | } | 62 | }, |
27 | ] | 63 | { |
28 | }, | 64 | "label": "Relief Tunnel", |
29 | { | 65 | "id" : "Relief Tunnel" |
30 | "label": "Custom Materials", | 66 | }, |
31 | "children": [ | 67 | { |
68 | "label": "Square Tunnel", | ||
69 | "id" : "Square Tunnel" | ||
70 | }, | ||
71 | { | ||
72 | "label": "Star", | ||
73 | "id" : "Star" | ||
74 | }, | ||
75 | { | ||
76 | "label": "Taper", | ||
77 | "id" : "Taper" | ||
78 | }, | ||
79 | { | ||
80 | "label": "Tunnel", | ||
81 | "id" : "Tunnel" | ||
82 | }, | ||
83 | { | ||
84 | "label": "Twist", | ||
85 | "id" : "Twist" | ||
86 | }, | ||
87 | { | ||
88 | "label": "Twist Vertex", | ||
89 | "id" : "Twist Vertex" | ||
90 | }, | ||
91 | { | ||
92 | "label": "Uber", | ||
93 | "id" : "Uber" | ||
94 | }, | ||
32 | { | 95 | { |
33 | "label": "Checker Board", | 96 | "label": "Water", |
34 | "id" : "CheckerBoard" | 97 | "id" : "Water" |
35 | }, | 98 | }, |
36 | { | 99 | { |
37 | "label": "Shiny Metal", | 100 | "label": "Z-Invert", |
38 | "id" : "ShinyMetal" | 101 | "id" : "Z-Invert" |
39 | } | 102 | } |
40 | ] | 103 | ] |
41 | } | 104 | } |