our $Q3MAP2 = '/home/rpolzer/Games/Xonotic/netradiant/install/q3map2.x86';
# General flags for q3map2 (for example -threads 4)
- our $Q3MAP2FLAGS = '-fs_forbiddenpath xonotic-data.pk3 -fs_forbiddenpath xonotic-data.pk3dir -fs_forbiddenpath xonotic-nexcompat.pk3 -fs_forbiddenpath xonotic-nexcompat.pk3dir';
+ our $Q3MAP2FLAGS = '-fs_forbiddenpath xonotic*-data*.pk3* -fs_forbiddenpath xonotic*-nexcompat*.pk3*';
# Default flags for the -bsp stage
our $BSPFLAGS = '-meta -maxarea -samplesize 8 -mv 1000000 -mi 6000000';
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,
}
elsif($_ eq '-scale')
{
- $options->{scale} = (shift @ARGV) || 1;
- #$enterflags = 'scale';
+ $options->{scalefactor} = @ARGV ? shift(@ARGV) : 1;
+ $enterflags = 'scale';
}
elsif($_ eq '-novis')
{
}
elsif($_ eq '-scale_timeout')
{
- $options->{minimap_timeout} = shift @ARGV;
+ $options->{scale_timeout} = shift @ARGV;
}
elsif($_ eq '-order')
{
$options->{order} = [split /\s*,\s*/, shift @ARGV];
}
+ elsif($_ eq '-sRGB')
+ {
+ push @{$options->{bsp}}, "-sRGBtex", "-sRGBcolor";
+ push @{$options->{light}}, "-sRGBtex", "-sRGBcolor", "-sRGBlight"
+ if defined $options->{light};
+ }
+ elsif($_ eq '-nosRGB')
+ {
+ push @{$options->{bsp}}, "-nosRGBtex", "-nosRGBcolor";
+ push @{$options->{light}}, "-nosRGBtex", "-nosRGBcolor", "-nosRGBlight"
+ if defined $options->{light};
+ }
elsif($_ =~ /^--no(-.*)/)
{
if($curmode eq 'maps')
$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;
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: $!";