Oooh? Xonotic added cubemap water? We must haz!!!

diff --git a/data/scripts/water.shader b/data/scripts/water.shader
index bcbdd01529b7b293006b744720f89a67ed2c8746..e9be30c8e93bbc47d61bdfe728b541f0a248da7a 100644 (file)
--- a/data/scripts/water.shader
+++ b/data/scripts/water.shader
@@ -19,6 +19,30 @@ textures/water/water0
        dp_water 0.1 0.8  3 3  1 1 1  1 1 1  0.125\r
 }\r
 \r
+textures/water/water0_cubemap\r
+{\r
+       qer_trans 20\r
+       surfaceparm nomarks\r
+       surfaceparm trans\r
+       surfaceparm water\r
+       surfaceparm nolightmap\r
+       cull none\r
+       q3map_globaltexture\r
+       tessSize 256\r
+       qer_editorimage textures/water/water0_reflect.tga\r
+       {\r
+               map textures/water/water0.tga\r
+               tcMod turb 0 0.4 0 0.08\r
+               blendfunc add\r
+       }\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map $lightmap\r
+               blendfunc add\r
+               tcGen lightmap\r
+       }\r
+}\r
+\r
 textures/water/water1\r
 {\r
        qer_editorimage textures/water/water1.tga\r

diff --git a/data/textures/water/water0_reflect.tga b/data/textures/water/water0_reflect.tga
new file mode 100644 (file)
index 0000000..d69cdc5
Binary files /dev/null and b/data/textures/water/water0_reflect.tga differ