# Path to Xonotic (where the data directory is in)
our $XONOTICDIR = getcwd();
- # Path to your q3map2 program. You find it in your GtkRadiant/install
+ # Path to your q3map2 program. You find it in your netradiant/build
# directory.
- our $Q3MAP2 = getcwd() . '/netradiant/install/q3map2';
+ our $Q3MAP2 = getcwd() . '/netradiant/build/q3map2';
# General flags for q3map2 (for example -threads 4)
our $Q3MAP2FLAGS = '-fs_forbiddenpath xonotic*-data*.pk3* -fs_forbiddenpath xonotic*-nexcompat*.pk3*';
our $VISFLAGS = '';
# Default flags for the -light stage
- our $LIGHTFLAGS = '-lightmapsearchpower 3 -deluxe -patchshadows -randomsamples -samples 4 -lightmapsize 512 -fast -fastbounce -dirty -bouncegrid -fill';
+ our $LIGHTFLAGS = '-lightmapsize 1024 -lightmapsearchpower 4 -deluxe -patchshadows -randomsamples -samples 4 -fast -fastbounce -dirty -bouncegrid -fill';
# Default flags for the -minimap stage
our $MINIMAPFLAGS = '';
# Default order of commands
- our $ORDER = 'vis,light';
+ our $ORDER = 'vis,light,scale';
# end of user changable part
}
}
-my ($prescale, $postscale) = ($options->{scalefactor} =~ /^([0-9.]+)(?::([0-9.]+))?$/);
-$prescale = 1 if not defined $prescale;
-$postscale = 1 if not defined $postscale;
+if ($options->{scalefactor} =~ /^([0-9.]+):([0-9.]+)$/)
+{
+ die "Two-scale isn't supported"
+ if $1 != 1 and $2 != 1;
+ $options->{scalefactor} = $1
+ if $2 == 1;
+ $options->{scalefactor} = $2
+ if $1 == 1;
+}
my $origcwd = getcwd();
for my $m(@{$options->{maps}})
$m =~ s/\.(?:map|bsp)$//;
- if($prescale != 1)
- {
- unshift @{$options->{bsp}}, "-keeplights";
- }
+ # never hurts, may help with rtlights
+ unshift @{$options->{bsp}}, "-keeplights";
local $SIG{INT} = sub
{
unlink <$m/lm_*>; # delete old external lightmaps
q3map2 '-bsp', @{$options->{bsp}}, "$m.map"
or die "-bsp: $?";
- if($prescale != 1)
- {
- 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/;
+ push @o, qw/vis scale light/;
my %o = ();
for(@o)
or die "-vis: $?";
}
}
- }
-
- if($postscale != 1)
- {
- 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($_ eq 'scale')
+ {
+ if ($options->{scalefactor} != 1)
+ {
+ q3map2 '-scale', @{$options->{scale}}, $options->{scalefactor}, "$m.bsp"
+ or die "-scale: $?";
+ rename "${m}_s.bsp", "$m.bsp"
+ or die "rename ${m}_s.bsp $m.bsp: $!";
+ }
+ }
}
if(defined $options->{minimap})