diff options
author | hwc487 | 2012-03-22 15:32:19 -0700 |
---|---|---|
committer | hwc487 | 2012-03-22 15:32:19 -0700 |
commit | 31e924e1b8b8da8342b3ff2341c8284915486c0b (patch) | |
tree | 560ec8c2ffbd91d7f06d7ae9ad51b78ad7b07e76 /assets/descriptor.json | |
parent | 4cd4d29ae10b87f7b280d537b8980d207a22dd43 (diff) | |
download | ninja-31e924e1b8b8da8342b3ff2341c8284915486c0b.tar.gz |
Added Paris and Raiders materials
Diffstat (limited to 'assets/descriptor.json')
-rw-r--r-- | assets/descriptor.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json index af0520dd..85fbc996 100644 --- a/assets/descriptor.json +++ b/assets/descriptor.json | |||
@@ -21,6 +21,9 @@ | |||
21 | "images/cubelight.png", | 21 | "images/cubelight.png", |
22 | "images/random_normal.png", | 22 | "images/random_normal.png", |
23 | "images/white.png", | 23 | "images/white.png", |
24 | "images/paris.png", | ||
25 | "images/powderblue.png", | ||
26 | "images/raiders.png", | ||
24 | "shaders/Basic.frag.glsl", | 27 | "shaders/Basic.frag.glsl", |
25 | "shaders/TwistVert.vert.glsl", | 28 | "shaders/TwistVert.vert.glsl", |
26 | "shaders/Basic.vert.glsl", | 29 | "shaders/Basic.vert.glsl", |
@@ -36,6 +39,7 @@ | |||
36 | "shaders/Keleidoscope.frag.glsl", | 39 | "shaders/Keleidoscope.frag.glsl", |
37 | "shaders/plasma.frag.glsl", | 40 | "shaders/plasma.frag.glsl", |
38 | "shaders/Mandel.frag.glsl", | 41 | "shaders/Mandel.frag.glsl", |
42 | "shaders/Paris.frag.glsl", | ||
39 | "shaders/plasma.vert.glsl", | 43 | "shaders/plasma.vert.glsl", |
40 | "shaders/Pulse.frag.glsl", | 44 | "shaders/Pulse.frag.glsl", |
41 | "shaders/radialBlur.frag.glsl", | 45 | "shaders/radialBlur.frag.glsl", |