X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fterrain01x.shader;h=8d3daeeaeb26b92cdee6543fc82ed9bc3360ee55;hp=36aa7451598e03662d60ed88a932e4757fc60ee3;hb=59cb7ffb062393a33e58e4f50bf304a51f8f9bcd;hpb=9501ca170fab9359b6e78ecd6f302c034eb0f43b

diff --git a/scripts/terrain01x.shader b/scripts/terrain01x.shader
index 36aa7451..8d3daeea 100644
--- a/scripts/terrain01x.shader
+++ b/scripts/terrain01x.shader
@@ -3,7 +3,7 @@ textures/terrain01x/blends-mars-rock01-ground01
 	qer_editorimage textures/terrain01x/blends/mars-rock01-ground01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 229
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -29,12 +29,43 @@ textures/terrain01x/blends-mars-rock01-ground01
 	}
 }
 
+textures/terrain01x/blends-mars-rock01-sand04
+{
+	qer_editorimage textures/terrain01x/blends/mars-rock01-sand04.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2 match8 229
+
+	q3map_lightmapSampleOffset 8
+	q3map_nonplanar
+	q3map_shadeangle 95
+
+	surfaceparm dust
+
+	q3map_alphaMod dotproduct2 ( 0 0 0.95 )
+
+	{
+		map textures/terrain01x/rock/mars01.tga	// Primary
+	}
+
+	{
+		map textures/terrain01x/ground/sand04.tga	// Secondary
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA		
+		alphaGen vertex
+	}
+
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ZERO
+	}
+}
+
 textures/terrain01x/blends-mars-rock02-ground01
 {
 	qer_editorimage textures/terrain01x/blends/mars-rock02-ground01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 226
 
 
 	q3map_lightmapSampleOffset 8
@@ -66,7 +97,7 @@ textures/terrain01x/blends-mars-rock01-ground01-projected
 	qer_editorimage textures/terrain01x/blends/mars-rock01-ground01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 229
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -93,12 +124,44 @@ textures/terrain01x/blends-mars-rock01-ground01-projected
 	}
 }
 
+textures/terrain01x/blends-mars-rock01-sand04-projected
+{
+	qer_editorimage textures/terrain01x/blends/mars-rock01-sand04.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 2 match8 229
+
+	q3map_lightmapSampleOffset 8
+	q3map_nonplanar
+	q3map_shadeangle 95
+
+	surfaceparm dust
+
+	q3map_alphaMod dotproduct2 ( 0 0 0.95 )
+	q3map_tcGen ivector ( 1024 0 0 ) ( 0 1024 0 )
+
+	{
+		map textures/terrain01x/rock/mars01.tga	// Primary
+	}
+
+	{
+		map textures/terrain01x/ground/sand04.tga	// Secondary
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA		
+		alphaGen vertex
+	}
+
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ZERO
+	}
+}
+
 textures/terrain01x/blends-mars-rock02-ground01-projected
 {
 	qer_editorimage textures/terrain01x/blends/mars-rock02-ground01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 226
 
 
 	q3map_lightmapSampleOffset 8
@@ -129,10 +192,11 @@ textures/terrain01x/blends-mars-rock02-ground01-projected
 
 textures/terrain01x/ground-barren01
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/barren01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 112
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -152,10 +216,11 @@ textures/terrain01x/ground-barren01
 }
 textures/terrain01x/ground-barren02
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/barren02.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 207
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -175,10 +240,11 @@ textures/terrain01x/ground-barren02
 }
 textures/terrain01x/ground-drylake01
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/drylake01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 184
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -198,10 +264,11 @@ textures/terrain01x/ground-drylake01
 }
 textures/terrain01x/ground-drylake02
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/drylake02.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 184
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -221,10 +288,11 @@ textures/terrain01x/ground-drylake02
 }
 textures/terrain01x/ground-goopit
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/goopit.tga
 	
 	q3map_bounceScale  0.75
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 72
 	dpglossintensitymod  2
 	dpglossexponentmod  2
 
@@ -246,10 +314,11 @@ textures/terrain01x/ground-goopit
 }
 textures/terrain01x/ground-gravel01
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/gravel01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 202
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -269,10 +338,11 @@ textures/terrain01x/ground-gravel01
 }
 textures/terrain01x/ground-ice01
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/ice01.tga
 	
 	q3map_bounceScale  0.75
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 254
 	dpglossintensitymod  2
 	dpglossexponentmod  2
 
@@ -294,10 +364,11 @@ textures/terrain01x/ground-ice01
 }
 textures/terrain01x/ground-mars01
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/mars01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 186
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -317,10 +388,11 @@ textures/terrain01x/ground-mars01
 }
 textures/terrain01x/ground-mud01
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/mud01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 210
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -340,10 +412,11 @@ textures/terrain01x/ground-mud01
 }
 textures/terrain01x/ground-mud02
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/mud02.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 177
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -363,10 +436,11 @@ textures/terrain01x/ground-mud02
 }
 textures/terrain01x/ground-sand01
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/sand01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 160
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -386,10 +460,11 @@ textures/terrain01x/ground-sand01
 }
 textures/terrain01x/ground-sand02
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/sand02.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 197
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -409,10 +484,11 @@ textures/terrain01x/ground-sand02
 }
 textures/terrain01x/ground-sand03
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/sand03.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 188
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -432,10 +508,11 @@ textures/terrain01x/ground-sand03
 }
 textures/terrain01x/ground-sand04
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/ground/sand04.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 228
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -455,10 +532,11 @@ textures/terrain01x/ground-sand04
 }
 textures/terrain01x/rock-mars01
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/rock/mars01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 229
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -478,10 +556,11 @@ textures/terrain01x/rock-mars01
 }
 textures/terrain01x/rock-mars02
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/rock/mars02.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 226
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -501,10 +580,11 @@ textures/terrain01x/rock-mars02
 }
 textures/terrain01x/rock-rock01
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/rock/rock01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 174
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -524,10 +604,11 @@ textures/terrain01x/rock-rock01
 }
 textures/terrain01x/rock-rock02
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/rock/rock02.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 145
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -547,10 +628,11 @@ textures/terrain01x/rock-rock02
 }
 textures/terrain01x/rock-rock03
 {
+	xon_nowarn "We're intentionally using an alpha'd texture without using the alpha channel"
 	qer_editorimage textures/terrain01x/rock/rock03.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 166
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar