support -scale flags

[xonotic/xonotic.git] / misc / tools / xonotic-map-compiler

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 3820aff435f1bb68db8bd3a2886f0c8613251e8c..e86fd887096f4de1a7338853c81286f4b3c55013 100755 (executable)
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -25,7 +25,7 @@ use File::Temp;
        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 = '';
@@ -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,6 +52,7 @@ 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
@@ -86,6 +87,7 @@ while(@ARGV)
        elsif($_ eq '-scale')
        {
                $options->{scale} = (shift @ARGV) || 1;
+               $enterflags = 'scale';
        }
        elsif($_ eq '-novis')
        {
@@ -180,7 +182,7 @@ for my $m(@{$options->{maps}})
        {
                my $previous_shaderlist = undef;
                my $shaderlist = "";
-               if(open my $fh, "<", "$XONOTICDIR/data/xonotic-maps.pk3dir/scripts/shaderlist.txt")
+               if(open my $fh, "<", "$XONOTICDIR/data/scripts/shaderlist.txt")
                {
                        while(<$fh>)
                        {
@@ -232,6 +234,14 @@ for my $m(@{$options->{maps}})
                                }
                        }
                };
+
+               if(defined $shaderlist_new)
+               {
+                       mkdir "$mapdir/scripts";
+                       open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
+                       print $fh $shaderlist_new;
+                       close $fh;
+               }
        }
 
        local $SIG{INT} = sub
@@ -243,20 +253,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: $!";
@@ -296,7 +298,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: $!";