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 = '';
{
print <<EOF;
Usage:
-$0 mapname [-bsp bspflags...] [-vis visflags...] [-light lightflags...]
+$0 mapname [-bsp bspflags...] [-vis visflags...] [-light lightflags...] [-minimap minimapflags]
EOF
exit 1;
}
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';
elsif($_ eq '-scale')
{
$options->{scale} = (shift @ARGV) || 1;
+ $enterflags = 'scale';
}
elsif($_ eq '-novis')
{
{
$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];
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
+ {
+ if($timeout)
+ {
+ local $SIG{ALRM} = sub { kill $pid; };
+ alarm $timeout;
+ }
+ if(waitpid $pid, 0 != $pid)
+ {
+ die "waitpid: did not return our child process $pid: $!";
+ }
+ return !$?;
+ }
+ else # child
+ {
+ exec @args
+ or die "exec: $!";
+ }
}
(my $mapdir = getcwd()) =~ s!/[^/]*(?:$)!!;
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: $!";
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: $!";