RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-04-01 22:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix shaderlist handling

Browse Source
This commit is contained in:
Rudolf Polzer 2013-06-23 18:07:37 +02:00
parent 1abf6f146b
commit 60738a5861
1 changed files with 5 additions and 59 deletions

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

@ -239,73 +239,19 @@ for my $m(@{$options->{maps}})
unshift @{$options->{bsp}}, "-keeplights"; unshift @{$options->{bsp}}, "-keeplights";
} }
my %shaders = map { m!/([^/.]*)\.shader(?:$)! ? ($1 => 1) : () } glob "../scripts/*.shader"; my %shaders = map { m!/([^/.]*)\.shader(?:$)! ? ($1 => 1) : () } glob "$mapdir/scripts/*.shader";
my $restore_shaderlist = sub { }; my $restore_shaderlist = sub { };
if(!$options->{noshaderlist}) if(!$options->{noshaderlist})
{ {
my $previous_shaderlist = undef; local $ENV{mapdir} = $mapdir;
my $shaderlist = ""; system 'cd $mapdir; make -C ../scripts shaderlist.txt';
if(open my $fh, "<", "$XONOTICDIR/data/scripts/shaderlist.txt")
{
while(<$fh>)
{
$shaderlist .= $_;
}
# we may have to restore the file on exit
$previous_shaderlist = $shaderlist
if "$XONOTICDIR/data" eq $mapdir;
}
else
{
# possibly extract the shader list from a pk3?
local $ENV{N} = $XONOTICDIR;
$shaderlist = `cd "\$N" && for X in "\$N"/data/data*.pk3; do Y=\$X; done; unzip -p "\$Y" scripts/shaderlist.txt`;
}
my $shaderlist_new = "";
for(split /\r?\n|\r/, $shaderlist)
{
delete $shaders{$_};
$shaderlist_new .= "$_\n";
}
if(%shaders)
{
for(sort keys %shaders)
{
$shaderlist_new .= "$_\n";
}
}
else
{
$shaderlist_new = undef;
}
$restore_shaderlist = sub $restore_shaderlist = sub
{ {
if(defined $shaderlist_new) local $ENV{mapdir} = $mapdir;
{ system 'cd $mapdir; git checkout ../scripts/shaderlist.txt';
if(defined $previous_shaderlist)
{
open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
print $fh $previous_shaderlist;
close $fh;
}
else
{
unlink "$mapdir/scripts/shaderlist.txt";
}
}
}; };
if(defined $shaderlist_new)
{
mkdir "$mapdir/scripts";
open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
print $fh $shaderlist_new;
close $fh;
}
} }
local $SIG{INT} = sub local $SIG{INT} = sub