Merge branch 'master' into mirio/fuse

diff --git a/maps/atelier.map b/maps/atelier.map
index 6f1e7699cf1841f6e9dcb234f0162d1470de36ee..908419fcd8add596af8ac9e4fa786e71b4e61c2f 100644 (file)
--- a/maps/atelier.map
+++ b/maps/atelier.map
@@ -10865,26 +10865,26 @@ trak5x/light-light2a-surfacelight
 ( -512 -1056 128 ) ( -384 -1056 128 ) ( -512 -1056 193 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -184 -1464 768 ) ( -184 -1544 768 ) ( -384 -1464 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -184 -1472 768 ) ( -384 -1472 768 ) ( -184 -1472 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 192 -1464 768 ) ( 192 -1464 192 ) ( 192 -1544 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -384 -1544 192 ) ( -184 -1544 192 ) ( -384 -1464 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -384 -1760 192 ) ( -384 -1760 768 ) ( -184 -1760 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -384 -1544 192 ) ( -384 -1464 192 ) ( -384 -1544 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 168 -1472 -64 ) ( 192 -1496 -64 ) ( 168 -1472 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -184 -1464 768 ) ( -184 -1544 768 ) ( -384 -1464 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -184 -1472 768 ) ( -384 -1472 768 ) ( -184 -1472 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 192 -1464 768 ) ( 192 -1464 192 ) ( 192 -1544 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -384 -1544 192 ) ( -184 -1544 192 ) ( -384 -1464 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -384 -1760 192 ) ( -384 -1760 768 ) ( -184 -1760 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -384 -1544 192 ) ( -384 -1464 192 ) ( -384 -1544 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 168 -1472 -64 ) ( 192 -1496 -64 ) ( 168 -1472 64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 448 -1728 768 ) ( 448 -1760 768 ) ( 192 -1728 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 448 -1728 768 ) ( 192 -1728 768 ) ( 448 -1728 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 448 -1728 768 ) ( 448 -1728 192 ) ( 448 -1760 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 192 -1760 192 ) ( 448 -1760 192 ) ( 192 -1728 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 192 -1760 192 ) ( 192 -1760 768 ) ( 448 -1760 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 192 -1760 192 ) ( 192 -1728 192 ) ( 192 -1760 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 448 -1728 768 ) ( 448 -1760 768 ) ( 192 -1728 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 448 -1728 768 ) ( 192 -1728 768 ) ( 448 -1728 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 448 -1728 768 ) ( 448 -1728 192 ) ( 448 -1760 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 192 -1760 192 ) ( 448 -1760 192 ) ( 192 -1728 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 192 -1760 192 ) ( 192 -1760 768 ) ( 448 -1760 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 192 -1760 192 ) ( 192 -1728 192 ) ( 192 -1760 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 }
 {
 patchDef2
 {
-common/clip
+common/weapclip
 ( 3 3 0 0 0 )
 (
 ( ( 192 -1664 448 0 -1 ) ( 192 -1664 320 0 -0.5 ) ( 192 -1664 192 0 0 ) )
@@ -10896,7 +10896,7 @@ common/clip
 {
 patchDef2
 {
-common/clip
+common/weapclip
 ( 3 3 0 0 0 )
 (
 ( ( 384 -1728 448 0 -1 ) ( 384 -1728 320 0 -0.5 ) ( 384 -1728 192 0 0 ) )
@@ -10906,13 +10906,13 @@ common/clip
 }
 }
 {
-( 1024 -1464 768 ) ( 824 -1544 768 ) ( 824 -1464 768 ) common/clip 0 0 0 -0.25 0.25 0 0 0
-( 824 -1472 192 ) ( 1024 -1472 768 ) ( 824 -1472 768 ) common/clip 0 0 0 -0.25 0.25 0 0 0
-( 448 -1544 768 ) ( 448 -1464 192 ) ( 448 -1464 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 1024 -1464 192 ) ( 824 -1544 192 ) ( 1024 -1544 192 ) common/clip 0 0 0 -0.25 0.25 0 0 0
-( 824 -1760 192 ) ( 1024 -1760 768 ) ( 1024 -1760 192 ) common/clip 0 0 0 -0.25 0.25 0 0 0
-( 1024 -1544 768 ) ( 1024 -1464 192 ) ( 1024 -1544 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 472 -1472 64 ) ( 448 -1496 -64 ) ( 472 -1472 -64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 1024 -1464 768 ) ( 824 -1544 768 ) ( 824 -1464 768 ) common/weapclip 0 0 0 -0.25 0.25 0 0 0
+( 824 -1472 192 ) ( 1024 -1472 768 ) ( 824 -1472 768 ) common/weapclip 0 0 0 -0.25 0.25 0 0 0
+( 448 -1544 768 ) ( 448 -1464 192 ) ( 448 -1464 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 1024 -1464 192 ) ( 824 -1544 192 ) ( 1024 -1544 192 ) common/weapclip 0 0 0 -0.25 0.25 0 0 0
+( 824 -1760 192 ) ( 1024 -1760 768 ) ( 1024 -1760 192 ) common/weapclip 0 0 0 -0.25 0.25 0 0 0
+( 1024 -1544 768 ) ( 1024 -1464 192 ) ( 1024 -1544 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 472 -1472 64 ) ( 448 -1496 -64 ) ( 472 -1472 -64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 }
 {
 patchDef2
@@ -10927,13 +10927,13 @@ common/weapclip
 }
 }
 {
-( 896 -1328 480 ) ( 896 -1408 480 ) ( 768 -1328 480 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 896 -1088 480 ) ( 768 -1088 480 ) ( 896 -1088 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 1024 -1296 480 ) ( 1024 -1296 192 ) ( 1024 -1376 480 ) common/clip 128 0 0 0.25 0.25 0 0 0
-( 768 -1408 192 ) ( 896 -1408 192 ) ( 768 -1328 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 768 -1408 192 ) ( 768 -1408 480 ) ( 896 -1408 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 768 -1408 192 ) ( 768 -1328 192 ) ( 768 -1408 480 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 768 -1112 -64 ) ( 792 -1088 -64 ) ( 768 -1112 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 896 -1328 480 ) ( 896 -1408 480 ) ( 768 -1328 480 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 896 -1088 480 ) ( 768 -1088 480 ) ( 896 -1088 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 1024 -1296 480 ) ( 1024 -1296 192 ) ( 1024 -1376 480 ) common/weapclip 128 0 0 0.25 0.25 0 0 0
+( 768 -1408 192 ) ( 896 -1408 192 ) ( 768 -1328 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 768 -1408 192 ) ( 768 -1408 480 ) ( 896 -1408 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 768 -1408 192 ) ( 768 -1328 192 ) ( 768 -1408 480 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 768 -1112 -64 ) ( 792 -1088 -64 ) ( 768 -1112 64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 424 256 448 ) ( 264 256 448 ) ( 424 256 416 ) common/clip 0 0 0 0.25 0.25 0 0 0

diff --git a/maps/atelier.map.options b/maps/atelier.map.options
index 61e03b754efe010cd812a0abba2bb2efacd68803..95cec6220e5e2cc7e28bb24d1c52f1138ac7c295 100644 (file)
--- a/maps/atelier.map.options
+++ b/maps/atelier.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 4a
\ No newline at end of file
+Version: 4b
\ No newline at end of file

diff --git a/maps/finalrage.map b/maps/finalrage.map
index 6287e1b6e5e1cf0b63415106062d546ab1cc829b..569849f6900505a4535e37b05f84725febc545fa 100644 (file)
--- a/maps/finalrage.map
+++ b/maps/finalrage.map
@@ -15187,12 +15187,12 @@ map_stormkeep/rock
 "classname" "trigger_teleport"
 "target" "t4"
 {
-( -519.0294189453 -368.2843017578 -96 ) ( -564.2842407227 -323.0294799805 -96 ) ( -598.2253417969 -356.9705810547 -96 ) common/trigger 170.3711547852 237.7310943604 -45 0.250000149 0.1875000298 0 7 0
-( -598.2253417969 -356.9705810547 24 ) ( -564.2842407227 -323.0294799805 24 ) ( -519.0294189453 -368.2843017578 24 ) common/trigger 170.3711547852 237.7310943604 -45 0.250000149 0.1875000298 0 7 0
-( -598.2253417969 -356.9705810547 24 ) ( -552.9705200195 -402.2254333496 24 ) ( -552.9705200195 -402.2254333496 -96 ) common/trigger 28.6720066071 51.2000045776 0 -0.1767769009 0.4687499702 0 7 0
-( -552.9705200195 -402.2254333496 24 ) ( -519.0294189453 -368.2843017578 24 ) ( -519.0294189453 -368.2843017578 -96 ) common/trigger 217.7735290527 51.1999969482 0 0.1325825602 0.4687499702 0 7 0
-( -519.0294189453 -368.2843017578 24 ) ( -564.2842407227 -323.0294799805 24 ) ( -564.2842407227 -323.0294799805 -96 ) common/trigger 220.6688079834 51.1999969482 0 -0.1767766476 0.4687499702 0 7 0
-( -564.2842407227 -323.0294799805 24 ) ( -598.2253417969 -356.9705810547 24 ) ( -598.2253417969 -356.9705810547 -96 ) common/trigger 132.4413757324 51.2000045776 0 0.1325825006 0.4687499702 0 7 0
+( -519.0294189453 -368.2843017578 -120 ) ( -564.2842407227 -323.0294799805 -120 ) ( -598.2253417969 -356.9705810547 -120 ) common/trigger 170.3711547852 237.7310943604 -45 0.250000149 0.1875000298 0 7 0
+( -598.2253417969 -356.9705810547 64 ) ( -564.2842407227 -323.0294799805 64 ) ( -519.0294189453 -368.2843017578 64 ) common/trigger 170.3711547852 237.7310943604 -45 0.250000149 0.1875000298 0 7 0
+( -588.1003417969 -355.8455810547 24 ) ( -542.8455200195 -401.1004333496 24 ) ( -542.8455200195 -401.1004333496 -96 ) common/trigger 35.0359573364 51.2000045776 0 -0.1767769009 0.4687499702 0 7 0
+( -522.3455200195 -416.8504333496 24 ) ( -488.4044189453 -382.9093017578 24 ) ( -488.4044189453 -382.9093017578 -96 ) common/trigger 72.0821456909 51.1999969482 0 0.1325825602 0.4687499702 0 7 0
+( -520.2794189453 -378.2843017578 24 ) ( -565.5342407227 -333.0294799805 24 ) ( -565.5342407227 -333.0294799805 -96 ) common/trigger 164.1002655029 51.1999969482 0 -0.1767766476 0.4687499702 0 7 0
+( -586.7842407227 -300.2794799805 24 ) ( -620.7253417969 -334.2205810547 24 ) ( -620.7253417969 -334.2205810547 -96 ) common/trigger 216.8500976563 51.2000045776 0 0.1325825006 0.4687499702 0 7 0
 }
 }
 {

diff --git a/maps/finalrage.map.options b/maps/finalrage.map.options
index 66552ff36142850b4ed24f4e4eecde7b21006ee9..89ea9fc14157bf561332a32363db84f7cfab0069 100644 (file)
--- a/maps/finalrage.map.options
+++ b/maps/finalrage.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 1e
\ No newline at end of file
+Version: 1f
\ No newline at end of file

diff --git a/scripts/crystals.shader b/scripts/crystals.shader
deleted file mode 100644 (file)
index 1401580..0000000
--- a/scripts/crystals.shader
+++ /dev/null
@@ -1,13 +0,0 @@
-models/crystals/crystal1
-{
-       dpglossintensitymod 5
-       dpglossexponentmod 2
-       dpreflectcube cubemaps/default/sky
-       {
-               map "models/crystals/crystal1"
-       }
-       {
-               map $lightmap
-       }
-}
-

diff --git a/scripts/map_catharsis.shader b/scripts/map_catharsis.shader
index a1d5b186734027a54739b5f6fbb395029d8865e0..f05f609bcab225287a8353f550fc4cf979cf2784 100644 (file)
--- a/scripts/map_catharsis.shader
+++ b/scripts/map_catharsis.shader
@@ -162,46 +162,6 @@ textures/map_catharsis/50_armor
        }
        
 }
-textures/map_catharsis/dirt1
-{
-       qer_editorimage textures/map_catharsis/dirt1.tga
-
-       surfaceparm trans
-       surfaceparm nonsolid
-       surfaceparm nodlight
-       surfaceparm nolightmap
-
-       polygonOffset
-       sort 6
-       cull none
-
-
-       {
-               map textures/map_catharsis/dirt1.tga
-               blendFunc filter
-               rgbgen identity
-       }
-}
-textures/map_catharsis/dirt2
-{
-       qer_editorimage textures/map_catharsis/dirt2
-
-       surfaceparm trans
-       surfaceparm nonsolid
-       surfaceparm nodlight
-       surfaceparm nolightmap
-
-       polygonOffset
-       sort 6
-       cull none
-
-
-       {
-               map textures/map_catharsis/dirt2
-               blendFunc filter
-               rgbgen identity
-       }
-}
 textures/map_catharsis/red
 {
        qer_editorimage textures/map_catharsis/red.tga
@@ -243,27 +203,3 @@ textures/map_catharsis/red-surfacelight
                blendfunc filter
        }
 }
-justinterrain
-          {
-                  q3map_nonplanar
-                  q3map_shadeangle 65
-                  q3map_lightmapSampleOffset 3
-                  q3map_lightmapSampleSize 64
-                  q3map_globalTexture
-     qer_editorimage textures/map_catharsis/rock.tga
-                  dpnoshadow
-  {
-    map textures/map_catharsis/rock.tga
-  }
-      {
-         map textures/map_catharsis/sand.tga
-                          blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
-                          alphagen vertex
-      }
-           
-                  {
-                          map $lightmap
-                          blendfunc GL_DST_COLOR GL_ZERO
-                          rgbGen identity
-                  }
-}
\ No newline at end of file

diff --git a/scripts/model_crystals.shader b/scripts/model_crystals.shader
new file mode 100644 (file)
index 0000000..1401580
--- /dev/null
+++ b/scripts/model_crystals.shader
@@ -0,0 +1,13 @@
+models/crystals/crystal1
+{
+       dpglossintensitymod 5
+       dpglossexponentmod 2
+       dpreflectcube cubemaps/default/sky
+       {
+               map "models/crystals/crystal1"
+       }
+       {
+               map $lightmap
+       }
+}
+

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index c583f0ee4f7a041026011f0ab56d800e009f01c4..46dcb86575400ff0c5e645905fa76ee6149ce505 100755 (executable)
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -233,8 +233,8 @@ use_texture()
                                        ;;
                        esac
                        ;;
-               ## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava, alphamod
-               textures/decals/*|textures/liquids_*/*|textures/effects_*/*|textures/screens/*|textures/logos/*|textures/alphamod/*)
+               ## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava, alphamod, solarpanel
+               textures/decals/*|textures/liquids_*/*|textures/effects_*/*|textures/screens/*|textures/logos/*|textures/alphamod/*|textures/solarpanel/*)
                        pre=`echo "$1" | cut -d / -f 1-2`
                        case "$2" in
                                "$pre"/*)
@@ -342,17 +342,22 @@ parse_shaderstage_post()
                        mainalphagen=$ss_alphagen
                elif [ x"$ss_alphagen" = x"vertex" ] && ! $textureblending; then
                        case "$mainblendfunc:$mainalphafunc:$ss_blendfunc:$ss_alphafunc" in
+                               # none, blend
+                               none:none:blend:none) textureblending=true ;;
                                none:none:"gl_src_alpha gl_one_minus_src_alpha":none) textureblending=true ;;
-                               none:none:filter:none) textureblending=true ;;
+                               "gl_one gl_zero":none:blend:none) textureblending=true ;;
+                               "gl_one zl_zero":none:"gl_src_alpha gl_one_minus_src_alpha":none) textureblending=true ;;
+                               # none, alphafunc
                                none:none:none:g*) textureblending=true ;;
-                               "gl_one gl_zero":none:filter:none) textureblending=true ;;
+                               none:none:"gl_one gl_zero":g*) textureblending=true ;;
                                "gl_one gl_zero":none:none:g*) textureblending=true ;;
+                               "gl_one gl_zero":none:"gl_one gl_zero":g*) textureblending=true ;;
                                *)
-                                       err "texture blending requires first stage to have no blendfunc/alphatest, and requires second stage to be blendfunc filter"
+                                       err "$parsing_shader uses texture blending, but that requires first stage to have no blendfunc/alphatest, and requires second stage to be blendfunc filter"
                                        ;;
                        esac
                else
-                       err "multistage shader without alphagen vertex, or using more than 2 stages, is not supported by DarkPlaces"
+                       err "$parsing_shader, a multistage shader without alphagen vertex, or using more than 2 stages, is not supported by DarkPlaces"
                fi
        fi
 }

diff --git a/scripts/shader-parser.subr b/scripts/shader-parser.subr
index ef82832f427839513e1d036c5a5e7caedeec8f55..5f18cec84a90434f80a55540bfd15bf52c99b8b9 100644 (file)
--- a/scripts/shader-parser.subr
+++ b/scripts/shader-parser.subr
@@ -4,7 +4,7 @@
 
 shader_normalize()
 {
-       echo "$1" | sed 's/\.\(tga\|jpg\|png\)$//'
+       echo "$1" | sed 's/^"//; s/"$//; s/\.\(tga\|jpg\|png\)$//'
 }
 
 parse_shaderstage_pre()

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 1ab8c0ece645d29ec903330dd0fcb29556405552..4d4aaf2be32d85d4ff52ed2a7e0850618d2d410b 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,6 +1,5 @@
 alphamod
 common
-crystals
 decals
 effects_beam
 effects_forcefield
@@ -38,6 +37,7 @@ map_xoylent
 metaltechx
 model_bigfan01
 model_crate02
+model_crystals
 model_desertfactory
 model_teleporters
 model_trak

diff --git a/scripts/solarpanel.shader b/scripts/solarpanel.shader
new file mode 100644 (file)
index 0000000..8dbd271
--- /dev/null
+++ b/scripts/solarpanel.shader
@@ -0,0 +1,27 @@
+textures/solarpanel/panels
+{
+       qer_editorimage textures/solarpanel/panels.tga
+       {
+               map textures/solarpanel/panels
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+textures/solarpanel/solarmetal
+{
+       qer_editorimage textures/solarpanel/solarmetal.tga
+       {
+               map textures/solarpanel/solarmetal
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}

diff --git a/textures/solarpanel/panels_bump.jpg b/textures/solarpanel/panels_bump.jpg
deleted file mode 100644 (file)
index e4b9d86..0000000
Binary files a/textures/solarpanel/panels_bump.jpg and /dev/null differ

diff --git a/textures/solarpanel/panels_norm.jpg b/textures/solarpanel/panels_norm.jpg
deleted file mode 100644 (file)
index 97903ab..0000000
Binary files a/textures/solarpanel/panels_norm.jpg and /dev/null differ

diff --git a/textures/solarpanel/panels_norm.tga b/textures/solarpanel/panels_norm.tga
new file mode 100644 (file)
index 0000000..fff343c
Binary files /dev/null and b/textures/solarpanel/panels_norm.tga differ