diff options
| author | Nivesh Rajbhandari | 2012-03-27 09:32:53 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-27 09:32:53 -0700 |
| commit | 406bbfc63f8ed42d7da105dbd068a49ff8fb5f09 (patch) | |
| tree | 3a8b45f4802f002269ff1bcf596f94cee4679a07 /assets/descriptor.json | |
| parent | bda9f8f5829c943486f8850e68c991e83f8fb8c8 (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-406bbfc63f8ed42d7da105dbd068a49ff8fb5f09.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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", |