Delete the "cubemaps" folder, which was meant to be temporary but has been around...

[xonotic/xonotic-maps.pk3dir.git] / scripts / liquids_water.shader

diff --git a/scripts/liquids_water.shader b/scripts/liquids_water.shader
index baf700f0dd072a31f48b43319c3ae58cf54b0ec6..9ec1cf604b87d48f136b8d60c192d7c09c3a5490 100644 (file)
--- a/scripts/liquids_water.shader
+++ b/scripts/liquids_water.shader
@@ -12,8 +12,8 @@ textures/liquids_water/water0
        q3map_globaltexture
        {
                map textures/liquids_water/water0.tga
-               tcMod scroll 0.07 0.07
                tcmod scale 1.2 0.7
+               tcMod scroll 0.084 0.049
                blendfunc blend
        }
        dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
@@ -44,6 +44,32 @@ textures/liquids_water/water0_cubemap
        dp_water 0.1 0.9  3 3  1 1 1  1 1 1  0.4
 }
 
+textures/liquids_water/water0_cubemap_alphamod
+{
+       qer_trans 20
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm water
+       surfaceparm nolightmap
+       cull none
+       q3map_globaltexture
+       //tessSize 256
+       qer_editorimage textures/liquids_water/water0c_reflect.tga
+       {
+               map textures/liquids_water/water0c.tga
+               tcMod turb 0 0.4 0 0.08
+               blendfunc GL_SRC_ALPHA GL_ONE
+               alphaGen vertex
+       }
+       dpreflectcube cubemaps/default/sky
+       {
+               map $lightmap
+               blendfunc add
+               tcGen lightmap
+       }
+       dp_water 0.1 0.9  3 3  1 1 1  1 1 1  0.4
+}
+
 textures/liquids_water/water1
 {
        qer_editorimage textures/liquids_water/water1.tga
@@ -56,8 +82,8 @@ textures/liquids_water/water1
        q3map_globaltexture
        {
                map textures/liquids_water/water1.tga
-               tcMod scroll 0.07 0.07
                tcmod scale 1.2 0.7
+               tcMod scroll 0.084 0.049
                blendfunc blend
        }
        dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
@@ -75,8 +101,8 @@ textures/liquids_water/water2
        q3map_globaltexture
        {
                map textures/liquids_water/water2.tga
-               tcMod scroll 0.07 0.07
                tcmod scale 1.2 0.7
+               tcMod scroll 0.084 0.049
                blendfunc blend
        }
        dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125