diff options
| author | Eric Guzman | 2012-07-20 11:24:19 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-07-20 11:24:19 -0700 |
| commit | 3cc29231852440508bdeec1964e40ce59f979f99 (patch) | |
| tree | 2faaf3d49337437e4a84818fe24dc64a60f8c611 | |
| parent | 8fdf2fc8aefee68aec4c7b5891e0375f704cbf26 (diff) | |
| parent | 9053e2037821a5c8405fabb74db9635deacfe8d5 (diff) | |
| download | ninja-3cc29231852440508bdeec1964e40ce59f979f99.tar.gz | |
Merge branch 'refs/heads/master' into fixes_7.1
74 files changed, 4772 insertions, 5549 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js index 4ab377c6..4181dd89 100644 --- a/assets/canvas-runtime.js +++ b/assets/canvas-runtime.js | |||
| @@ -635,11 +635,11 @@ NinjaCvsRt.RuntimeGeomObj = Object.create(Object.prototype, { | |||
| 635 | case "plasma": mat = Object.create(NinjaCvsRt.RuntimePlasmaMaterial, {}); break; | 635 | case "plasma": mat = Object.create(NinjaCvsRt.RuntimePlasmaMaterial, {}); break; |
| 636 | case "taper": mat = Object.create(NinjaCvsRt.RuntimeTaperMaterial, {}); break; | 636 | case "taper": mat = Object.create(NinjaCvsRt.RuntimeTaperMaterial, {}); break; |
| 637 | 637 | ||
| 638 | case "paris": | 638 | case "blueSky": |
| 639 | case "water": mat = Object.create(NinjaCvsRt.RuntimeWaterMaterial, {}); break; | 639 | case "water": mat = Object.create(NinjaCvsRt.RuntimeWaterMaterial, {}); break; |
| 640 | 640 | ||
| 641 | case "deform": | 641 | case "deform": |
| 642 | case "raiders": | 642 | case "darkBlur": |
| 643 | case "tunnel": | 643 | case "tunnel": |
| 644 | case "reliefTunnel": | 644 | case "reliefTunnel": |
| 645 | case "squareTunnel": | 645 | case "squareTunnel": |
diff --git a/assets/descriptor.json b/assets/descriptor.json index d9d74e6b..db824387 100644 --- a/assets/descriptor.json +++ b/assets/descriptor.json | |||
| @@ -20,9 +20,9 @@ | |||
| 20 | "images/cubelight.png", | 20 | "images/cubelight.png", |
| 21 | "images/random_normal.png", | 21 | "images/random_normal.png", |
| 22 | "images/white.png", | 22 | "images/white.png", |
| 23 | "images/paris.png", | 23 | "images/bluesky.png", |
| 24 | "images/powderblue.png", | 24 | "images/powderblue.png", |
| 25 | "images/raiders.png", | 25 | "images/darkblur.png", |
| 26 | "images/us_flag.png", | 26 | "images/us_flag.png", |
| 27 | "shaders/Basic.frag.glsl", | 27 | "shaders/Basic.frag.glsl", |
| 28 | "shaders/TwistVert.vert.glsl", | 28 | "shaders/TwistVert.vert.glsl", |
| @@ -34,9 +34,9 @@ | |||
| 34 | "shaders/linearGradient.frag.glsl", | 34 | "shaders/linearGradient.frag.glsl", |
| 35 | "shaders/linearGradient.vert.glsl", | 35 | "shaders/linearGradient.vert.glsl", |
| 36 | "shaders/plasma.frag.glsl", | 36 | "shaders/plasma.frag.glsl", |
| 37 | "shaders/Paris.frag.glsl", | ||
| 38 | "shaders/plasma.vert.glsl", | 37 | "shaders/plasma.vert.glsl", |
| 39 | "shaders/Pulse.frag.glsl", | 38 | "shaders/Pulse.frag.glsl", |
| 39 | "shaders/radialBlur.frag.glsl", | ||
| 40 | "shaders/radialGradient.frag.glsl", | 40 | "shaders/radialGradient.frag.glsl", |
| 41 | "shaders/radialGradient.vert.glsl", | 41 | "shaders/radialGradient.vert.glsl", |
| 42 | "shaders/test_fshader.glsl", | 42 | "shaders/test_fshader.glsl", |
diff --git a/assets/images/paris.png b/assets/images/bluesky.png index b7ef6c7b..b7ef6c7b 100644 --- a/assets/images/paris.png +++ b/assets/images/bluesky.png | |||
| Binary files differ | |||
diff --git a/assets/images/raiders.png b/assets/images/darkblur.png index 64c39c89..64c39c89 100644 --- a/assets/images/raiders.png +++ b/assets/images/darkblur.png | |||
| Binary files differ | |||
diff --git a/assets/shaders/Paris.frag.glsl b/assets/shaders/Paris.frag.glsl deleted file mode 100644 index 690b1453..00000000 --- a/assets/shaders/Paris.frag.glsl +++ /dev/null | |||
| @@ -1,68 +0,0 @@ | |||
| 1 | #ifdef GL_ES | ||
| 2 | precision highp float; | ||
| 3 | #endif | ||
| 4 | |||
| 5 | uniform sampler2D u_tex0; | ||
| 6 | uniform float u_time; | ||
| 7 | uniform vec2 u_resolution; | ||
| 8 | const float PI = 3.1415926535897932; | ||
| 9 | |||
| 10 | //speed | ||
| 11 | |||
| 12 | const float speed = 0.1; | ||
| 13 | const float speed_x = 0.075; | ||
| 14 | const float speed_y = 0.000; | ||
| 15 | |||
| 16 | // geometry | ||
| 17 | const float intensity = 1.5; | ||
| 18 | const int steps = 8; | ||
| 19 | //const float frequency = 4.0; | ||
| 20 | const float frequency = 2.0; | ||
| 21 | const int angle = 7; // better when a prime | ||
| 22 | |||
| 23 | // reflection and emboss | ||
| 24 | const float delta = 20.; | ||
| 25 | const float intence = 400.; | ||
| 26 | const float emboss = 0.3; | ||
| 27 | |||
| 28 | //---------- crystals effect | ||
| 29 | |||
| 30 | float col(vec2 coord) | ||
| 31 | { | ||
| 32 | float delta_theta = 2.0 * PI / float(angle); | ||
| 33 | float col = 0.0; | ||
| 34 | float theta = 0.0; | ||
| 35 | for (int i = 0; i < steps; i++) | ||
| 36 | { | ||
| 37 | vec2 adjc = coord; | ||
| 38 | theta = delta_theta*float(i); | ||
| 39 | adjc.x += cos(theta)*u_time*speed + u_time * speed_x; | ||
| 40 | adjc.y -= sin(theta)*u_time*speed - u_time * speed_y; | ||
| 41 | col = col + cos( (adjc.x*cos(theta) - adjc.y*sin(theta))*frequency)*intensity; | ||
| 42 | } | ||
| 43 | |||
| 44 | return cos(col); | ||
| 45 | } | ||
| 46 | |||
| 47 | //---------- main | ||
| 48 | |||
| 49 | void main(void) | ||
