diff options
| author | Eric Guzman | 2012-02-27 11:13:35 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-27 11:13:35 -0800 |
| commit | 1a6604a50f6cfbbf0cd6f45ab94b63a001d02162 (patch) | |
| tree | bbfc75d1be1ff98d22042dbbed4ca93b4a845e0c | |
| parent | 9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (diff) | |
| parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
| download | ninja-1a6604a50f6cfbbf0cd6f45ab94b63a001d02162.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
131 files changed, 6193 insertions, 1352 deletions
diff --git a/assets/shaders/Deform.frag.glsl b/assets/shaders/Deform.frag.glsl new file mode 100644 index 00000000..1dbe45a0 --- /dev/null +++ b/assets/shaders/Deform.frag.glsl | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | #ifdef GL_ES | ||
| 2 | precision highp float; | ||
| 3 | #endif | ||
| 4 | |||
| 5 | uniform float u_time; | ||