optimize warpzone visibility a bit (not finished)

diff --git a/maps/augenkrebs.map b/maps/augenkrebs.map
index d3b4e755ba4ade24543dbde0603d59d083b05962..79f3322cfa0cbe98715488537cc293e9a361440b 100644 (file)
--- a/maps/augenkrebs.map
+++ b/maps/augenkrebs.map
@@ -187,7 +187,7 @@ brushDef
 ( 1152 1152 256 ) ( 640 1152 256 ) ( 640 640 256 ) ( ( 0 -0.0078125 0 ) ( -0.0078125 0 0 ) ) map_augenkrebs/lines 0 0 0
 ( 640 640 832 ) ( 1152 640 832 ) ( 1152 640 256 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) map_augenkrebs/lines 0 0 0
 ( 640 640 256 ) ( 640 1152 256 ) ( 640 1152 832 ) ( ( 0.0078125 0 0.9999990463 ) ( 0 0.0078125 0.00000048 ) ) map_augenkrebs/lines 0 0 0
-( 1120 1024 -64 ) ( 1120 736 -64 ) ( 1120 1024 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/camera 0 0 0
+( 1120 1024 -64 ) ( 1120 736 -64 ) ( 1120 1024 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
 {
@@ -1202,7 +1202,7 @@ brushDef
 ( 1536 960 1024 ) ( 1536 256 1024 ) ( 1536 256 1088 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) map_augenkrebs/curvyliney 0 0 0
 ( 960 256 1088 ) ( 1536 256 1088 ) ( 1536 256 1024 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) map_augenkrebs/curvyliney 0 0 0
 ( 960 256 1024 ) ( 1536 256 1024 ) ( 1536 960 1024 ) ( ( 0 -0.0312499907 0.00000763 ) ( -0.03125 0 0 ) ) map_augenkrebs/triangles 0 0 0
-( 960 960 1024 ) ( 1536 960 1024 ) ( 1536 960 1088 ) ( ( -0.00195312 0 0.00000322 ) ( 0 0.00195312 0 ) ) map_augenkrebs/mirror-of-augenkrebs 0 0 0
+( 960 960 1024 ) ( 1536 960 1024 ) ( 1536 960 1088 ) ( ( -0.00390624 0 0.00000644 ) ( 0 0.00390624 0 ) ) common/caulk 0 0 0
 ( 960 960 1088 ) ( 960 256 1088 ) ( 960 256 1024 ) ( ( 0.00390625 0 0 ) ( 0 0.00390625 0 ) ) map_augenkrebs/maze-of-augenkrebs 0 0 0
 }
 }
@@ -1213,7 +1213,7 @@ brushDef
 ( 960 256 1024 ) ( 256 256 1024 ) ( 256 256 1088 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) map_augenkrebs/curvyliney 0 0 0
 ( 256 832 1088 ) ( 256 256 1088 ) ( 256 256 1024 ) ( ( -0.015625 0 0.9999933243 ) ( 0 0.015625 0 ) ) map_augenkrebs/curvyliney 0 0 0
 ( 256 832 1024 ) ( 256 256 1024 ) ( 960 256 1024 ) ( ( -0 -0.03125 0.00000381 ) ( -0.03125 0 0.9999961853 ) ) map_augenkrebs/triangles 0 0 0
-( 960 832 1024 ) ( 960 256 1024 ) ( 960 256 1088 ) ( ( 0.00195312 0 0 ) ( 0 0.00195312 0 ) ) map_augenkrebs/mirror-of-augenkrebs 0 0 0
+( 960 832 1024 ) ( 960 256 1024 ) ( 960 256 1088 ) ( ( 0.00390624 0 0 ) ( 0 0.00390624 0 ) ) common/caulk 0 0 0
 ( 960 832 1088 ) ( 256 832 1088 ) ( 256 832 1024 ) ( ( 0.00390625 0.00000001 0.00000548 ) ( 0 0.00390625 0 ) ) map_augenkrebs/maze-of-augenkrebs 0 0 0
 }
 }
@@ -1223,8 +1223,8 @@ brushDef
 ( 832 832 1088 ) ( 256 832 1088 ) ( 256 960 1088 ) ( ( 0 0.03125 0 ) ( -0.03125 0 0 ) ) map_augenkrebs/punkte 0 0 0
 ( 256 832 1024 ) ( 256 960 1024 ) ( 256 960 1088 ) ( ( -0.015625 0 0 ) ( 0 0.015625 0 ) ) map_augenkrebs/curvyliney 0 0 0
 ( 832 960 1024 ) ( 256 960 1024 ) ( 256 832 1024 ) ( ( 0 -0.03125 0 ) ( -0.03125 0 0 ) ) map_augenkrebs/triangles 0 0 0
-( 832 960 1088 ) ( 256 960 1088 ) ( 256 960 1024 ) ( ( -0.00195312 -0 0.9999991655 ) ( 0 0.00195312 0 ) ) map_augenkrebs/mirror-of-augenkrebs 0 0 0
-( 832 832 1024 ) ( 256 832 1024 ) ( 256 832 1088 ) ( ( 0.00195312 0 0 ) ( 0 0.00195312 0 ) ) map_augenkrebs/mirror-of-augenkrebs 0 0 0
+( 832 960 1088 ) ( 256 960 1088 ) ( 256 960 1024 ) ( ( -0.00390624 -0 1.9999983311 ) ( 0 0.00390624 0 ) ) common/caulk 0 0 0
+( 832 832 1024 ) ( 256 832 1024 ) ( 256 832 1088 ) ( ( 0.00390624 0 0 ) ( 0 0.00390624 0 ) ) common/caulk 0 0 0
 ( 832 960 1024 ) ( 832 832 1024 ) ( 832 832 1088 ) ( ( 0.00390625 0 0 ) ( 0 0.00390625 0 ) ) map_augenkrebs/maze-of-augenkrebs 0 0 0
 }
 }
@@ -1336,6 +1336,28 @@ brushDef
 ( 1120 -64 360 ) ( 1152 64 360 ) ( 1120 64 360 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
+{
+brushDef
+{
+( -1216 -496 512 ) ( -640 -832 512 ) ( -640 -896 512 ) ( ( -0.015625 0 232 ) ( 0 0.015625 0 ) ) common/hintskip 0 0 0
+( -640 -896 512 ) ( -640 -832 512 ) ( -640 -832 256 ) ( ( -0.015625 0 232 ) ( 0 0.015625 0 ) ) common/hintskip 0 0 0
+( -1216 -496 256 ) ( -640 -896 256 ) ( -640 -832 256 ) ( ( -0.015625 0 232 ) ( 0 0.015625 0 ) ) common/hintskip 0 0 0
+( -1216 -496 512 ) ( -1216 -432 256 ) ( -1216 -432 512 ) ( ( -0.015625 0 24 ) ( 0 0.015625 0 ) ) common/hintskip 0 0 0
+( -1216 -496 256 ) ( -640 -896 512 ) ( -640 -896 256 ) ( ( -0.015625 0 13.3127985001 ) ( 0 0.015625 0 ) ) common/hint 0 0 0
+( -1216 -432 512 ) ( -640 -832 256 ) ( -640 -832 512 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/hintskip 0 0 0
+}
+}
+{
+brushDef
+{
+( -640 -640 512 ) ( -640 -896 512 ) ( -1024 -640 512 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/hintskip 0 0 0
+( -640 -640 512 ) ( -640 -640 256 ) ( -640 -896 512 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/hintskip 0 0 0
+( -1024 -896 256 ) ( -640 -896 256 ) ( -1024 -640 256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/hintskip 0 0 0
+( -1216 -704 256 ) ( -1216 -448 256 ) ( -1216 -704 512 ) ( ( 0.015625 0 3 ) ( 0 0.015625 0 ) ) common/hintskip 0 0 0
+( -640 -640 64 ) ( -1024 -896 -64 ) ( -640 -640 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/hint 0 0 0
+( -640 -704 -64 ) ( -1024 -960 -64 ) ( -640 -704 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/hintskip 0 0 0
+}
+}
 }
 {
 "classname" "trigger_push"

diff --git a/scripts/map_augenkrebs.shader b/scripts/map_augenkrebs.shader
index 6a3b208010de9e0c8f27a86d4264218a1370677c..88fef6c191bb5528481f6faff2bd2f83f8465aa9 100644 (file)
--- a/scripts/map_augenkrebs.shader
+++ b/scripts/map_augenkrebs.shader
@@ -21,11 +21,9 @@ textures/map_augenkrebs/moiretex
 {
        nopicmip
        nomipmaps
-       surfaceparm trans
        surfaceparm nolightmap
        {
                map "textures/map_augenkrebs/moiretex.tga"
-               alphaFunc GE128
                tcmod rotate 1
        }
 }
@@ -356,7 +354,6 @@ textures/map_augenkrebs/mirror-of-augenkrebs
                tcmod rotate 0.5
        }
        dp_reflect 1  1.5 0.5 1.5 0.7
-       dp_refract 1    1   1   1
        cull none
 }
 

diff --git a/textures/map_augenkrebs/moiretex.png b/textures/map_augenkrebs/moiretex.png
index 7564e73fc1293736338cd83a6a19671ce49b45f5..e2d72244afcb333d0186bda088af2e2a81747911 100644 (file)
Binary files a/textures/map_augenkrebs/moiretex.png and b/textures/map_augenkrebs/moiretex.png differ

diff --git a/textures/map_augenkrebs/moiretex.svg b/textures/map_augenkrebs/moiretex.svg
index ca29976928c0d2ee83ef7fc898edf045b9d9e680..eeda73279cec33698e55104525081108e88c5316 100644 (file)
--- a/textures/map_augenkrebs/moiretex.svg
+++ b/textures/map_augenkrebs/moiretex.svg
@@ -14,16 +14,19 @@
    height="256"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="New document 1">
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="moiretex.svg"
+   inkscape:export-filename="/home/rpolzer/Games/Xonotic/data/xonotic-maps.pk3dir/textures/map_augenkrebs/moiretex.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <defs
      id="defs4" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#000000"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.98994949"
      inkscape:cx="-13.946957"
@@ -33,8 +36,8 @@
      showgrid="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1059"
+     inkscape:window-width="1680"
+     inkscape:window-height="1025"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1">