RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-04-18 04:55:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify and fix xonotic-map-compiler for xonotic use

Browse Source
This commit is contained in:
Rudolf Polzer 2013-06-23 18:20:53 +02:00
parent 60738a5861
commit 92d375abed
1 changed files with 60 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
misc/tools/xonotic-map-compiler
View File

@ -106,10 +106,6 @@ while(@ARGV)
{ {
$options->{minimap} = undef; $options->{minimap} = undef;
} }
elsif($_ eq '-noshaderlist')
{
$options->{noshaderlist} = 1;
}
elsif($_ eq '-bsp_timeout') elsif($_ eq '-bsp_timeout')
{ {
$options->{bsp_timeout} = shift @ARGV; $options->{bsp_timeout} = shift @ARGV;
@ -222,16 +218,24 @@ sub q3map2(@)
} }
} }
(my $mapdir = getcwd()) =~ s!/[^/]*(?:$)!!;
$mapdir = "/" if $mapdir eq "";
symlink "$mapdir", "$linkdir/data";
my ($prescale, $postscale) = ($options->{scalefactor} =~ /^([0-9.]+)(?::([0-9.]+))?$/); my ($prescale, $postscale) = ($options->{scalefactor} =~ /^([0-9.]+)(?::([0-9.]+))?$/);
$prescale = 1 if not defined $prescale; $prescale = 1 if not defined $prescale;
$postscale = 1 if not defined $postscale; $postscale = 1 if not defined $postscale;
my $origcwd = getcwd();
for my $m(@{$options->{maps}}) for my $m(@{$options->{maps}})
{ {
chdir $origcwd
or die "chdir $origcwd: $!";
if($m =~ s!(.*)/!!)
{
my $predir = $1;
chdir $predir
or die "chdir $predir: $!";
}
symlink getcwd() . "/..", "$linkdir/data"
or die "symlink $linkdir/data: $!";
$m =~ s/\.(?:map|bsp)$//; $m =~ s/\.(?:map|bsp)$//;
if($prescale != 1) if($prescale != 1)
@ -239,88 +243,61 @@ for my $m(@{$options->{maps}})
unshift @{$options->{bsp}}, "-keeplights"; unshift @{$options->{bsp}}, "-keeplights";
} }
my %shaders = map { m!/([^/.]*)\.shader(?:$)! ? ($1 => 1) : () } glob "$mapdir/scripts/*.shader";
my $restore_shaderlist = sub { };
if(!$options->{noshaderlist})
{
local $ENV{mapdir} = $mapdir;
system 'cd $mapdir; make -C ../scripts shaderlist.txt';
$restore_shaderlist = sub
{
local $ENV{mapdir} = $mapdir;
system 'cd $mapdir; git checkout ../scripts/shaderlist.txt';
};
}
local $SIG{INT} = sub local $SIG{INT} = sub
{ {
print "SIGINT caught, cleaning up...\n"; print "SIGINT caught, cleaning up...\n";
$restore_shaderlist->();
exit 0; exit 0;
}; };
eval unlink <$m/lm_*>; # delete old external lightmaps
q3map2 '-bsp', @{$options->{bsp}}, "$m.map"
or die "-bsp: $?";
if($prescale != 1)
{ {
unlink <$m/lm_*>; # delete old external lightmaps q3map2 '-scale', @{$options->{scale}}, $prescale, "$m.bsp"
q3map2 '-bsp', @{$options->{bsp}}, "$m.map" or die "-scale: $?";
or die "-bsp: $?"; rename "${m}_s.bsp", "$m.bsp"
if($prescale != 1) or die "rename ${m}_s.bsp $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: $!";
}
my @o = @{$options->{order}};
push @o, qw/light vis/;
my %o = ();
for(@o)
{
next if $o{$_}++;
if($_ eq 'light')
{
if(defined $options->{light})
{
q3map2 '-light', @{$options->{light}}, "$m.map"
or die "-light: $?";
}
}
if($_ eq 'vis')
{
if(defined $options->{vis})
{
q3map2 '-vis', @{$options->{vis}}, "$m.map"
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(defined $options->{minimap})
{
q3map2 '-minimap', @{$options->{minimap}}, "$m.map"
or die "-minimap: $?";
}
unlink "$m.srf";
unlink "$m.prt";
$restore_shaderlist->();
1;
} }
or do my @o = @{$options->{order}};
push @o, qw/light vis/;
my %o = ();
for(@o)
{ {
$restore_shaderlist->(); next if $o{$_}++;
die $@; if($_ eq 'light')
}; {
if(defined $options->{light})
{
q3map2 '-light', @{$options->{light}}, "$m.map"
or die "-light: $?";
}
}
if($_ eq 'vis')
{
if(defined $options->{vis})
{
q3map2 '-vis', @{$options->{vis}}, "$m.map"
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(defined $options->{minimap})
{
q3map2 '-minimap', @{$options->{minimap}}, "$m.map"
or die "-minimap: $?";
}
unlink "$m.srf";
unlink "$m.prt";
} }