diff options
| author | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
| commit | 89b5e793ea88ef235b54b6e1d1c379698d3e612b (patch) | |
| tree | 4d29118f35df77ca6b423119a4ff61694a442cbf /assets | |
| parent | 9d2c2a80483415d7560b00cda5519153db23e241 (diff) | |
| parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
| download | ninja-89b5e793ea88ef235b54b6e1d1c379698d3e612b.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'assets')
| -rwxr-xr-x[-rw-r--r--] | assets/images/BoxB2_AO.png | bin | 86244 -> 86244 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/BoxB2_DM.png | bin | 86470 -> 86470 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/black.png | bin | 2791 -> 2791 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/blue.png | bin | 2796 -> 2796 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/cubelight.png | bin | 33154 -> 33154 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/grey.png | bin | 935 -> 935 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/material_paint.png | bin | 8450 -> 8450 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/metal.png | bin | 696663 -> 696663 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/normalMap.png | bin | 105161 -> 105161 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/random_normal.png | bin | 9356 -> 9356 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/rocky-diffuse.jpg | bin | 262144 -> 262144 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/rocky-normal.jpg | bin | 262144 -> 262144 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/rocky-spec.jpg | bin | 316095 -> 316095 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/silver.png | bin | 46756 -> 46756 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/white.png | bin | 2794 -> 2794 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/Basic.vert.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/linearGradient.frag.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/linearGradient.vert.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/test_fshader.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/test_fshader_full.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/test_vshader.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/ub_fshader.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/ub_vshader.glsl | 0 |
23 files changed, 0 insertions, 0 deletions
diff --git a/assets/images/BoxB2_AO.png b/assets/images/BoxB2_AO.png index b2ca502e..b2ca502e 100644..100755 --- a/assets/images/BoxB2_AO.png +++ b/assets/images/BoxB2_AO.png | |||
| Binary files differ | |||
diff --git a/assets/images/BoxB2_DM.png b/assets/images/BoxB2_DM.png index a493ec54..a493ec54 100644..100755 --- a/assets/images/BoxB2_DM.png +++ b/assets/images/BoxB2_DM.png | |||
| Binary files differ | |||
diff --git a/assets/images/black.png b/assets/images/black.png index 10318dc4..10318dc4 100644..100755 --- a/assets/images/black.png +++ b/assets/images/black.png | |||
| Binary files differ | |||
diff --git a/assets/images/blue.png b/assets/images/blue.png index ee029b55..ee029b55 100644..100755 --- a/assets/images/blue.png +++ b/assets/images/blue.png | |||
| Binary files differ | |||
diff --git a/assets/images/cubelight.png b/assets/images/cubelight.png index 53ff1bf3..53ff1bf3 100644..100755 --- a/assets/images/cubelight.png +++ b/assets/images/cubelight.png | |||
| Binary files differ | |||
diff --git a/assets/images/grey.png b/assets/images/grey.png index b1ebe069..b1ebe069 100644..100755 --- a/assets/images/grey.png +++ b/assets/images/grey.png | |||
| Binary files differ | |||
diff --git a/assets/images/material_paint.png b/assets/images/material_paint.png index 38c695f5..38c695f5 100644..100755 --- a/assets/images/material_paint.png +++ b/assets/images/material_paint.png | |||
| Binary files differ | |||
diff --git a/assets/images/metal.png b/assets/images/metal.png index ab36aaac..ab36aaac 100644..100755 --- a/assets/images/metal.png +++ b/assets/images/metal.png | |||
| Binary files differ | |||
diff --git a/assets/images/normalMap.png b/assets/images/normalMap.png index 04ae6008..04ae6008 100644..100755 --- a/assets/images/normalMap.png +++ b/assets/images/normalMap.png | |||
| Binary files differ | |||
diff --git a/assets/images/random_normal.png b/assets/images/random_normal.png index 62ca9d4d..62ca9d4d 100644..100755 --- a/assets/images/random_normal.png +++ b/assets/images/random_normal.png | |||
| Binary files differ | |||
diff --git a/assets/images/rocky-diffuse.jpg b/assets/images/rocky-diffuse.jpg index 485b9665..485b9665 100644..100755 --- a/assets/images/rocky-diffuse.jpg +++ b/assets/images/rocky-diffuse.jpg | |||
| Binary files differ | |||
diff --git a/assets/images/rocky-normal.jpg b/assets/images/rocky-normal.jpg index 386a2e4c..386a2e4c 100644..100755 --- a/assets/images/rocky-normal.jpg +++ b/assets/images/rocky-normal.jpg | |||
| Binary files differ | |||
diff --git a/assets/images/rocky-spec.jpg b/assets/images/rocky-spec.jpg index 906919c3..906919c3 100644..100755 --- a/assets/images/rocky-spec.jpg +++ b/assets/images/rocky-spec.jpg | |||
| Binary files differ | |||
diff --git a/assets/images/silver.png b/assets/images/silver.png index ed7f029e..ed7f029e 100644..100755 --- a/assets/images/silver.png +++ b/assets/images/silver.png | |||
| Binary files differ | |||
diff --git a/assets/images/white.png b/assets/images/white.png index 58148a5d..58148a5d 100644..100755 --- a/assets/images/white.png +++ b/assets/images/white.png | |||
| Binary files differ | |||
diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl index 0d5b8d63..0d5b8d63 100644..100755 --- a/assets/shaders/Basic.vert.glsl +++ b/assets/shaders/Basic.vert.glsl | |||
diff --git a/assets/shaders/linearGradient.frag.glsl b/assets/shaders/linearGradient.frag.glsl index 64cf56ff..64cf56ff 100644..100755 --- a/assets/shaders/linearGradient.frag.glsl +++ b/assets/shaders/linearGradient.frag.glsl | |||
diff --git a/assets/shaders/linearGradient.vert.glsl b/assets/shaders/linearGradient.vert.glsl index aac9cbee..aac9cbee 100644..100755 --- a/assets/shaders/linearGradient.vert.glsl +++ b/assets/shaders/linearGradient.vert.glsl | |||
diff --git a/assets/shaders/test_fshader.glsl b/assets/shaders/test_fshader.glsl index 629d1878..629d1878 100644..100755 --- a/assets/shaders/test_fshader.glsl +++ b/assets/shaders/test_fshader.glsl | |||
diff --git a/assets/shaders/test_fshader_full.glsl b/assets/shaders/test_fshader_full.glsl index ef721b39..ef721b39 100644..100755 --- a/assets/shaders/test_fshader_full.glsl +++ b/assets/shaders/test_fshader_full.glsl | |||
diff --git a/assets/shaders/test_vshader.glsl b/assets/shaders/test_vshader.glsl index a02d9720..a02d9720 100644..100755 --- a/assets/shaders/test_vshader.glsl +++ b/assets/shaders/test_vshader.glsl | |||
diff --git a/assets/shaders/ub_fshader.glsl b/assets/shaders/ub_fshader.glsl index 19a35b7d..19a35b7d 100644..100755 --- a/assets/shaders/ub_fshader.glsl +++ b/assets/shaders/ub_fshader.glsl | |||
diff --git a/assets/shaders/ub_vshader.glsl b/assets/shaders/ub_vshader.glsl index ff0c09b4..ff0c09b4 100644..100755 --- a/assets/shaders/ub_vshader.glsl +++ b/assets/shaders/ub_vshader.glsl | |||
