summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2019-09-09 13:58:18 +0200
committerYorhel <git@yorhel.nl>2019-09-09 13:58:34 +0200
commit4759dde0e941bcdd8df373b629a1df238a311cf5 (patch)
tree3f99244826436ad571bc43936905ea7408c51209 /util
parent015e3ed49b3ab58c6c70d97e2836a4d11381a6a6 (diff)
spritegen.pl: Move compression to "make prod"
I think this is the last one. 'make' in a development environment is now beautifully fast and 'make prod' generates nicely small assets. (arguably we could have an even faster dev setup by not generating an icons.png in the first place, but then we'd need more code to differentiate between dev & prod, which is also a pain) This change does remove the "slow" option that would use the compressed image size in the optimization algorithm, but I hadn't used that option for a while anyway, it takes an hour and only saves about 100 bytes.
Diffstat (limited to 'util')
-rwxr-xr-xutil/spritegen.pl11
1 files changed, 1 insertions, 10 deletions
diff --git a/util/spritegen.pl b/util/spritegen.pl
index e8b60017..5b2b5982 100755
--- a/util/spritegen.pl
+++ b/util/spritegen.pl
@@ -1,7 +1,5 @@
#!/usr/bin/perl
-package VNDB;
-
use strict;
use warnings;
use Image::Magick;
@@ -9,7 +7,6 @@ use Cwd 'abs_path';
our $ROOT;
BEGIN { ($ROOT = abs_path $0) =~ s{/util/spritegen\.pl$}{}; }
-require $ROOT.'/data/global.pl';
my $path = "$ROOT/data/icons";
my $icons = "$ROOT/static/f/icons.png";
@@ -86,8 +83,7 @@ sub minstrip {
my($optsize, $w, $h, $optw, $opth) = (1e9, $maxwidth);
while($w >= $minwidth) {
($w, $h) = genstrip($w);
- # Optimize for file size rather than pixel count if slow is set
- my $size = $VNDB::SPRITEGEN{slow} ? img($w, $h) : $w*$h;
+ my $size = $w*$h;
if($size < $optsize) {
$optw = $w;
$opth = $h;
@@ -111,11 +107,6 @@ sub img {
print $img->Write("png32:$ticons");
undef $img;
- if($VNDB::SPRITEGEN{crush}) {
- `$VNDB::SPRITEGEN{crush} "$ticons" "$ticons~"`;
- rename "$ticons~", $ticons or die $!;
- }
-
my $size = -s $ticons;
#printf "Dim: %dx%d, size: %d, pixels wasted: %d\n", $w, $h, $size, $w*$h-$minpixels;
$size;