diff options
author | Nivesh Rajbhandari | 2012-03-13 13:05:16 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-13 13:05:16 -0700 |
commit | e19376c54eedd1f1c457ba405b2f110be376a559 (patch) | |
tree | d48c090f71ed2cd6bd6ce38ff68c36ab69299985 /assets/descriptor.json | |
parent | 970c2e63aa8ec3f70df2bf073cedb9e3b7617755 (diff) | |
parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
download | ninja-e19376c54eedd1f1c457ba405b2f110be376a559.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'assets/descriptor.json')
-rw-r--r-- | assets/descriptor.json | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json index ef21b8b8..af0520dd 100644 --- a/assets/descriptor.json +++ b/assets/descriptor.json | |||
@@ -4,32 +4,55 @@ | |||
4 | "root": "/assets/", | 4 | "root": "/assets/", |
5 | "directories": [{"name": "images"}, {"name": "shaders"}], | 5 | "directories": [{"name": "images"}, {"name": "shaders"}], |
6 | "files": [ | 6 | "files": [ |
7 | "canvas-runtime.js", | ||
7 | "rdge-compiled.js", | 8 | "rdge-compiled.js", |
8 | "images/black.png", | ||
9 | "images/blue.png", | ||
10 | "images/BoxB2_AO.png", | 9 | "images/BoxB2_AO.png", |
11 | "images/BoxB2_DM.png", | ||
12 | "images/cubelight.png", | ||
13 | "images/grey.png", | 10 | "images/grey.png", |
14 | "images/material_paint.png", | ||
15 | "images/metal.png", | ||
16 | "images/normalMap.png", | ||
17 | "images/random_normal.png", | ||
18 | "images/rocky-diffuse.jpg", | 11 | "images/rocky-diffuse.jpg", |
12 | "images/BoxB2_DM.png", | ||
13 | "images/material_paint.png", | ||
19 | "images/rocky-normal.jpg", | 14 | "images/rocky-normal.jpg", |
15 | "images/black.png", | ||
16 | "images/metal.png", | ||
20 | "images/rocky-spec.jpg", | 17 | "images/rocky-spec.jpg", |
18 | "images/blue.png", | ||
19 | "images/normalMap.png", | ||
21 | "images/silver.png", | 20 | "images/silver.png", |
21 | "images/cubelight.png", | ||
22 | "images/random_normal.png", | ||
22 | "images/white.png", | 23 | "images/white.png", |
23 | "shaders/Basic.frag.glsl", | 24 | "shaders/Basic.frag.glsl", |
25 | "shaders/TwistVert.vert.glsl", | ||
24 | "shaders/Basic.vert.glsl", | 26 | "shaders/Basic.vert.glsl", |
27 | "shaders/Water.frag.glsl", | ||
28 | "shaders/Deform.frag.glsl", | ||
29 | "shaders/Water2.frag.glsl", | ||
30 | "shaders/Flag.vert.glsl", | ||
31 | "shaders/ZInvert.frag.glsl", | ||
32 | "shaders/Fly.frag.glsl", | ||
25 | "shaders/linearGradient.frag.glsl", | 33 | "shaders/linearGradient.frag.glsl", |
34 | "shaders/Julia.frag.glsl", | ||
26 | "shaders/linearGradient.vert.glsl", | 35 | "shaders/linearGradient.vert.glsl", |
36 | "shaders/Keleidoscope.frag.glsl", | ||
37 | "shaders/plasma.frag.glsl", | ||
38 | "shaders/Mandel.frag.glsl", | ||
39 | "shaders/plasma.vert.glsl", | ||
40 | "shaders/Pulse.frag.glsl", | ||
41 | "shaders/radialBlur.frag.glsl", | ||
42 | "shaders/ReliefTunnel.frag.glsl", | ||
27 | "shaders/radialGradient.frag.glsl", | 43 | "shaders/radialGradient.frag.glsl", |
44 | "shaders/SquareTunnel.frag.glsl", | ||
28 | "shaders/radialGradient.vert.glsl", | 45 | "shaders/radialGradient.vert.glsl", |
46 | "shaders/Star.frag.glsl", | ||
29 | "shaders/test_fshader.glsl", | 47 | "shaders/test_fshader.glsl", |
48 | "shaders/Taper.frag.glsl", | ||
30 | "shaders/test_fshader_full.glsl", | 49 | "shaders/test_fshader_full.glsl", |
50 | "shaders/Taper.vert.glsl", | ||
31 | "shaders/test_vshader.glsl", | 51 | "shaders/test_vshader.glsl", |
52 | "shaders/Tunnel.frag.glsl", | ||
32 | "shaders/ub_fshader.glsl", | 53 | "shaders/ub_fshader.glsl", |
33 | "shaders/ub_vshader.glsl" | 54 | "shaders/Twist.frag.glsl", |
55 | "shaders/ub_vshader.glsl", | ||
56 | "shaders/TwistVert.frag.glsl" | ||
34 | ] | 57 | ] |
35 | } \ No newline at end of file | 58 | } \ No newline at end of file |