X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=scripts%2Fliquids_water.shader;h=9ec1cf604b87d48f136b8d60c192d7c09c3a5490;hb=5cdfbd05755b873dd83d44b76f505981ad918740;hp=8c10a56f5f34a2a4e9bcc6d8010544c715ef5a15;hpb=937e74a83a61c471a43a72c0a3efe48e943091fd;p=xonotic%2Fxonotic-maps.pk3dir.git

diff --git a/scripts/liquids_water.shader b/scripts/liquids_water.shader
index 8c10a56f..9ec1cf60 100644
--- a/scripts/liquids_water.shader
+++ b/scripts/liquids_water.shader
@@ -12,11 +12,62 @@ 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.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
+{
+	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 add
+	}
+	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/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
@@ -31,11 +82,11 @@ 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.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
@@ -50,11 +101,11 @@ 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.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