fixes :P

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

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 3820aff435f1bb68db8bd3a2886f0c8613251e8c..4f8c83871edcfbb6ee6eab9ca84d9384afcc289c 100755 (executable)
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -25,7 +25,7 @@ use File::Temp;
        our $VISFLAGS    = '';
 
        # Default flags for the -light stage
-       our $LIGHTFLAGS  = '-deluxe -patchshadows -samples 3 -lightmapsize 512 -bounce 8 -fastbounce -bouncegrid';
+       our $LIGHTFLAGS  = '-deluxe -patchshadows -samples 3 -lightmapsize 512';
 
        # Default flags for the -minimap stage
        our $MINIMAPFLAGS = '';
@@ -41,7 +41,7 @@ sub Usage()
 {
        print <<EOF;
 Usage:
-$0 mapname [-bsp bspflags...] [-vis visflags...] [-light lightflags...]
+$0 mapname [-bsp bspflags...] [-vis visflags...] [-light lightflags...] [-minimap minimapflags]
 EOF
        exit 1;
 }
@@ -52,9 +52,15 @@ my $options =
        vis => [split /\s+/, $VISFLAGS],
        light => [split /\s+/, $LIGHTFLAGS],
        minimap => [split /\s+/, $MINIMAPFLAGS],
+       scale => [], # can't have defaults atm
        order => [split /\s*,\s*/, $ORDER],
        maps => [],
-       scale => 1
+       scale => 1,
+       bsp_timeout => 0,
+       vis_timeout => 0,
+       light_timeout => 0,
+       minimap_timeout => 0,
+       scale_timeout => 0
 };
 
 my $curmode = 'maps';
@@ -86,6 +92,7 @@ while(@ARGV)
        elsif($_ eq '-scale')
        {
                $options->{scale} = (shift @ARGV) || 1;
+               $enterflags = 'scale';
        }
        elsif($_ eq '-novis')
        {
@@ -103,6 +110,26 @@ while(@ARGV)
        {
                $options->{noshaderlist} = 1;
        }
+       elsif($_ eq '-bsp_timeout')
+       {
+               $options->{bsp_timeout} = shift @ARGV;
+       }
+       elsif($_ eq '-vis_timeout')
+       {
+               $options->{vis_timeout} = shift @ARGV;
+       }
+       elsif($_ eq '-light_timeout')
+       {
+               $options->{light_timeout} = shift @ARGV;
+       }
+       elsif($_ eq '-minimap_timeout')
+       {
+               $options->{minimap_timeout} = shift @ARGV;
+       }
+       elsif($_ eq '-scale_timeout')
+       {
+               $options->{minimap_timeout} = shift @ARGV;
+       }
        elsif($_ eq '-order')
        {
                $options->{order} = [split /\s*,\s*/, shift @ARGV];
@@ -142,9 +169,35 @@ my $linkdir = File::Temp::tempdir("xonotic-map-compiler.XXXXXX", TMPDIR => 1, CL
 
 sub q3map2(@)
 {
+       my $mode = $_[0];
+       my $timeout = undef;
+       $timeout = $options->{bsp_timeout} if $mode eq '-bsp';
+       $timeout = $options->{vis_timeout} if $mode eq '-vis';
+       $timeout = $options->{light_timeout} if $mode eq '-light';
+       $timeout = $options->{minimap_timeout} if $mode eq '-minimap';
+       $timeout = $options->{scale_timeout} if $mode eq '-scale';
+       die "Invalid call: not a standard q3map2 stage" if not defined $timeout;
        my @args = ($Q3MAP2, split(/\s+/, $Q3MAP2FLAGS), '-game', 'xonotic', '-fs_basepath', $XONOTICDIR, '-fs_basepath', $linkdir, '-v', @_);
        print "\$ @args\n";
-       return !system @args;
+       defined(my $pid = fork())
+               or die "fork: $!";
+       if($pid) # parent
+       {
+               local $SIG{ALRM} = sub { kill $pid; };
+               alarm $timeout
+                       if $timeout;
+               if(waitpid($pid, 0) != $pid)
+               {
+                       die "waitpid: did not return our child process $pid: $!";
+               }
+               alarm 0;
+               return $? == 0;
+       }
+       else # child
+       {
+               exec @args
+                       or die "exec: $!";
+       }
 }
 
 (my $mapdir = getcwd()) =~ s!/[^/]*(?:$)!!;
@@ -180,7 +233,7 @@ for my $m(@{$options->{maps}})
        {
                my $previous_shaderlist = undef;
                my $shaderlist = "";
-               if(open my $fh, "<", "$XONOTICDIR/data/xonotic-maps.pk3dir/scripts/shaderlist.txt")
+               if(open my $fh, "<", "$XONOTICDIR/data/scripts/shaderlist.txt")
                {
                        while(<$fh>)
                        {
@@ -232,6 +285,14 @@ for my $m(@{$options->{maps}})
                                }
                        }
                };
+
+               if(defined $shaderlist_new)
+               {
+                       mkdir "$mapdir/scripts";
+                       open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
+                       print $fh $shaderlist_new;
+                       close $fh;
+               }
        }
 
        local $SIG{INT} = sub
@@ -243,20 +304,12 @@ for my $m(@{$options->{maps}})
 
        eval
        {
-               if(defined $shaderlist_new)
-               {
-                       mkdir "$mapdir/scripts";
-                       open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
-                       print $fh $shaderlist_new;
-                       close $fh;
-               }
-
                unlink <$m/lm_*>; # delete old external lightmaps
                q3map2 '-bsp', @{$options->{bsp}},   "$m.map"
                        or die "-bsp: $?";
                if($prescale != 1)
                {
-                       q3map2 '-scale', $prescale, "$m.bsp"
+                       q3map2 '-scale', @{$options->{scale}}, $prescale, "$m.bsp"
                                or die "-scale: $?";
                        rename "${m}_s.bsp", "$m.bsp"
                                or die "rename ${m}_s.bsp $m.bsp: $!";
@@ -296,7 +349,7 @@ for my $m(@{$options->{maps}})
 
                if($postscale != 1)
                {
-                       q3map2 '-scale', $postscale, "$m.bsp"
+                       q3map2 '-scale', @{$options->{scale}}, $postscale, "$m.bsp"
                                or die "-scale: $?";
                        rename "${m}_s.bsp", "$m.bsp"
                                or die "rename ${m}_s.bsp $m.bsp: $!";