X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler;h=d70eb371b3529fdc72df8439862f7cc207951090;hb=b9df0bb80d13b4aa250c0430104fb0504d39a075;hp=ae819b07f77905379c8eccca922d81c22f3e7971;hpb=c035255f5a4f394bdbe661d573a163856c37359d;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index ae819b07..d70eb371 100755
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -16,16 +16,16 @@ 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 -samples 3 -lightmapsize 512 -fast -fastbounce -dirty -bouncegrid';
 
 	# 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')
 	{
@@ -99,10 +106,44 @@ while(@ARGV)
 	{
 		$options->{minimap} = undef;
 	}
+	elsif($_ eq '-noshaderlist')
+	{
+		$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];
 	}
+	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')
@@ -138,9 +179,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 { 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!/[^/]*(?:$)!!;
@@ -171,60 +238,73 @@ for my $m(@{$options->{maps}})
 
 	my %shaders = map { m!/([^/.]*)\.shader(?:$)! ? ($1 => 1) : () } glob "../scripts/*.shader";
 
-	my $previous_shaderlist = undef;
-	my $shaderlist = "";
-	if(open my $fh, "<", "$XONOTICDIR/data/xonotic-maps.pk3dir/scripts/shaderlist.txt")
+	my $restore_shaderlist = sub { };
+	if(!$options->{noshaderlist})
 	{
-		while(<$fh>)
+		my $previous_shaderlist = undef;
+		my $shaderlist = "";
+		if(open my $fh, "<", "$XONOTICDIR/data/scripts/shaderlist.txt")
 		{
-			$shaderlist .= $_;
-		}
+			while(<$fh>)
+			{
+				$shaderlist .= $_;
+			}
 
-		# we may have to restore the file on exit
-		$previous_shaderlist = $shaderlist
-			if "$XONOTICDIR/data" eq $mapdir;
-	}
-	else
-	{
-		# possibly extract the shader list from a pk3?
-		local $ENV{N} = $XONOTICDIR;
-		$shaderlist = `cd "\$N" && for X in "\$N"/data/data*.pk3; do Y=\$X; done; unzip -p "\$Y" scripts/shaderlist.txt`;
-	}
+			# we may have to restore the file on exit
+			$previous_shaderlist = $shaderlist
+				if "$XONOTICDIR/data" eq $mapdir;
+		}
+		else
+		{
+			# possibly extract the shader list from a pk3?
+			local $ENV{N} = $XONOTICDIR;
+			$shaderlist = `cd "\$N" && for X in "\$N"/data/data*.pk3; do Y=\$X; done; unzip -p "\$Y" scripts/shaderlist.txt`;
+		}
 
-	my $shaderlist_new = "";
-	for(split /\r?\n|\r/, $shaderlist)
-	{
-		delete $shaders{$_};
-		$shaderlist_new .= "$_\n";
-	}
-	if(%shaders)
-	{
-		for(sort keys %shaders)
+		my $shaderlist_new = "";
+		for(split /\r?\n|\r/, $shaderlist)
 		{
+			delete $shaders{$_};
 			$shaderlist_new .= "$_\n";
 		}
-	}
-	else
-	{
-		$shaderlist_new = undef;
-	}
-
-	my $restore_shaderlist = sub
-	{
-		if(defined $shaderlist_new)
+		if(%shaders)
 		{
-			if(defined $previous_shaderlist)
+			for(sort keys %shaders)
 			{
-				open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
-				print $fh $previous_shaderlist;
-				close $fh;
+				$shaderlist_new .= "$_\n";
 			}
-			else
+		}
+		else
+		{
+			$shaderlist_new = undef;
+		}
+
+		$restore_shaderlist = sub
+		{
+			if(defined $shaderlist_new)
 			{
-				unlink "$mapdir/scripts/shaderlist.txt";
+				if(defined $previous_shaderlist)
+				{
+					open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
+					print $fh $previous_shaderlist;
+					close $fh;
+				}
+				else
+				{
+					unlink "$mapdir/scripts/shaderlist.txt";
+				}
 			}
+		};
+
+		if(defined $shaderlist_new)
+		{
+			mkdir "$mapdir/scripts";
+			open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
+			print $fh $shaderlist_new;
+			close $fh;
 		}
-	};
+	}
+
 	local $SIG{INT} = sub
 	{
 		print "SIGINT caught, cleaning up...\n";
@@ -234,20 +314,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: $!";
@@ -287,7 +359,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: $!";