geoplanetary: fix warpzone z-fighting

diff --git a/maps/geoplanetary.map b/maps/geoplanetary.map
index f3fbf8b0c04f72a77947f8799aa0a4fdf8e11c73..776f47df732945ad0a9805be2751698087b43471 100644 (file)
--- a/maps/geoplanetary.map
+++ b/maps/geoplanetary.map
@@ -39612,38 +39612,6 @@ map_geoplanetary/wiz1_4_mesh
 }
 }
 {
-( -1167 -968 320 ) ( -1167 -976 320 ) ( -1175 -968 320 ) common/nodrawnonsolid 28 0 0 0.25 0.25 134217728 0 0
-( -1167 -960 320 ) ( -1175 -960 320 ) ( -1167 -960 64 ) common/nodrawnonsolid 28 0 0 0.25 0.25 134217728 0 0
-( -1167.75 -968 320 ) ( -1167.75 -968 64 ) ( -1167.75 -976 320 ) effects_warpzone/blueedge 384 128 0 0.5 0.5 134217728 0 0
-( -1175 -976 64 ) ( -1167 -976 64 ) ( -1175 -968 64 ) common/nodrawnonsolid 28 0 0 0.25 0.25 134217728 0 0
-( -1159 -1216 64 ) ( -1159 -1216 320 ) ( -1151 -1216 64 ) common/nodrawnonsolid 220 0 0 0.25 0.25 134217728 0 0
-( -1168 -976 64 ) ( -1168 -968 64 ) ( -1168 -976 320 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
-}
-{
-( -1168 -787 640 ) ( -1160 -787 640 ) ( -1168 -795 640 ) common/nodrawnonsolid 44 96 90 0.25 0.25 134217728 0 0
-( -1176 -787 640 ) ( -1176 -795 640 ) ( -1176 -787 384 ) common/nodrawnonsolid 44 0 0 0.25 0.25 134217728 0 0
-( -1168 -787.75 640 ) ( -1168 -787.75 384 ) ( -1160 -787.75 640 ) effects_warpzone/blueedge 208 256 0 -0.5 0.5 134217728 0 0
-( -1160 -795 384 ) ( -1160 -787 384 ) ( -1168 -795 384 ) common/nodrawnonsolid 44 96 90 0.25 0.25 134217728 0 0
-( -920 -779 384 ) ( -920 -779 640 ) ( -920 -771 384 ) common/nodrawnonsolid 236 0 0 0.25 0.25 134217728 0 0
-( -1160 -788 384 ) ( -1168 -788 384 ) ( -1160 -788 640 ) common/nodrawnonsolid 160 0 0 -0.25 0.25 134217728 0 0
-}
-{
-( 1679 4552 320 ) ( 1679 4560 320 ) ( 1687 4552 320 ) common/nodrawnonsolid 28 256 180 0.25 0.25 134217728 0 0
-( 1679 4544 320 ) ( 1687 4544 320 ) ( 1679 4544 64 ) common/nodrawnonsolid 28 0 0 -0.25 0.25 134217728 0 0
-( 1679.75 4552 320 ) ( 1679.75 4552 64 ) ( 1679.75 4560 320 ) effects_warpzone/rededge 384 128 0 -0.5 0.5 134217728 0 0
-( 1687 4560 64 ) ( 1679 4560 64 ) ( 1687 4552 64 ) common/nodrawnonsolid 28 256 180 0.25 0.25 134217728 0 0
-( 1671 4800 64 ) ( 1671 4800 320 ) ( 1663 4800 64 ) common/nodrawnonsolid 220 0 0 -0.25 0.25 134217728 0 0
-( 1680 4560 64 ) ( 1680 4552 64 ) ( 1680 4560 320 ) common/nodrawnonsolid 0 0 0 -0.25 0.25 134217728 0 0
-}
-{
-( 1680 4371 640 ) ( 1672 4371 640 ) ( 1680 4379 640 ) common/nodrawnonsolid 44 96 -90 0.25 0.25 134217728 0 0
-( 1688 4371 640 ) ( 1688 4379 640 ) ( 1688 4371 384 ) common/nodrawnonsolid 44 0 0 -0.25 0.25 134217728 0 0
-( 1680 4371.75 640 ) ( 1680 4371.75 384 ) ( 1672 4371.75 640 ) effects_warpzone/rededge 208 256 0 0.5 0.5 134217728 0 0
-( 1672 4379 384 ) ( 1672 4371 384 ) ( 1680 4379 384 ) common/nodrawnonsolid 44 96 -90 0.25 0.25 134217728 0 0
-( 1432 4363 384 ) ( 1432 4363 640 ) ( 1432 4355 384 ) common/nodrawnonsolid 236 0 0 -0.25 0.25 134217728 0 0
-( 1672 4372 384 ) ( 1680 4372 384 ) ( 1672 4372 640 ) common/nodrawnonsolid 160 0 0 0.25 0.25 134217728 0 0
-}
-{
 ( 488 2048 344 ) ( 512 2048 376 ) ( 488 2048 376 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 512 2072 344 ) ( 512 1920 376 ) ( 512 2072 376 ) common/caulk 208 0 0 0.5 0.5 0 0 0
 ( 512 1920 344 ) ( 488 1952 376 ) ( 512 1920 376 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
@@ -40505,6 +40473,54 @@ map_geoplanetary/wiz1_4_mesh
 ( 584 2128 640 ) ( 584 2128 768 ) ( 400 2128 640 ) common/clip 0 0 0 0.25 0.25 134217728 0 0
 ( 384 2128 640 ) ( 384 2096 640 ) ( 384 2128 768 ) common/clip 0 0 0 0.5 0.5 134217728 0 0
 }
+{
+patchDef2
+{
+effects_warpzone/blueedge
+( 3 3 0 0 0 )
+(
+( ( -1176 -787.5 640 0 0 ) ( -1176 -787.5 512 0 0.5 ) ( -1176 -787.5 384 0 1 ) )
+( ( -1048 -787.5 640 0.5 0 ) ( -1048 -787.5 512 0.5 0.5 ) ( -1048 -787.5 384 0.5 1 ) )
+( ( -920 -787.5 640 1 0 ) ( -920 -787.5 512 1 0.5 ) ( -920 -787.5 384 1 1 ) )
+)
+}
+}
+{
+patchDef2
+{
+effects_warpzone/blueedge
+( 3 3 0 0 0 )
+(
+( ( -1167.5 -1216 320 0 0 ) ( -1167.5 -1088 320 0 0.5 ) ( -1167.5 -960 320 0 1 ) )
+( ( -1167.5 -1216 192 0.5 0 ) ( -1167.5 -1088 192 0.5 0.5 ) ( -1167.5 -960 192 0.5 1 ) )
+( ( -1167.5 -1216 64 1 0 ) ( -1167.5 -1088 64 1 0.5 ) ( -1167.5 -960 64 1 1 ) )
+)
+}
+}
+{
+patchDef2
+{
+effects_warpzone/rededge
+( 3 3 0 0 0 )
+(
+( ( 1432 4371.5 384 0 0 ) ( 1432 4371.5 512 0 0.5 ) ( 1432 4371.5 640 0 1 ) )
+( ( 1560 4371.5 384 0.5 0 ) ( 1560 4371.5 512 0.5 0.5 ) ( 1560 4371.5 640 0.5 1 ) )
+( ( 1688 4371.5 384 1 0 ) ( 1688 4371.5 512 1 0.5 ) ( 1688 4371.5 640 1 1 ) )
+)
+}
+}
+{
+patchDef2
+{
+effects_warpzone/rededge
+( 3 3 0 0 0 )
+(
+( ( 1679.5 4544 64 0 0 ) ( 1679.5 4672 64 0 0.5 ) ( 1679.5 4800 64 0 1 ) )
+( ( 1679.5 4544 192 0.5 0 ) ( 1679.5 4672 192 0.5 0.5 ) ( 1679.5 4800 192 0.5 1 ) )
+( ( 1679.5 4544 320 1 0 ) ( 1679.5 4672 320 1 0.5 ) ( 1679.5 4800 320 1 1 ) )
+)
+}
+}
 }
 {
 "classname" "info_player_deathmatch"

diff --git a/maps/geoplanetary.map.options b/maps/geoplanetary.map.options
index 25a9a35bfdd752d038747b97d76ac967c6df3442..0d3c8e80ad5d4108ae54b8e8632cbc91af511c0c 100644 (file)
--- a/maps/geoplanetary.map.options
+++ b/maps/geoplanetary.map.options
@@ -2,4 +2,4 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 2g
+Version: 2h