aboutsummaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorhwc4872012-03-12 14:46:32 -0700
committerhwc4872012-03-12 14:46:32 -0700
commitef2dd5dfc557154d4755914f73963da8e858c4f1 (patch)
treeb2b3e7c5b948f210b9fcc5d3dbd39ae9752938f8 /assets
parent124c1e0e4bf7a0523e641ee37352128690f15c28 (diff)
parente50077ad43f18f16de106ff6547520f73746932e (diff)
downloadninja-ef2dd5dfc557154d4755914f73963da8e858c4f1.tar.gz
Merge branch 'integration' of github.com:ericmueller/ninja-internal into integration
Diffstat (limited to 'assets')
-rw-r--r--assets/CanvasRuntime.js4
-rw-r--r--assets/descriptor.json40
2 files changed, 33 insertions, 11 deletions
diff --git a/assets/CanvasRuntime.js b/assets/CanvasRuntime.js
index 5caf72ee..445050bc 100644
--- a/assets/CanvasRuntime.js
+++ b/assets/CanvasRuntime.js
@@ -852,12 +852,12 @@ function RuntimeOval()
852 // translate 852 // translate
853 var xCtr = 0.5*world.getViewportWidth() + this._xOffset, 853 var xCtr = 0.5*world.getViewportWidth() + this._xOffset,
854 yCtr = 0.5*world.getViewportHeight() + this._yOffset; 854 yCtr = 0.5*world.getViewportHeight() + this._yOffset;
855 var mat = Matrix.create( [ 855 var mat = [
856 [ xScale, 0.0, 0.0, xCtr], 856 [ xScale, 0.0, 0.0, xCtr],
857 [ 0.0, yScale, 0.0, yCtr], 857 [ 0.0, yScale, 0.0, yCtr],
858 [ 0.0, 0.0, 1.0, 0.0], 858 [ 0.0, 0.0, 1.0, 0.0],
859 [ 0.0, 0.0, 0.0, 1.0] 859 [ 0.0, 0.0, 0.0, 1.0]
860 ] ); 860 ];
861 861
862 // get a bezier representation of the circle 862 // get a bezier representation of the circle
863 var bezPts = this.circularArcToBezier( [0,0,0], [1,0,0], 2.0*Math.PI ); 863 var bezPts = this.circularArcToBezier( [0,0,0], [1,0,0], 2.0*Math.PI );
diff --git a/assets/descriptor.json b/assets/descriptor.json
index 2b955c40..0da58755 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -6,31 +6,53 @@
6 "files": [ 6 "files": [
7 "CanvasRuntime.js", 7 "CanvasRuntime.js",
8 "rdge-compiled.js", 8 "rdge-compiled.js",
9 "images/black.png",
10 "images/blue.png",
11 "images/BoxB2_AO.png", 9 "images/BoxB2_AO.png",
12 "images/BoxB2_DM.png",
13 "images/cubelight.png",
14 "images/grey.png", 10 "images/grey.png",
15 "images/material_paint.png",
16 "images/metal.png",
17 "images/normalMap.png",
18 "images/random_normal.png",
19 "images/rocky-diffuse.jpg", 11 "images/rocky-diffuse.jpg",
12 "images/BoxB2_DM.png",
13 "images/material_paint.png",
20 "images/rocky-normal.jpg", 14 "images/rocky-normal.jpg",
15 "images/black.png",
16 "images/metal.png",
21 "images/rocky-spec.jpg", 17 "images/rocky-spec.jpg",
18 "images/blue.png",
19 "images/normalMap.png",
22 "images/silver.png", 20 "images/silver.png",
21 "images/cubelight.png",
22 "images/random_normal.png",
23 "images/white.png", 23 "images/white.png",
24 "shaders/Basic.frag.glsl", 24 "shaders/Basic.frag.glsl",
25 "shaders/TwistVert.vert.glsl",
25 "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",
26 "shaders/linearGradient.frag.glsl", 33 "shaders/linearGradient.frag.glsl",
34 "shaders/Julia.frag.glsl",
27 "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",
28 "shaders/radialGradient.frag.glsl", 43 "shaders/radialGradient.frag.glsl",
44 "shaders/SquareTunnel.frag.glsl",
29 "shaders/radialGradient.vert.glsl", 45 "shaders/radialGradient.vert.glsl",
46 "shaders/Star.frag.glsl",
30 "shaders/test_fshader.glsl", 47 "shaders/test_fshader.glsl",
48 "shaders/Taper.frag.glsl",
31 "shaders/test_fshader_full.glsl", 49 "shaders/test_fshader_full.glsl",
50 "shaders/Taper.vert.glsl",
32 "shaders/test_vshader.glsl", 51 "shaders/test_vshader.glsl",
52 "shaders/Tunnel.frag.glsl",
33 "shaders/ub_fshader.glsl", 53 "shaders/ub_fshader.glsl",
34 "shaders/ub_vshader.glsl" 54 "shaders/Twist.frag.glsl",
55 "shaders/ub_vshader.glsl",
56 "shaders/TwistVert.frag.glsl"
35 ] 57 ]
36} \ No newline at end of file 58} \ No newline at end of file