X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fcommon.shader;h=656b58960ff2f1b650b60a8d34a740032b71a76e;hp=02202d5ada1571ba40007e5d83efbed629c545e2;hb=07c69653af0a5066a2e97108a6ed2dff3791d632;hpb=d8525d1873bf3a5366e0faeeaff028ea1b4229da

diff --git a/scripts/common.shader b/scripts/common.shader
index 02202d5a..656b5896 100644
--- a/scripts/common.shader
+++ b/scripts/common.shader
@@ -1,189 +1,232 @@
 textures/common/antiportal
 {
-	qer_trans 0.30
-	qer_nocarve
-	surfaceparm nodraw
-	surfaceparm nonsolid
-	surfaceparm structural
-	surfaceparm trans
-	surfaceparm antiportal
+    qer_trans 0.30
+    qer_nocarve
+    surfaceparm nodraw
+    surfaceparm nonsolid
+    surfaceparm structural
+    surfaceparm trans
+    surfaceparm antiportal
+}
+
+textures/common/botclip
+{
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nonsolid
+    surfaceparm trans
+    surfaceparm nomarks
+    surfaceparm noimpact
+    surfaceparm botclip
 }
 
 textures/common/caulk
 {
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nomarks
+}
+
+textures/common/cushion
+{
+	qer_nocarve
+	qer_trans 0.50
 	surfaceparm nodraw
-	surfaceparm nolightmap
 	surfaceparm nomarks
+	surfaceparm nodamage
+	surfaceparm trans
 }
 
 textures/common/forcecaulk
 {
-	surfaceparm nodraw
-	surfaceparm nolightmap
-	surfaceparm nomarks
-	surfaceparm structural
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nomarks
+    surfaceparm structural
 }
 
 textures/common/clip
 {
-	qer_trans 0.40
-	surfaceparm nodraw
-	surfaceparm nolightmap
-	surfaceparm nonsolid
-	surfaceparm trans
-	surfaceparm nomarks
-	surfaceparm noimpact
-	surfaceparm playerclip
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nonsolid
+    surfaceparm trans
+    surfaceparm nomarks
+    surfaceparm noimpact
+    surfaceparm playerclip
 }
 
 textures/common/donotenter
 {
-	qer_trans 0.50
-	surfaceparm nodraw
-	surfaceparm nonsolid
-	surfaceparm trans
-	surfaceparm nomarks
-	surfaceparm donotenter
+    qer_trans 0.50
+    surfaceparm nodraw
+    surfaceparm nonsolid
+    surfaceparm trans
+    surfaceparm nomarks
+    surfaceparm donotenter
 }
 
 textures/common/full_clip // silly shader, use weapclip instead
 {
-	qer_trans 0.40
-	surfaceparm nodraw
-	surfaceparm playerclip
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm playerclip
 }
 
 textures/common/hint // should NOT use surfaceparm hint.. strange but true
 {
-	qer_nocarve
-	qer_trans 0.30
-	surfaceparm nodraw
-	surfaceparm nonsolid
-	surfaceparm structural
-	surfaceparm trans
-	surfaceparm noimpact
-	surfaceparm hint	// ydnar: yes it should.
+    qer_nocarve
+    qer_trans 0.30
+    surfaceparm nodraw
+    surfaceparm nonsolid
+    surfaceparm structural
+    surfaceparm trans
+    surfaceparm noimpact
+    surfaceparm hint    // ydnar: yes it should.
 }
 
 textures/common/hintskip
 {
-	qer_nocarve
-	qer_trans 0.30
-	surfaceparm nodraw
-	surfaceparm nonsolid
-	surfaceparm skip
-	surfaceparm structural
-	surfaceparm trans
+    qer_nocarve
+    qer_trans 0.30
+    surfaceparm nodraw
+    surfaceparm nonsolid
+    surfaceparm skip
+    surfaceparm structural
+    surfaceparm trans
 }
 
 textures/common/invisible // solid, transparent polygons, casts shadows
 {
-	surfaceparm nolightmap
-        {
-		map textures/common/invisible.tga
-		alphaFunc GE128
-		depthWrite
-		rgbGen vertex
-	}	
+    qer_editorimage textures/common/invisible.tga
+    surfaceparm nolightmap
+    {
+        map textures/common/invisible/invisible.tga
+        alphaFunc GE128
+        depthWrite
+        rgbGen vertex
+    }
+}
+
+textures/common/monsterclip
+{
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nonsolid
+    surfaceparm trans
+    surfaceparm nomarks
+    surfaceparm noimpact
+    surfaceparm monsterclip
 }
 
 textures/common/nodraw
 {
-	surfaceparm nodraw
-	surfaceparm nolightmap
-	surfaceparm nonsolid
-	surfaceparm trans
-	surfaceparm nomarks
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nonsolid
+    surfaceparm trans
+    surfaceparm nomarks
 }
 
 textures/common/nodrawnonsolid
 {
-	surfaceparm nonsolid
-	surfaceparm nolightmap
-	surfaceparm nodraw
+    surfaceparm nonsolid
+    surfaceparm nolightmap
+    surfaceparm nodraw
 }
 
 textures/common/nodrop
 {
-	qer_nocarve
-	qer_trans 0.5
-	surfaceparm nodraw
-	surfaceparm nolightmap
-	surfaceparm nonsolid
-	surfaceparm trans
-	surfaceparm nomarks
-	surfaceparm nodrop
+    qer_nocarve
+    qer_trans 0.5
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nonsolid
+    surfaceparm trans
+    surfaceparm nomarks
+    surfaceparm nodrop
 }
 
 
 textures/common/noimpact
 {
-	qer_nocarve
-	qer_trans 0.5
-	surfaceparm nodraw
-	surfaceparm nolightmap
-	surfaceparm trans
-	surfaceparm nomarks
-	surfaceparm noimpact
+    qer_nocarve
+    qer_trans 0.5
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm trans
+    surfaceparm nomarks
+    surfaceparm noimpact
 }
 
 textures/common/nolightmap
 {
-	surfaceparm nolightmap
+    surfaceparm nolightmap
 }
 
 textures/common/origin
 {
-	qer_nocarve
-	surfaceparm nodraw
-	surfaceparm nolightmap
-	surfaceparm nonsolid
-	surfaceparm trans
-	surfaceparm origin
+    qer_nocarve
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nonsolid
+    surfaceparm trans
+    surfaceparm origin
 }
 
 textures/common/skip
 {
-	qer_nocarve
-	qer_trans 0.30
-	surfaceparm nodraw
-	surfaceparm nonsolid
-	surfaceparm skip
-	surfaceparm structural
-	surfaceparm trans
+    qer_nocarve
+    qer_trans 0.30
+    surfaceparm nodraw
+    surfaceparm nonsolid
+    surfaceparm skip
+    surfaceparm structural
+    surfaceparm trans
+}
+
+textures/common/slick
+{
+    surfaceparm nodraw
+    surfaceparm nomarks
+    surfaceparm trans
+    surfaceparm nolightmap
+    surfaceparm slick
 }
 
 textures/common/terrain
 {
-	q3map_terrain
-	surfaceparm nodraw
-	surfaceparm nolightmap
-	surfaceparm nomarks
+    q3map_terrain
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nomarks
 }
 
 textures/common/terrain2
 {
-	q3map_terrain
-	surfaceparm dust
-	surfaceparm nodraw
-	surfaceparm nomarks
-	surfaceparm nolightmap
+    q3map_terrain
+    surfaceparm dust
+    surfaceparm nodraw
+    surfaceparm nomarks
+    surfaceparm nolightmap
 }
 
 textures/common/trigger
 {
-	qer_trans 0.50
-	qer_nocarve
-	surfaceparm nodraw
+    qer_trans 0.50
+    qer_nocarve
+    surfaceparm nodraw
 }
 
 textures/common/weapclip
 {
-	qer_trans 0.40
-	surfaceparm nodraw
-	surfaceparm nolightmap
-	surfaceparm trans
-	surfaceparm nomarks
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm trans
 }
 
 //
@@ -197,67 +240,100 @@ textures/common/weapclip
 
 textures/common/lightgrid
 {
-	qer_trans 0.5
-	surfaceparm nodraw
-	surfaceparm nolightmap
-	surfaceparm nonsolid
-	surfaceparm detail
-	surfaceparm nomarks
-	surfaceparm trans
-	surfaceparm lightgrid
+    qer_trans 0.5
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nonsolid
+    surfaceparm detail
+    surfaceparm nomarks
+    surfaceparm trans
+    surfaceparm lightgrid
 }
 
 textures/common/warpzone
 {
-	surfaceparm nolightmap
-	// surfaceparm nonsolid // no, it must be solid like trigger
-	surfaceparm trans
-	surfaceparm nomarks
-	{
-		map textures/common/warpzone/trans.tga // fully transparent
-		blendfunc blend
-	}
-	dp_camera
-	dp_refract 1 1 1 1 // makes the camera render like a refraction
+    surfaceparm nolightmap
+    // surfaceparm nonsolid // no, it must be solid like trigger
+    surfaceparm trans
+    surfaceparm nomarks
+    {
+        map textures/common/warpzone/trans.tga // fully transparent
+        blendfunc blend
+    }
+    dp_camera
+    dp_refract 1 1 1 1 // makes the camera render like a refraction
 }
 
 textures/common/camera
 {
-	surfaceparm nolightmap
-	surfaceparm trans
-	{
-		map textures/common/warpzone/trans.tga // fully transparent
-		blendfunc blend
-	}
-	dp_camera
+    surfaceparm nolightmap
+    surfaceparm trans
+    {
+        map textures/common/warpzone/trans.tga // fully transparent
+        blendfunc blend
+    }
+    dp_camera
 }
 
 textures/common/waternodraw
 {
-	qer_trans 0.40
-	surfaceparm nodraw
-	surfaceparm nolightmap
-	surfaceparm water
-	surfaceparm trans
-	surfaceparm nomarks
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm water
+    surfaceparm trans
+    surfaceparm nomarks
 }
 
 textures/common/slimenodraw
 {
-	qer_trans 0.40
-	surfaceparm nodraw
-	surfaceparm nolightmap
-	surfaceparm slime
-	surfaceparm trans
-	surfaceparm nomarks
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm slime
+    surfaceparm trans
+    surfaceparm nomarks
 }
 
 textures/common/lavanodraw
 {
-	qer_trans 0.40
-	surfaceparm nodraw
-	surfaceparm nolightmap
-	surfaceparm lava
-	surfaceparm trans
-	surfaceparm nomarks
-}
\ No newline at end of file
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm lava
+    surfaceparm trans
+    surfaceparm nomarks
+}
+
+textures/common/base1
+{
+    {
+        map $lightmap
+    }
+    {
+        map textures/common/base1
+        blendfunc filter
+    }
+}
+
+textures/common/base2
+{
+    {
+        map $lightmap
+    }
+    {
+        map textures/common/base2
+        blendfunc filter
+    }
+}
+
+textures/common/base3
+{
+    {
+        map $lightmap
+    }
+    {
+        map textures/common/base3
+        blendfunc filter
+    }
+}