From: mschwan <mjschwan@gmx.de>
Date: Mon, 28 Sep 2015 08:54:52 +0000 (+0200)
Subject: lights done, natural done, natural shader are now improved for terrain(-brushwork... 
X-Git-Tag: xonotic-v0.8.2~160^2~3
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=6fc5ec1630c0a1c6a532b5d9eeb116aadc41d9ce

lights done, natural done, natural shader are now improved for terrain(-brushwork), also added dotproduct shader for easy and good-looking blended terrain
---

diff --git a/scripts/phillipk2x.shader b/scripts/phillipk2x.shader
index 96cf2e22..89de3fcf 100644
--- a/scripts/phillipk2x.shader
+++ b/scripts/phillipk2x.shader
@@ -1135,10 +1135,15 @@ textures/phillipk2x/lights-pk02_light03-surfacelight
 textures/phillipk2x/natural-pk02_rock01
 {
     qer_editorimage textures/phillipk2x/natural/pk02_rock01
+
     dpoffsetmapping - 9.49394606329197426280 match8 168.79024100000000000000
     dpglossintensitymod 3
     dpglossexponentmod 4
+
     q3map_bouncescale 1.25
+    q3map_lightmapsampleoffset 8
+    q3map_nonplanar
+    q3map_shadeangle 90
     {
         map textures/phillipk2x/natural/pk02_rock01
     }
@@ -1153,12 +1158,46 @@ textures/phillipk2x/natural-pk02_rock01
 textures/phillipk2x/natural-pk02_sand01
 {
     qer_editorimage textures/phillipk2x/natural/pk02_sand01
+
     dpoffsetmapping - 5.65502095014472805438 match8 165.28059600000000000000
     dpglossintensitymod 3
     dpglossexponentmod 4
+
+    q3map_bouncescale 1.25
+    q3map_lightmapsampleoffset 8
+    q3map_nonplanar
+    q3map_shadeangle 90
+    {
+        map textures/phillipk2x/natural/pk02_sand01
+    }
+    {
+        map $lightmap
+        rgbgen identity
+        tcgen lightmap
+        blendfunc filter
+    }
+}
+
+textures/phillipk2x/natural-pk02_rock01-sand01-dotproduct
+{
+    qer_editorimage textures/phillipk2x/natural/pk02_rock01-sand01-dotproduct
+
+    dpoffsetmapping - 7 match8 167
+    dpglossintensitymod 3
+    dpglossexponentmod 4
+
     q3map_bouncescale 1.25
+    q3map_lightmapsampleoffset 8
+    q3map_nonplanar
+    q3map_shadeangle 90
+    q3map_alphamod dotproduct2 ( 0 0 1 )
+    {
+        map textures/phillipk2x/natural/pk02_rock01
+    }
     {
         map textures/phillipk2x/natural/pk02_sand01
+        blendfunc blend
+        alphagen vertex
     }
     {
         map $lightmap