X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler;h=5d3f8bca6343f5ef42d52ae9aaccfc0a37cffcb8;hp=9ae0cec16434d1d2b78f0a38acb0a449c3663a05;hb=e59ff76849434a6f245e3840cfd507fe2577acd9;hpb=75840126be47555c21064ffd8fbfdee34da5c3c5

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 9ae0cec1..5d3f8bca 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';
+	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
 
@@ -92,7 +92,7 @@ while(@ARGV)
 	elsif($_ eq '-scale')
 	{
 		$options->{scale} = (shift @ARGV) || 1;
-		$enterflags = 'scale';
+		#$enterflags = 'scale';
 	}
 	elsif($_ eq '-novis')
 	{
@@ -134,6 +134,16 @@ while(@ARGV)
 	{
 		$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')
@@ -183,14 +193,15 @@ sub q3map2(@)
 		or die "fork: $!";
 	if($pid) # parent
 	{
-		local $SIG{ALRM} = sub { kill $pid; };
+		local $SIG{ALRM} = sub { warn "SIGALRM caught\n"; kill TERM => $pid; };
 		alarm $timeout
 			if $timeout;
-		if(waitpid $pid, 0 != $pid)
+		if(waitpid($pid, 0) != $pid)
 		{
 			die "waitpid: did not return our child process $pid: $!";
 		}
-		return !$?;
+		alarm 0;
+		return ($? == 0);
 	}
 	else # child
 	{
@@ -204,25 +215,16 @@ $mapdir = "/" if $mapdir eq "";
 symlink "$mapdir", "$linkdir/data";
 
 my ($prescale, $postscale) = ($options->{scale} =~ /^([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";
@@ -308,13 +310,13 @@ for my $m(@{$options->{maps}})
 			or die "-bsp: $?";
 		if($prescale != 1)
 		{
-			q3map2 '-scale', @{$options->{scale}}, $prescale, "$m.bsp"
+			q3map2 '-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)
@@ -336,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', @{$options->{scale}}, $postscale, "$m.bsp"
+			q3map2 '-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";