Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divVerent@alientrap.org>
Fri, 27 Aug 2010 08:35:06 +0000 (10:35 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Fri, 27 Aug 2010 08:35:06 +0000 (10:35 +0200)
26 files changed:
all
misc/logos/icons_icns/Xonotic.icns
misc/logos/icons_ico/xonotic_128.ico
misc/logos/icons_ico/xonotic_16.ico
misc/logos/icons_ico/xonotic_22.ico [new file with mode: 0644]
misc/logos/icons_ico/xonotic_24.ico
misc/logos/icons_ico/xonotic_256.ico
misc/logos/icons_ico/xonotic_32.ico
misc/logos/icons_ico/xonotic_48.ico
misc/logos/icons_ico/xonotic_512.ico [deleted file]
misc/logos/icons_ico/xonotic_64.ico
misc/logos/icons_png/xonotic_128.png
misc/logos/icons_png/xonotic_16.png
misc/logos/icons_png/xonotic_22.png
misc/logos/icons_png/xonotic_24.png
misc/logos/icons_png/xonotic_256.png
misc/logos/icons_png/xonotic_32.png
misc/logos/icons_png/xonotic_48.png
misc/logos/icons_png/xonotic_512.png
misc/logos/icons_png/xonotic_64.png
misc/logos/icons_xpm/xonotic_32.xpm
misc/logos/xonotic_icon.svg
misc/tools/cached-converter.sh
misc/tools/fft-normalmap-to-heightmap.c
misc/tools/rebrand-darkplaces-engine.sh
misc/tools/xonotic.brand

diff --git a/all b/all
index 32cf72e..f4fcb8f 100755 (executable)
--- a/all
+++ b/all
@@ -919,9 +919,10 @@ case "$cmd" in
                        force=true
                fi
                for d in $repos; do
-                       enter "$d0/$d" verbose
+                       verbose cd "$d0/$d"
                        if $force; then
-                               verbose git checkout-index -fa
+                               verbose git reset --hard
+                               #redundant# verbose git checkout-index -fa
                        fi
                        case "$d" in
                                .)
index 4129b9f..7fda030 100644 (file)
Binary files a/misc/logos/icons_icns/Xonotic.icns and b/misc/logos/icons_icns/Xonotic.icns differ
index 7b64c4d..c588903 100644 (file)
Binary files a/misc/logos/icons_ico/xonotic_128.ico and b/misc/logos/icons_ico/xonotic_128.ico differ
index 77fd48f..e6047f9 100644 (file)
Binary files a/misc/logos/icons_ico/xonotic_16.ico and b/misc/logos/icons_ico/xonotic_16.ico differ
diff --git a/misc/logos/icons_ico/xonotic_22.ico b/misc/logos/icons_ico/xonotic_22.ico
new file mode 100644 (file)
index 0000000..0b8208e
Binary files /dev/null and b/misc/logos/icons_ico/xonotic_22.ico differ
index 2b3d8d5..6dc4557 100644 (file)
Binary files a/misc/logos/icons_ico/xonotic_24.ico and b/misc/logos/icons_ico/xonotic_24.ico differ
index 632d5a9..8ee2236 100644 (file)
Binary files a/misc/logos/icons_ico/xonotic_256.ico and b/misc/logos/icons_ico/xonotic_256.ico differ
index bd5407e..b470163 100644 (file)
Binary files a/misc/logos/icons_ico/xonotic_32.ico and b/misc/logos/icons_ico/xonotic_32.ico differ
index 9f82051..7cf932a 100644 (file)
Binary files a/misc/logos/icons_ico/xonotic_48.ico and b/misc/logos/icons_ico/xonotic_48.ico differ
diff --git a/misc/logos/icons_ico/xonotic_512.ico b/misc/logos/icons_ico/xonotic_512.ico
deleted file mode 100644 (file)
index 3e13491..0000000
Binary files a/misc/logos/icons_ico/xonotic_512.ico and /dev/null differ
index f911347..a1d99e8 100644 (file)
Binary files a/misc/logos/icons_ico/xonotic_64.ico and b/misc/logos/icons_ico/xonotic_64.ico differ
index 0d3847c..231b398 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_128.png and b/misc/logos/icons_png/xonotic_128.png differ
index 6521710..da27c13 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_16.png and b/misc/logos/icons_png/xonotic_16.png differ
index 3037e3c..f237f1b 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_22.png and b/misc/logos/icons_png/xonotic_22.png differ
index 1b07ffc..5d71d8d 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_24.png and b/misc/logos/icons_png/xonotic_24.png differ
index 699cf50..3581eaf 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_256.png and b/misc/logos/icons_png/xonotic_256.png differ
index a5df383..a62affb 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_32.png and b/misc/logos/icons_png/xonotic_32.png differ
index 70677c3..244ead9 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_48.png and b/misc/logos/icons_png/xonotic_48.png differ
index 7e3d636..43ca8fb 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_512.png and b/misc/logos/icons_png/xonotic_512.png differ
index 48381cb..198651a 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_64.png and b/misc/logos/icons_png/xonotic_64.png differ
index 0903e10..cdd7f44 100644 (file)
 static char * xonotic_32_xpm[] = {
 "32 32 92 1",
 "      c None",
-".     c #01070B",
-"+     c #150400",
-"@     c #000A12",
-"#     c #0E0805",
-"$     c #1B0500",
-"%     c #000D19",
-"&     c #250700",
-"*     c #220800",
-"=     c #00101F",
-"-     c #2C0900",
-";     c #0C1118",
-">     c #14100D",
-",     c #101114",
-"'     c #021528",
-")     c #320B00",
-"!     c #1D120D",
-"~     c #390B03",
-"{     c #400A01",
-"]     c #3B0D00",
-"^     c #0A172F",
-"/     c #440D00",
-"(     c #231713",
-"_     c #091D34",
-":     c #051F3F",
-"<     c #2B190D",
-"[     c #30180D",
-"}     c #38160B",
-"|     c #141E29",
-"1     c #201D22",
-"2     c #0A2544",
-"3     c #332018",
-"4     c #551804",
-"5     c #461D0A",
-"6     c #0A284F",
-"7     c #052956",
-"8     c #3A2113",
-"9     c #501E05",
-"0     c #142A40",
-"a     c #452115",
-"b     c #0E2F4F",
-"c     c #442717",
-"d     c #10325A",
-"e     c #602309",
-"f     c #093467",
-"g     c #00376F",
-"h     c #003A66",
-"i     c #5A2912",
-"j     c #482D29",
-"k     c #113B75",
-"l     c #163C6A",
-"m     c #443436",
-"n     c #643013",
-"o     c #5B321C",
-"p     c #712D10",
-"q     c #6C2F0F",
-"r     c #2C3F53",
-"s     c #1B4573",
-"t     c #174983",
-"u     c #244A73",
-"v     c #7A3C1A",
-"w     c #5E4140",
-"x     c #6A402B",
-"y     c #863F1B",
-"z     c #235394",
-"A     c #265482",
-"B     c #285489",
-"C     c #8E461E",
-"D     c #994619",
-"E     c #914826",
-"F     c #53556B",
-"G     c #8C4C28",
-"H     c #2F5D99",
-"I     c #2462A6",
-"J     c #475E79",
-"K     c #316295",
-"L     c #3F6892",
-"M     c #A65524",
-"N     c #2A6DB7",
-"O     c #4D6B91",
-"P     c #3373B4",
-"Q     c #3C72AD",
-"R     c #4673AA",
-"S     c #337AC8",
-"T     c #397AC2",
-"U     c #417EC0",
-"V     c #4A81BD",
-"W     c #6386AF",
-"X     c #5C89BB",
-"Y     c #7396C1",
-"Z     c #87AACF",
-"`     c #91BBE2",
+".     c #000509",
+"+     c #0F0303",
+"@     c #150400",
+"#     c #1B0400",
+"$     c #010C14",
+"%     c #220700",
+"&     c #010F1A",
+"*     c #250700",
+"=     c #2B0900",
+"-     c #011321",
+";     c #310A03",
+">     c #001628",
+",     c #330B00",
+"'     c #390B03",
+")     c #400A01",
+"!     c #3C0E00",
+"~     c #051A31",
+"{     c #331103",
+"]     c #430D00",
+"^     c #4D1002",
+"/     c #0A1F36",
+"(     c #141E29",
+"_     c #451A07",
+":     c #082743",
+"<     c #0A273F",
+"[     c #4F1D08",
+"}     c #5B1B07",
+"|     c #182C3F",
+"1     c #0C2F51",
+"2     c #5D2409",
+"3     c #65240A",
+"4     c #562812",
+"5     c #4D2C1B",
+"6     c #0D3A65",
+"7     c #662A06",
+"8     c #722D0F",
+"9     c #743101",
+"0     c #2C3F53",
+"a     c #77310A",
+"b     c #1A4673",
+"c     c #7C3908",
+"d     c #683D29",
+"e     c #733B1E",
+"f     c #823A03",
+"g     c #214C76",
+"h     c #8B3E18",
+"i     c #8F410D",
+"j     c #963F11",
+"k     c #604D4A",
+"l     c #255A88",
+"m     c #255A9B",
+"n     c #295B8F",
+"o     c #9F4610",
+"p     c #984A17",
+"q     c #255EA5",
+"r     c #1761B1",
+"s     c #9A4A21",
+"t     c #A54C15",
+"u     c #475E79",
+"v     c #346399",
+"w     c #A2511E",
+"x     c #3E6792",
+"y     c #5C6272",
+"z     c #266BBB",
+"A     c #2271BD",
+"B     c #4D6C8F",
+"C     c #3C6FA5",
+"D     c #B15A26",
+"E     c #3472BA",
+"F     c #3373B4",
+"G     c #3479C1",
+"H     c #4178AE",
+"I     c #287ED1",
+"J     c #347CCA",
+"K     c #387FC7",
+"L     c #4380C1",
+"M     c #3A84D2",
+"N     c #5489C0",
+"O     c #488CD4",
+"P     c #648AB7",
+"Q     c #628DB2",
+"R     c #678DBA",
+"S     c #5691CC",
+"T     c #748CA8",
+"U     c #5F9AD7",
+"V     c #6D99CC",
+"W     c #74A4DA",
+"X     c #81A4C9",
+"Y     c #7AACDC",
+"Z     c #8DBCE9",
+"`     c #98C2EA",
 "                                ",
-"           ==========           ",
-"        :0'==%%%%%%=='0:        ",
-"       dOb'%%%%%%%%%%'bOd       ",
-"      LW:^=%%%@@@@%%%=^:WL      ",
-"     LY6'%%@@@@@@@@@@@%'6YL     ",
-"    AZ6^%@@@@@@@@.,,,,,%'6ZA    ",
-"   s`s^=@@@@@...>(8Gcxx31_s`s   ",
-"  fYY:=%@@@...>(oGy4ye4Ex12YYf  ",
-"  BZB^%@@@...!<GpyMp/pCGG(_BZB  ",
-" gXW7=%@@..#!oC4/py4pvc8(;=7WXg ",
-" kLV:%@@..><vp//////MCCG8,%:VLk ",
-" IAU:%@..>[C4{{{{{{{{4yv3,%:UAI ",
-" NAN:%@.!aD/]]]]]]]]pv[!>@%:NAN ",
-" SsN:@,(oy4D]~~~~~~pn*#..@%:NsS ",
-"fTlS:;(nDyMe))))))]v*#...@%:SlTf",
-"gTlT21vDnvpe))))))p[##...@%:TlTg",
-" ThPd183nDvq------q<#....@=7PhT ",
-" SdBz_;>[8n]------n[#....@^zBdS ",
-" IsbT6=.><n&&&&&&&9a!#..@=6TbsI ",
-" gKbsI_;!59********n8!>,;_IsbKg ",
-" gT22Pd1ci*********&ii831dP22Tg ",
-"  zu2bTw5$$$$$$$$$$$$*5ixUb2uz  ",
-"  gT__0Vw)$$$$$$$$$$$$}wV0__Tg  ",
-"   tK___QFa*++++++++*aFQ___Kt   ",
-"    Iu'''uQOj}++++}jOQu'''uI    ",
-"    kNu====0KRa##aRK0====uNk    ",
-"     kIL%%%%%0O**O0%%%%%LIk     ",
-"       tVr@@@@OmmO@@@@rVt       ",
-"        gHXJ|.;YY;.|JXHg        ",
-"          ggRXWYYWXRgg          ",
-"               ff               "}
+"                                ",
+"         E            E         ",
+"       AUG            EUA       ",
+"      SW                WS      ",
+"     SY                  YS     ",
+"    LZr                  rZL    ",
+"   E`E            cwcppc  E`E   ",
+"   YW           pwh}h3}sp  WY   ",
+"  GXL          w8hD8^3swD  LXG  ",
+"  VR         is^]8h^ai9     RV  ",
+" zxS        p8]]]]]]Dpptf   Sxz ",
+" JlO       t}))))))))}io    OlJ ",
+" MgJ     fo]!!!!!!!!8o      JgM ",
+" MbI    ih}t!''''''8i       IbM ",
+" K6M   ijht3,,,,,,!i        M6K ",
+" K6K  otffa3;;;;;;a9        K6K ",
+" K6Fq f ftia======a        rF6K ",
+" M1nz     f!======a        An1M ",
+" Ib1K     a*******29       K1bI ",
+" rv1bJ   c[%%%%%%%%a9     Jb1vr ",
+"  K::Fq c7%%%%%%%%%*2a9  mF::K  ",
+"  Ag:1Le_############%_2eH1:gA  ",
+"   K//:Hd{############{dH://K   ",
+"   zv~~/Ck[%@@@@@@@@%[kC/~~vz   ",
+"    Jg>>>gCy4!@++@!4yCg>>>gJ    ",
+"     Jg----<lB[++[Bl<----gJ     ",
+"      Jx&&&&&|y==y|&&&&&xJ      ",
+"       AN0$$$$B55B$$$$0NA       ",
+"         KPu(.$TT$.(uPK         ",
+"           rSVQXXQVSr           ",
+"                                "};
index 7e9fe9b..9deb624 100644 (file)
    sodipodi:version="0.32"
    inkscape:version="0.47 r22583"
    version="1.0"
-   sodipodi:docname="xonotic_icon.svg"
+   sodipodi:docname="xonotic_icon_nobg.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-xdpi="120"
-   inkscape:export-ydpi="120">
+   inkscape:export-xdpi="30"
+   inkscape:export-ydpi="30">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient3663">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3667" />
-      <stop
-         id="stop3629"
-         offset="0.25"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3659"
-         offset="0.94"
-         style="stop-color:#000f1f;stop-opacity:1;" />
-      <stop
-         id="stop3690"
-         offset="1"
-         style="stop-color:#000f1f;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient3698">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
        y1="1664"
        x2="1024"
        y2="1480" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3663"
-       id="radialGradient3688"
-       cx="24"
-       cy="24"
-       fx="24"
-       fy="24"
-       r="24"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3606"
        gradientUnits="userSpaceOnUse" />
     <filter
        inkscape:collect="always"
-       id="filter3625"
-       inkscape:label="BlurGlow"
+       id="filter3634"
        color-interpolation-filters="sRGB">
       <feGaussianBlur
          inkscape:collect="always"
-         stdDeviation="1.2883372"
-         id="feGaussianBlur3627" />
+         stdDeviation="0.79447464"
+         id="feGaussianBlur3636" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3621"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.80539653"
+         id="feGaussianBlur3623" />
     </filter>
   </defs>
   <sodipodi:namedview
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="4"
-     inkscape:cx="77.720373"
-     inkscape:cy="24.156634"
+     inkscape:cx="57.624372"
+     inkscape:cy="0.156634"
      inkscape:document-units="px"
      inkscape:current-layer="XonoticIcon"
      showgrid="false"
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Xonotic Icon</dc:title>
+        <dc:title />
         <dc:date>2010</dc:date>
         <dc:rights>
           <cc:Agent>
      inkscape:groupmode="layer"
      id="XonoticIcon">
     <path
-       style="fill:url(#radialGradient3688);fill-opacity:1;fill-rule:evenodd;stroke:none"
-       d="M 24,0 C 10.745169,0 0,10.745167 0,24.000001 0,37.254834 10.745169,48 24,48 37.254832,48 48,37.254834 48,24.000001 48,10.745167 37.254832,0 24,0 z"
-       id="BackgroundCircle" />
-    <path
        id="RingGlow"
        d="M 14.59521,4.1108501 C 7.1529823,7.6393737 2,15.221066 2,24.000008 2,36.144003 11.855996,46 24.00001,46 36.144004,46 46,36.144003 46,24.000008 46,15.221066 40.847035,7.6393737 33.404798,4.1108501 39.278676,7.4083408 43.250001,13.695036 43.250001,20.90626 43.250001,30.281336 36.536033,38.096723 27.657713,39.807112 26.473118,40.035362 25.031258,45.3125 24.00001,45.3125 22.96876,45.3125 21.526865,40.035362 20.34227,39.807112 11.463975,38.096723 4.7499989,30.281336 4.7499989,20.90626 4.7499989,13.695036 8.7213239,7.4083408 14.59521,4.1108501 z"
-       style="fill:#1f7fff;fill-opacity:1;stroke:#1f7fff;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3625)" />
+       style="fill:#174f8f;fill-opacity:1;stroke:#175faf;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3634)" />
     <path
-       sodipodi:nodetypes="cccccccsccccccccccc"
        id="PhoenixHeadGlow"
        d="M 29.687991,11.576669 C 23.844,12.519302 16.365576,19.817205 9.0791026,25.681248 L 18.038082,21.545414 12.860351,27.050857 17.334467,24.956018 C 15.865814,27.850997 16.023069,32.858195 11.189936,33.845114 13.706493,36.335733 16.940546,38.104313 20.557136,38.797312 22.281242,39.125003 23.484367,43.9375 23.999992,43.9375 24.515616,43.9375 25.718741,39.125003 27.442847,38.797312 31.198015,38.077803 34.539671,36.198563 37.094717,33.555155 24.308519,33.714985 25.116458,20.742195 36.412596,17.903821 35.541363,17.092044 32.641742,17.244152 30.268064,17.619153 30.681719,14.852918 34.604229,13.528101 37.502915,13.886238 35.846316,12.205626 33.829346,10.991435 30.482905,12.387709 L 29.687991,11.576669 z M 28.082024,13.907732 28.952134,14.767107 C 27.816077,15.729188 26.806674,15.793142 25.847649,14.933602 L 28.082024,13.907732 z"
-       style="fill:none;stroke:#ff7f2f;stroke-width:2.20000004999999987;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.37254903;stroke-dasharray:none;filter:url(#filter3625)" />
+       style="fill:#5f1f00;fill-opacity:1;stroke:#6f2f00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3621)"
+       sodipodi:nodetypes="cccccccsccccccccccc" />
     <path
        style="fill:url(#linearGradient4196);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4204);stroke-width:0.54999977;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 29.687991,11.576669 C 23.844,12.519302 16.365576,19.817205 9.0791026,25.681248 L 18.038082,21.545414 12.860351,27.050857 17.334467,24.956018 C 15.865814,27.850997 16.023069,32.858195 11.189936,33.845114 13.706493,36.335733 16.940546,38.104313 20.557136,38.797312 22.281242,39.125003 23.484367,43.9375 23.999992,43.9375 24.515616,43.9375 25.718741,39.125003 27.442847,38.797312 31.198015,38.077803 34.539671,36.198563 37.094717,33.555155 24.308519,33.714985 25.116458,20.742195 36.412596,17.903821 35.541363,17.092044 32.641742,17.244152 30.268064,17.619153 30.681719,14.852918 34.604229,13.528101 37.502915,13.886238 35.846316,12.205626 33.829346,10.991435 30.482905,12.387709 L 29.687991,11.576669 z M 28.082024,13.907732 28.952134,14.767107 C 27.816077,15.729188 26.806674,15.793142 25.847649,14.933602 L 28.082024,13.907732 z"
index 72f427c..3612658 100755 (executable)
@@ -179,6 +179,7 @@ for F in "$@"; do
        case "$f" in
                *_bump) will_dds=false ;;
                ./models/player/*) will_dds=false ;;
+               ./models/sprites/*) will_dds=false ;;
                ./textures/*) ;;
                ./models/*) ;;
                ./particles/*) ;;
index 1db9eba..aa4ac7f 100644 (file)
@@ -38,6 +38,8 @@
 void nmap_to_hmap(unsigned char *map, const unsigned char *refmap, int w, int h, double scale, double offset)
 {
        int x, y;
+       int fx, fy;
+       double ffx, ffy;
        double nx, ny, nz;
        double v, vmin, vmax;
 #ifndef C99
@@ -48,9 +50,9 @@ void nmap_to_hmap(unsigned char *map, const unsigned char *refmap, int w, int h,
        fftw_complex *imgspace2 = fftw_malloc(w*h * sizeof(fftw_complex));
        fftw_complex *freqspace1 = fftw_malloc(w*h * sizeof(fftw_complex));
        fftw_complex *freqspace2 = fftw_malloc(w*h * sizeof(fftw_complex));
-       fftw_plan i12f1 = fftw_plan_dft_2d(w, h, imgspace1, freqspace1, FFTW_FORWARD, FFTW_ESTIMATE);
-       fftw_plan i22f2 = fftw_plan_dft_2d(w, h, imgspace2, freqspace2, FFTW_FORWARD, FFTW_ESTIMATE);
-       fftw_plan f12i1 = fftw_plan_dft_2d(w, h, freqspace1, imgspace1, FFTW_BACKWARD, FFTW_ESTIMATE);
+       fftw_plan i12f1 = fftw_plan_dft_2d(h, w, imgspace1, freqspace1, FFTW_FORWARD, FFTW_ESTIMATE);
+       fftw_plan i22f2 = fftw_plan_dft_2d(h, w, imgspace2, freqspace2, FFTW_FORWARD, FFTW_ESTIMATE);
+       fftw_plan f12i1 = fftw_plan_dft_2d(h, w, freqspace1, imgspace1, FFTW_BACKWARD, FFTW_ESTIMATE);
 
        for(y = 0; y < h; ++y)
        for(x = 0; x < w; ++x)
@@ -86,23 +88,27 @@ void nmap_to_hmap(unsigned char *map, const unsigned char *refmap, int w, int h,
        for(y = 0; y < h; ++y)
        for(x = 0; x < w; ++x)
        {
-               int fx = x;
-               int fy = y;
+               fx = x;
+               fy = y;
                if(fx > w/2)
                        fx -= w;
                if(fy > h/2)
                        fy -= h;
+               /* these must have the same sign as fx and fy (so ffx*fx + ffy*fy is nonzero), otherwise do not matter */
+               /* it basically decides how artifacts are distributed */
+               ffx = fx;
+               ffy = fy;
 #ifdef C99
                if(fx||fy)
-                       freqspace1[(w*y+x)] = _Complex_I * (fx * freqspace1[(w*y+x)] + fy * freqspace2[(w*y+x)]) / (fx*fx + fy*fy) / TWO_PI;
+                       freqspace1[(w*y+x)] = _Complex_I * (ffx * freqspace1[(w*y+x)] + ffy * freqspace2[(w*y+x)]) / (ffx*fx + ffy*fy) / TWO_PI;
                else
                        freqspace1[(w*y+x)] = 0;
 #else
                if(fx||fy)
                {
                        save = freqspace1[(w*y+x)][0];
-                       freqspace1[(w*y+x)][0] = -(fx * freqspace1[(w*y+x)][1] + fy * freqspace2[(w*y+x)][1]) / (fx*fx + fy*fy) / TWO_PI;
-                       freqspace1[(w*y+x)][1] =  (fx * save + fy * freqspace2[(w*y+x)][0]) / (fx*fx + fy*fy) / TWO_PI;
+                       freqspace1[(w*y+x)][0] = -(ffx * freqspace1[(w*y+x)][1] + ffy * freqspace2[(w*y+x)][1]) / (ffx*fx + ffy*fy) / TWO_PI;
+                       freqspace1[(w*y+x)][1] =  (ffx * save + ffy * freqspace2[(w*y+x)][0]) / (ffx*fx + ffy*fy) / TWO_PI;
                }
                else
                {
@@ -235,9 +241,9 @@ void hmap_to_nmap(unsigned char *map, int w, int h, int src_chan, double scale)
        fftw_complex *imgspace2 = fftw_malloc(w*h * sizeof(fftw_complex));
        fftw_complex *freqspace1 = fftw_malloc(w*h * sizeof(fftw_complex));
        fftw_complex *freqspace2 = fftw_malloc(w*h * sizeof(fftw_complex));
-       fftw_plan i12f1 = fftw_plan_dft_2d(w, h, imgspace1, freqspace1, FFTW_FORWARD, FFTW_ESTIMATE);
-       fftw_plan f12i1 = fftw_plan_dft_2d(w, h, freqspace1, imgspace1, FFTW_BACKWARD, FFTW_ESTIMATE);
-       fftw_plan f22i2 = fftw_plan_dft_2d(w, h, freqspace2, imgspace2, FFTW_BACKWARD, FFTW_ESTIMATE);
+       fftw_plan i12f1 = fftw_plan_dft_2d(h, w, imgspace1, freqspace1, FFTW_FORWARD, FFTW_ESTIMATE);
+       fftw_plan f12i1 = fftw_plan_dft_2d(h, w, freqspace1, imgspace1, FFTW_BACKWARD, FFTW_ESTIMATE);
+       fftw_plan f22i2 = fftw_plan_dft_2d(h, w, freqspace2, imgspace2, FFTW_BACKWARD, FFTW_ESTIMATE);
 
        for(y = 0; y < h; ++y)
        for(x = 0; x < w; ++x)
index 9c785ff..0e911bb 100755 (executable)
@@ -10,6 +10,7 @@ userdirname=darkplaces
 icon_icns=Darkplaces.app/Contents/Resources/Darkplaces.icns
 icon_ico=darkplaces.ico
 icon_xpm=darkplaces.xpm
+icons_tga=
 
 if [ -z "$1" ] || [ x"$1" = x"--help" ]; then
        echo "Usage: $0 brandfile binaries..."
@@ -64,8 +65,17 @@ for EXECUTABLE in "$@"; do
 
        if $uses_xpm; then
                cp "$icon_xpm" "$t/darkplaces-icon.xpm"
+               cnt=
+               for i in $icons_tga; do
+                       convert "$i" "$t/darkplaces-icon$cnt.tga"
+                       if [ -z "$cnt" ]; then
+                               cnt=2
+                       else
+                               cnt=$(($cnt+1))
+                       fi
+               done
                cd "$t"
-               zip -9r darkplaces-this.zip darkplaces-icon.xpm
+               zip -9r darkplaces-this.zip darkplaces-icon*
                cd "$d"
        fi
 
index 14ac4fc..af1ed9e 100644 (file)
@@ -7,3 +7,4 @@ userdirname=xonotic
 icon_icns="$d0/misc/logos/icons_icns/xonotic.icns"
 icon_ico="$d0/misc/logos/icons_ico/xonotic_64.ico"
 icon_xpm="$d0/misc/logos/icons_xpm/xonotic_32.xpm"
+icons_tga="$d0/misc/logos/icons_png/xonotic_64.png $d0/misc/logos/icons_png/xonotic_16.png $d0/misc/logos/icons_png/xonotic_22.png $d0/misc/logos/icons_png/xonotic_24.png $d0/misc/logos/icons_png/xonotic_32.png $d0/misc/logos/icons_png/xonotic_48.png $d0/misc/logos/icons_png/xonotic_128.png $d0/misc/logos/icons_png/xonotic_256.png $d0/misc/logos/icons_png/xonotic_512.png"