Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

[xonotic/xonotic.git] / misc / tools / xonotic-map-compiler

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index e14951574773dc7fb059411105283ca65c5168a4..92b7c5ce01fe79875725068a895e6725bcf3c9bf 100755 (executable)
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -16,22 +16,22 @@ use File::Temp;
        our $Q3MAP2      = '/home/rpolzer/Games/Xonotic/netradiant/install/q3map2.x86';
 
        # General flags for q3map2 (for example -threads 4)
-       our $Q3MAP2FLAGS = '';
+       our $Q3MAP2FLAGS = '-fs_forbiddenpath xonotic-data.pk3 -fs_forbiddenpath xonotic-data.pk3dir -fs_forbiddenpath xonotic-nexcompat.pk3 -fs_forbiddenpath xonotic-nexcompat.pk3dir';
 
        # Default flags for the -bsp stage
-       our $BSPFLAGS    = '-meta -samplesize 8 -minsamplesize 4 -mv 1000000 -mi 6000000';
+       our $BSPFLAGS    = '-meta -maxarea -samplesize 8 -mv 1000000 -mi 6000000';
 
        # Default flags for the -vis stage
        our $VISFLAGS    = '';
 
        # Default flags for the -light stage
-       our $LIGHTFLAGS  = '-deluxe -patchshadows -samples 3 -lightmapsize 512 -fast -dirty';
+       our $LIGHTFLAGS  = '-lightmapsearchpower 3 -deluxe -patchshadows -randomsamples -samples 4 -lightmapsize 512 -fast -fastbounce -dirty -bouncegrid -fill';
 
        # Default flags for the -minimap stage
        our $MINIMAPFLAGS = '';
 
        # Default order of commands
-       our $ORDER = 'light,vis,minimap';
+       our $ORDER = 'vis,light';
 
 # end of user changable part
 
@@ -55,7 +55,7 @@ my $options =
        scale => [], # can't have defaults atm
        order => [split /\s*,\s*/, $ORDER],
        maps => [],
-       scale => 1,
+       scalefactor => 1,
        bsp_timeout => 0,
        vis_timeout => 0,
        light_timeout => 0,
@@ -91,7 +91,7 @@ while(@ARGV)
        }
        elsif($_ eq '-scale')
        {
-               $options->{scale} = (shift @ARGV) || 1;
+               $options->{scalefactor} = @ARGV ? shift(@ARGV) : 1;
                $enterflags = 'scale';
        }
        elsif($_ eq '-novis')
@@ -128,7 +128,7 @@ while(@ARGV)
        }
        elsif($_ eq '-scale_timeout')
        {
-               $options->{minimap_timeout} = shift @ARGV;
+               $options->{scale_timeout} = shift @ARGV;
        }
        elsif($_ eq '-order')
        {
@@ -214,26 +214,17 @@ sub q3map2(@)
 $mapdir = "/" if $mapdir eq "";
 symlink "$mapdir", "$linkdir/data";
 
-my ($prescale, $postscale) = ($options->{scale} =~ /^([0-9.]+)(?::([0-9.]+))?$/);
+my ($prescale, $postscale) = ($options->{scalefactor} =~ /^([0-9.]+)(?::([0-9.]+))?$/);
+$prescale = 1 if not defined $prescale;
 $postscale = 1 if not defined $postscale;
 
 for my $m(@{$options->{maps}})
 {
        $m =~ s/\.(?:map|bsp)$//;
+
        if($prescale != 1)
        {
-               open my $checkfh, "<", "$m.map"
-                       or die "open $m.map: $!";
-               my $keeplights = 0;
-               while(<$checkfh>)
-               {
-                       /^\s*"_keeplights"\s+"1"\s*$/
-                               or next;
-                       $keeplights = 1;
-               }
-               close $checkfh;
-               die "$m does not define _keeplights to 1"
-                       unless $keeplights;
+               unshift @{$options->{bsp}}, "-keeplights";
        }
 
        my %shaders = map { m!/([^/.]*)\.shader(?:$)! ? ($1 => 1) : () } glob "../scripts/*.shader";
@@ -325,7 +316,7 @@ for my $m(@{$options->{maps}})
                                or die "rename ${m}_s.bsp $m.bsp: $!";
                }
                my @o = @{$options->{order}};
-               push @o, qw/light vis minimap/;
+               push @o, qw/light vis/;
                my %o = ();
 
                for(@o)
@@ -347,14 +338,6 @@ for my $m(@{$options->{maps}})
                                                or die "-vis: $?";
                                }
                        }
-                       if($_ eq 'minimap')
-                       {
-                               if(defined $options->{minimap})
-                               {
-                                       q3map2 '-minimap',      @{$options->{minimap}}, "$m.map"
-                                               or die "-minimap: $?";
-                               }
-                       }
                }
 
                if($postscale != 1)
@@ -365,6 +348,12 @@ for my $m(@{$options->{maps}})
                                or die "rename ${m}_s.bsp $m.bsp: $!";
                }
 
+               if(defined $options->{minimap})
+               {
+                       q3map2 '-minimap',      @{$options->{minimap}}, "$m.map"
+                               or die "-minimap: $?";
+               }
+
                unlink "$m.srf";
                unlink "$m.prt";