Merge branch 'savagex/g-23-relight' of ssh://git.xonotic.org/xonotic-maps.pk3dir

[xonotic/xonotic-maps.pk3dir.git] / scripts / common.shader

diff --git a/scripts/common.shader b/scripts/common.shader
index 9ed43fb66b4bebe25ca7b9a3857e52960c533b85..f771dda01ab283d297a73cb2055496f696633daf 100644 (file)
--- a/scripts/common.shader
+++ b/scripts/common.shader
@@ -9,18 +9,6 @@ textures/common/antiportal
        surfaceparm antiportal
 }
 
-textures/common/areaportal
-{
-       qer_trans 0.50
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nonsolid
-       surfaceparm structural
-       surfaceparm trans
-       surfaceparm nomarks
-       surfaceparm areaportal
-}
-
 textures/common/caulk
 {
        surfaceparm nodraw
@@ -48,28 +36,6 @@ textures/common/clip
        surfaceparm playerclip
 }
 
-textures/common/clusterportal
-{
-       qer_trans 0.50
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nonsolid
-       surfaceparm trans
-       surfaceparm nomarks
-       surfaceparm clusterportal
-}
-
-textures/common/cushion
-{
-       qer_nocarve
-       qer_trans 0.50
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm trans
-       surfaceparm nomarks
-       surfaceparm nodamage
-}
-
 textures/common/donotenter
 {
        qer_trans 0.50
@@ -80,22 +46,6 @@ textures/common/donotenter
        surfaceparm donotenter
 }
 
-
-// never used
-//
-//textures/common/energypad
-//{
-//     qer_editorimage textures/sfx/bluegoal.tga
-//     surfaceparm nolightmap
-//     cull twosided
-//     {
-//             map textures//bluegoal.tga
-//             blendFunc GL_ONE GL_SRC_ALPHA
-//             tcGen environment
-//             tcMod turb 0 0.25 0 0.05
-//     }
-//}
-
 textures/common/full_clip // silly shader, use weapclip instead
 {
        qer_trans 0.40
@@ -115,6 +65,17 @@ textures/common/hint // should NOT use surfaceparm hint.. strange but true
        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
+}
+
 textures/common/invisible // solid, transparent polygons, casts shadows
 {
        surfaceparm nolightmap
@@ -126,45 +87,6 @@ textures/common/invisible // solid, transparent polygons, casts shadows
        }       
 }
 
-textures/common/mirror1
-{
-       qer_editorimage textures/common/mirror1.tga
-       surfaceparm nolightmap
-       portal
-       {
-               map textures/common/mirror1.tga
-               blendfunc GL_ONE GL_ONE_MINUS_SRC_ALPHA
-               depthWrite
-       }
-}
-
-textures/common/mirror2
-{
-       qer_editorimage textures/common/qer_mirror.tga
-       surfaceparm nolightmap
-       portal
-       {
-               map textures/common/mirror1.tga
-               blendfunc GL_ONE GL_ONE_MINUS_SRC_ALPHA
-               depthWrite
-       }
-       {
-               map textures/sfx/mirror.tga
-               blendFunc GL_ZERO GL_ONE_MINUS_SRC_COLOR
-       }
-}
-
-textures/common/missileclip
-{
-       qer_trans 0.40
-       surfaceparm nodamage
-       surfaceparm nomarks
-       surfaceparm nodraw
-       //surfaceparm nonsolid
-       surfaceparm playerclip
-       surfaceparm trans
-}
-
 textures/common/nodraw
 {
        surfaceparm nodraw
@@ -196,7 +118,6 @@ textures/common/nodrop
 
 textures/common/noimpact
 {
-       qer_editorimage textures/common/nolightmap.tga
        qer_nocarve
        qer_trans 0.5
        surfaceparm nodraw
@@ -232,29 +153,6 @@ textures/common/skip
        surfaceparm trans
 }
 
-textures/common/portal
-{
-       qer_editorimage textures/common/qer_portal.tga
-       surfaceparm nolightmap
-       portal
-       {
-               map textures/common/mirror1.tga
-               tcMod turb 0 0.25 0 0.05
-               blendfunc GL_ONE GL_ONE_MINUS_SRC_ALPHA
-               depthWrite
-       }
-}
-
-textures/common/slick
-{
-       qer_trans 0.50
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nomarks
-       surfaceparm trans
-       surfaceparm slick
-}
-
 textures/common/terrain
 {
        q3map_terrain
@@ -266,26 +164,12 @@ textures/common/terrain
 textures/common/terrain2
 {
        q3map_terrain
-       qer_editorimage textures/common/terrain.tga
        surfaceparm dust
        surfaceparm nodraw
        surfaceparm nomarks
        surfaceparm nolightmap
 }
 
-textures/common/timportal
-{
-       qer_editorimage textures/common/qer_portal.tga
-       portal
-       surfaceparm nolightmap
-       {
-               map textures/common/portal.tga
-               tcMod turb 0 0.25 0 0.05
-               blendFunc GL_ONE GL_SRC_ALPHA
-               depthWrite
-       }
-}
-
 textures/common/trigger
 {
        qer_trans 0.50
@@ -302,31 +186,6 @@ textures/common/weapclip
        surfaceparm nomarks
 }
 
-textures/common/metalclip
-{
-       qer_trans 0.40
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nonsolid
-       surfaceparm trans
-       surfaceparm nomarks
-       surfaceparm noimpact
-       surfaceparm playerclip
-       surfaceparm metalsteps
-}
-
-textures/common/botclip
-{
-       qer_trans 0.40
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nonsolid
-       surfaceparm trans
-       surfaceparm nomarks
-       surfaceparm noimpact
-       surfaceparm botclip
-}
-
 //
 // ydnar q3map lightgrid bounds
 //
@@ -355,7 +214,7 @@ textures/common/warpzone
        surfaceparm trans
        surfaceparm nomarks
        {
-               map textures/common/mirror1.tga // fully transparent
+               map textures/common/warpzone/trans.tga // fully transparent
                blendfunc blend
        }
        dp_camera
@@ -365,7 +224,7 @@ textures/common/warpzone
 textures/common/camera
 {
        {
-               map textures/common/mirror1.tga // fully transparent
+               map textures/common/warpzone/trans.tga // fully transparent
                blendfunc blend
        }
        dp_camera