X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fliquids_water.shader;h=5fb16f1f28562a65650422a24db1b966256fa639;hp=2cfdf3b1b39935fe35fd89fcd6aca12721b6e00c;hb=c308a65ba272a982e959cb9b3ad88f5507bd663a;hpb=d68ae5eedfff59b745ca9d386d0085abde41d927

diff --git a/scripts/liquids_water.shader b/scripts/liquids_water.shader
index 2cfdf3b1..5fb16f1f 100644
--- a/scripts/liquids_water.shader
+++ b/scripts/liquids_water.shader
@@ -16,7 +16,7 @@ textures/liquids_water/water0
 		tcmod scale 1.2 0.7
 		blendfunc blend
 	}
-	dp_water 0.1 0.8  3 3  1 1 1  1 1 1  0.125
+	dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
 }
 
 textures/liquids_water/water0_cubemap
@@ -29,9 +29,9 @@ textures/liquids_water/water0_cubemap
 	cull none
 	q3map_globaltexture
 	tessSize 256
-	qer_editorimage textures/liquids_water/water0_reflect.tga
+	qer_editorimage textures/liquids_water/water0c_reflect.tga
 	{
-		map textures/liquids_water/water0.tga
+		map textures/liquids_water/water0c.tga
 		tcMod turb 0 0.4 0 0.08
 		blendfunc add
 	}
@@ -41,6 +41,33 @@ textures/liquids_water/water0_cubemap
 		blendfunc add
 		tcGen lightmap
 	}
+	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
@@ -59,7 +86,7 @@ textures/liquids_water/water1
 		tcmod scale 1.2 0.7
 		blendfunc blend
 	}
-	dp_water 0.1 0.8  3 3  1 1 1  1 1 1  0.125
+	dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
 }
 
 textures/liquids_water/water2
@@ -78,7 +105,7 @@ textures/liquids_water/water2
 		tcmod scale 1.2 0.7
 		blendfunc blend
 	}
-	dp_water 0.1 0.8  3 3  1 1 1  1 1 1  0.125
+	dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
 }
 
 textures/liquids_water/ruiner_water