Cubemap reflections for all fluid types, for much better water slime and lava

diff --git a/data/scripts/morphed.shader b/data/scripts/morphed.shader
index 34b17960635c5917b84e4ad9afdfee59b1781cdb..e8241e58ac34d87bcc2d1eb7c497442b577a699a 100644 (file)
--- a/data/scripts/morphed.shader
+++ b/data/scripts/morphed.shader
@@ -14,7 +14,7 @@ textures/morphed/gelslime
                map textures/morphed/gelslime.tga\r
                rgbGen identity\r
                depthWrite\r
-               blendfunc blend\r
+               blendfunc add\r
        }\r
        {\r
                map $lightmap\r
@@ -23,6 +23,13 @@ textures/morphed/gelslime
                tcGen lightmap\r
                depthFunc equal\r
        }\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map $lightmap\r
+               blendfunc add\r
+               tcGen lightmap\r
+       }\r
+       //dp_water 0.1 0.9  3 3  1 1 1  1 1 1  0.4 // disabled for performance\r
 }\r
 \r
 textures/morphed/gelslime_warp\r
@@ -42,7 +49,7 @@ textures/morphed/gelslime_warp
                map textures/morphed/gelslime.tga\r
                rgbGen identity\r
                depthWrite\r
-               blendfunc blend\r
+               blendfunc add\r
        }\r
        {\r
                map $lightmap\r
@@ -51,6 +58,13 @@ textures/morphed/gelslime_warp
                tcGen lightmap\r
                depthFunc equal\r
        }\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map $lightmap\r
+               blendfunc add\r
+               tcGen lightmap\r
+       }\r
+       //dp_water 0.1 0.9  3 3  1 1 1  1 1 1  0.4 // disabled for performance\r
 }\r
 \r
 \r
@@ -73,6 +87,12 @@ textures/morphed/gelslime_bright
                tcMod turb 1 0.15 0 0.15\r
                tcMod scroll 0 0.2\r
        }\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map $lightmap\r
+               blendfunc add\r
+               tcGen lightmap\r
+       }\r
 }\r
 \r
 \r
@@ -93,5 +113,10 @@ textures/morphed/gelslime_bright_warp
                blendFunc add\r
                rgbGen identity\r
        }\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map $lightmap\r
+               blendfunc add\r
+               tcGen lightmap\r
+       }\r
 }\r
-\r

diff --git a/data/scripts/stormkeep.shader b/data/scripts/stormkeep.shader
index a52a0635e8b6b9e9907d4f32dd970a2cb02f3029..e9dede94211bc02f739b6af7eaf8869ad94e63a1 100644 (file)
--- a/data/scripts/stormkeep.shader
+++ b/data/scripts/stormkeep.shader
@@ -36,6 +36,12 @@ textures/stormkeep/lava
                map textures/stormkeep/lava.tga\r
                blendfunc add\r
        }\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map $lightmap\r
+               blendfunc add\r
+               tcGen lightmap\r
+       }\r
 }\r
 \r
 textures/stormkeep/lava_flow\r
@@ -51,5 +57,11 @@ textures/stormkeep/lava_flow
                blendfunc add\r
                tcMod scroll 0 -0.25\r
        }\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map $lightmap\r
+               blendfunc add\r
+               tcGen lightmap\r
+       }\r
 }\r
 \r

diff --git a/data/scripts/water.shader b/data/scripts/water.shader
index e9be30c8e93bbc47d61bdfe728b541f0a248da7a..034d62949561a7e3ebc1831dca99ad9a7ab50556 100644 (file)
--- a/data/scripts/water.shader
+++ b/data/scripts/water.shader
@@ -3,24 +3,6 @@
 textures/water/water0\r
 {\r
        qer_editorimage textures/water/water0.tga\r
-       qer_trans 20\r
-       surfaceparm nomarks\r
-       surfaceparm trans\r
-       surfaceparm water\r
-       surfaceparm nolightmap\r
-       cull none\r
-       q3map_globaltexture\r
-       {\r
-               map textures/water/water0.tga\r
-               tcMod scroll 0.07 0.07\r
-               tcmod scale 1.2 0.7\r
-               blendfunc blend\r
-       }\r
-       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
@@ -29,7 +11,6 @@ textures/water/water0_cubemap
        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
@@ -41,6 +22,7 @@ textures/water/water0_cubemap
                blendfunc add\r
                tcGen lightmap\r
        }\r
+       dp_water 0.1 0.9  3 3  1 1 1  1 1 1  0.4\r
 }\r
 \r
 textures/water/water1\r
@@ -53,11 +35,17 @@ textures/water/water1
        surfaceparm nolightmap\r
        cull none\r
        q3map_globaltexture\r
+       tessSize 256\r
        {\r
                map textures/water/water1.tga\r
-               tcMod scroll 0.07 0.07\r
-               tcmod scale 1.2 0.7\r
-               blendfunc blend\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
        dp_water 0.1 0.8  3 3  1 1 1  1 1 1  0.125\r
 }\r
@@ -72,11 +60,17 @@ textures/water/water2
        surfaceparm nolightmap\r
        cull none\r
        q3map_globaltexture\r
+       tessSize 256\r
        {\r
                map textures/water/water2.tga\r
-               tcMod scroll 0.07 0.07\r
-               tcmod scale 1.2 0.7\r
-               blendfunc blend\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
        dp_water 0.1 0.8  3 3  1 1 1  1 1 1  0.125\r
 }\r
@@ -91,11 +85,17 @@ textures/water/slime1
        surfaceparm nolightmap\r
        cull none\r
        q3map_globaltexture\r
+       tessSize 256\r
        {\r
                map textures/water/slime1.tga\r
-               tcMod scroll 0.07 0.07\r
-               tcmod scale 1.2 0.7\r
-               blendfunc blend\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
        dp_water 0.1 0.8  3 3  0.5 1 0.5  0.5 1 0.5  0.75\r
 }\r
@@ -110,11 +110,17 @@ textures/water/slime2
        surfaceparm nolightmap\r
        cull none\r
        q3map_globaltexture\r
+       tessSize 256\r
        {\r
                map textures/water/slime1.tga\r
-               tcMod scroll 0.07 0.07\r
-               tcmod scale 1.2 0.7\r
-               blendfunc blend\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
        dp_water 0.1 0.8  3 3  1 1 0.5  1 1 0.5  0.75\r
 }\r

diff --git a/data/textures/morphed/gelslime_reflect.jpg b/data/textures/morphed/gelslime_reflect.jpg
new file mode 100644 (file)
index 0000000..811e46a
Binary files /dev/null and b/data/textures/morphed/gelslime_reflect.jpg differ

diff --git a/data/textures/stormkeep/lava_reflect.tga b/data/textures/stormkeep/lava_reflect.tga
new file mode 100644 (file)
index 0000000..12b27ee
Binary files /dev/null and b/data/textures/stormkeep/lava_reflect.tga differ

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

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

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

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