X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler;h=92b7c5ce01fe79875725068a895e6725bcf3c9bf;hp=8b6cd4d59b32ce39eb3ce7eafec4b463a60caa4f;hb=97fe16d7d3bf7c97873cc5ef52730fee817a6f72;hpb=623a131a558d528a5ddc58ca580980ef8d4067db diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler index 8b6cd4d5..92b7c5ce 100755 --- 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 -bounce 8 -fastbounce -bouncegrid'; + 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 @@ -41,7 +41,7 @@ sub Usage() { print < [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 + scalefactor => 1, + bsp_timeout => 0, + vis_timeout => 0, + light_timeout => 0, + minimap_timeout => 0, + scale_timeout => 0 }; my $curmode = 'maps'; @@ -85,7 +91,8 @@ while(@ARGV) } elsif($_ eq '-scale') { - $options->{scale} = (shift @ARGV) || 1; + $options->{scalefactor} = @ARGV ? shift(@ARGV) : 1; + $enterflags = 'scale'; } elsif($_ eq '-novis') { @@ -103,10 +110,40 @@ 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->{scale_timeout} = shift @ARGV; + } elsif($_ eq '-order') { $options->{order} = [split /\s*,\s*/, shift @ARGV]; } + elsif($_ =~ /^--no(-.*)/) + { + if($curmode eq 'maps') + { + $curmode = 'bsp'; + } + my $flag = $1; + @{$options->{$curmode}} = grep { (($_ eq $flag) ... /^-/) !~ /^[0-9]+$/ } @{$options->{$curmode}}; + # so, e.g. --no-samplesize removes "-samplesize" and a following "3" + } elsif($_ =~ /^-(-.*)/) { if($curmode eq 'maps') @@ -142,35 +179,52 @@ 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 { warn "SIGALRM caught\n"; kill TERM => $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!/[^/]*(?:$)!!; $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"; @@ -180,7 +234,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>) { @@ -256,13 +310,13 @@ for my $m(@{$options->{maps}}) 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: $!"; } my @o = @{$options->{order}}; - push @o, qw/light vis minimap/; + push @o, qw/light vis/; my %o = (); for(@o) @@ -284,24 +338,22 @@ 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) { - 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: $!"; } + if(defined $options->{minimap}) + { + q3map2 '-minimap', @{$options->{minimap}}, "$m.map" + or die "-minimap: $?"; + } + unlink "$m.srf"; unlink "$m.prt";