New style: none. Without shadows and full size.

This commit is contained in:
Florian Bantner 2013-10-07 09:33:30 +02:00
parent af3349a791
commit 366fced26b
8 changed files with 39 additions and 16 deletions

View file

@ -61,19 +61,26 @@ PHONY += $(SVG2SVG_EXTRA)
SVG2SVG_11 = scripts/build.pl --cmd svg2svg --res 512x512 --back back.png --fore fore.png --svgs svg/country-squared --mask 57x57+35x35+398x398 --geo 57x57+512x512 --geoscale 0.7775 SVG2SVG_11 = scripts/build.pl --cmd svg2svg --res 512x512 --back back.png --fore fore.png --svgs svg/country-squared --mask 57x57+35x35+398x398 --geo 57x57+512x512 --geoscale 0.7775
SVG2SVG_110 = scripts/build.pl --cmd svg2svg --res 512x512 --back back.png --fore fore.png --svgs svg/country-squared --mask 0x0+0x0+512x512 --geo 0x0+512x512 --geoscale 1
SVG2SVG_43 = scripts/build.pl --cmd svg2svg --res 1280x960 --back back.png --fore fore.png --svgs svg/country-4x3 --mask 107x107+67x67+1065x745 --geo 106x75+1280x960 --geoscale 1.667 SVG2SVG_43 = scripts/build.pl --cmd svg2svg --res 1280x960 --back back.png --fore fore.png --svgs svg/country-4x3 --mask 107x107+67x67+1065x745 --geo 106x75+1280x960 --geoscale 1.667
SVG2SVG_430 = scripts/build.pl --cmd svg2svg --res 1280x960 --back back.png --fore fore.png --svgs svg/country-4x3 --mask 0x0+0x0+1280x960 --geo 0x0+1280x960 --geoscale 2
SVGS_11 = $(shell cd svg/country-squared; ls -1 ??.svg) SVGS_11 = $(shell cd svg/country-squared; ls -1 ??.svg)
SVGS_11_FANCY = ${SVGS_11:%.svg=build/svg-country-squared-fancy/%.svg} SVGS_11_FANCY = ${SVGS_11:%.svg=build/svg-country-squared-fancy/%.svg}
SVGS_11_SIMPLE = ${SVGS_11:%.svg=build/svg-country-squared-simple/%.svg} SVGS_11_SIMPLE = ${SVGS_11:%.svg=build/svg-country-squared-simple/%.svg}
SVGS_11_FLAT = ${SVGS_11:%.svg=build/svg-country-squared-flat/%.svg} SVGS_11_FLAT = ${SVGS_11:%.svg=build/svg-country-squared-flat/%.svg}
SVGS_11_GLOSSY = ${SVGS_11:%.svg=build/svg-country-squared-glossy/%.svg} SVGS_11_GLOSSY = ${SVGS_11:%.svg=build/svg-country-squared-glossy/%.svg}
SVGS_11_NONE = ${SVGS_11:%.svg=build/svg-country-squared-none/%.svg}
PNGS_11_FANCY = ${SVGS_11:%.svg=build/png-country-squared-fancy/%.png} PNGS_11_FANCY = ${SVGS_11:%.svg=build/png-country-squared-fancy/%.png}
PNGS_11_SIMPLE = ${SVGS_11:%.svg=build/png-country-squared-simple/%.png} PNGS_11_SIMPLE = ${SVGS_11:%.svg=build/png-country-squared-simple/%.png}
PNGS_11_FLAT = ${SVGS_11:%.svg=build/png-country-squared-flat/%.png} PNGS_11_FLAT = ${SVGS_11:%.svg=build/png-country-squared-flat/%.png}
PNGS_11_GLOSSY = ${SVGS_11:%.svg=build/png-country-squared-glossy/%.png} PNGS_11_GLOSSY = ${SVGS_11:%.svg=build/png-country-squared-glossy/%.png}
PNGS_11_NONE = ${SVGS_11:%.svg=build/png-country-squared-none/%.png}
SVGS_43 = $(shell cd svg/country-4x3; ls -1 ??.svg) SVGS_43 = $(shell cd svg/country-4x3; ls -1 ??.svg)
@ -81,14 +88,16 @@ SVGS_42_FANCY = ${SVGS_43:%.svg=build/svg-country-4x2-fancy/%.svg}
SVGS_42_SIMPLE = ${SVGS_43:%.svg=build/svg-country-4x2-simple/%.svg} SVGS_42_SIMPLE = ${SVGS_43:%.svg=build/svg-country-4x2-simple/%.svg}
SVGS_42_FLAT = ${SVGS_43:%.svg=build/svg-country-4x2-flat/%.svg} SVGS_42_FLAT = ${SVGS_43:%.svg=build/svg-country-4x2-flat/%.svg}
SVGS_42_GLOSSY = ${SVGS_43:%.svg=build/svg-country-4x2-glossy/%.svg} SVGS_42_GLOSSY = ${SVGS_43:%.svg=build/svg-country-4x2-glossy/%.svg}
SVGS_42_NONE = ${SVGS_43:%.svg=build/svg-country-4x2-none/%.svg}
PNGS_42_FANCY = ${SVGS_43:%.svg=build/png-country-4x2-fancy/%.png} PNGS_42_FANCY = ${SVGS_43:%.svg=build/png-country-4x2-fancy/%.png}
PNGS_42_SIMPLE = ${SVGS_43:%.svg=build/png-country-4x2-simple/%.png} PNGS_42_SIMPLE = ${SVGS_43:%.svg=build/png-country-4x2-simple/%.png}
PNGS_42_FLAT = ${SVGS_43:%.svg=build/png-country-4x2-flat/%.png} PNGS_42_FLAT = ${SVGS_43:%.svg=build/png-country-4x2-flat/%.png}
PNGS_42_GLOSSY = ${SVGS_43:%.svg=build/png-country-4x2-glossy/%.png} PNGS_42_GLOSSY = ${SVGS_43:%.svg=build/png-country-4x2-glossy/%.png}
PNGS_42_NONE = ${SVGS_43:%.svg=build/png-country-4x2-none/%.png}
SVGS_11ALL=$(SVGS_11_FANCY) $(SVGS_11_SIMPLE) $(SVGS_11_FLAT) $(SVGS_11_GLOSSY) SVGS_11ALL=$(SVGS_11_FANCY) $(SVGS_11_SIMPLE) $(SVGS_11_FLAT) $(SVGS_11_GLOSSY) $(SVGS_11_NONE)
SVGS_42ALL=$(SVGS_42_FANCY) $(SVGS_42_SIMPLE) $(SVGS_42_FLAT) $(SVGS_42_GLOSSY) SVGS_42ALL=$(SVGS_42_FANCY) $(SVGS_42_SIMPLE) $(SVGS_42_FLAT) $(SVGS_42_GLOSSY) $(SVGS_42_NONE)
svgs: $(SVGS_11ALL) $(SVGS_42ALL) svgs: $(SVGS_11ALL) $(SVGS_42ALL)
$(Q)echo "Finished building svgs." $(Q)echo "Finished building svgs."
@ -117,6 +126,11 @@ build/svg-country-squared-glossy/%.svg: svg/country-squared/%.svg
--flag $(notdir ${<}) \ --flag $(notdir ${<}) \
--svg $(notdir ${<}) --svg $(notdir ${<})
build/svg-country-squared-none/%.svg: svg/country-squared/%.svg
$(Q)$(SVG2SVG_110) --out $(dir $@) \
--flag $(notdir ${<}) \
--svg $(notdir ${<})
## svg2svg 4x2 ## svg2svg 4x2
build/svg-country-4x2-fancy/%.svg: svg/country-4x3/%.svg build/svg-country-4x2-fancy/%.svg: svg/country-4x3/%.svg
$(Q)$(SVG2SVG_43) --out $(dir $@) \ $(Q)$(SVG2SVG_43) --out $(dir $@) \
@ -138,6 +152,11 @@ build/svg-country-4x2-glossy/%.svg: svg/country-4x3/%.svg
--flag $(notdir ${<}) \ --flag $(notdir ${<}) \
--svg $(notdir ${<}) --svg $(notdir ${<})
build/svg-country-4x2-none/%.svg: svg/country-4x3/%.svg
$(Q)$(SVG2SVG_430) --out $(dir $@) \
--flag $(notdir ${<}) \
--svg $(notdir ${<})
png-country-4x2: $(SVGS_42ALL) png-country-4x2: $(SVGS_42ALL)
$(Q)scripts/png-country-4x2.sh $(Q)scripts/png-country-4x2.sh

View file

@ -0,0 +1 @@
../common/4x2-back-empty.png

View file

@ -0,0 +1 @@
../common/4x2-back-empty.png

View file

@ -0,0 +1 @@
../common/squared-back-empty.png

View file

@ -0,0 +1 @@
../common/squared-back-empty.png

View file

@ -82,7 +82,7 @@ GetOptions(
); );
my $cmds = "help|svg2png|png2png|svg2svg|example"; my $cmds = "help|svg2png|png2png|svg2svg|example";
my $stys = "flat|simple|fancy|glossy"; my $stys = "none|flat|simple|fancy|glossy";
sub u { sub u {
my $app = $0; my $err = shift; my $app = $0; my $err = shift;
@ -406,13 +406,13 @@ if ($cmd eq "svg2svg") {
my ($mX, $mY, $mrX, $mrY, $mW, $mH) = my ($mX, $mY, $mrX, $mrY, $mW, $mH) =
$mask =~ m#(\d+)x(\d+)\+(\d+)x(\d+)\+(\d+)x(\d+)#; $mask =~ m#(\d+)x(\d+)\+(\d+)x(\d+)\+(\d+)x(\d+)#;
# print STDERR "mask: ".$mX."x".$mY."+".$mrX."x".$mrY."+".$mW."x".$mH."\n"; print STDERR "mask: ".$mX."x".$mY."+".$mrX."x".$mrY."+".$mW."x".$mH."\n";
if ($mX eq 0) {u("invalid mask: \"".$mask."\", x must be > 0.")} if ($mX lt 0) {u("invalid mask: \"".$mask."\", x must be >= 0.")}
if ($mY eq 0) {u("invalid mask: \"".$mask."\", y must be > 0.")} if ($mY lt 0) {u("invalid mask: \"".$mask."\", y must be >= 0.")}
if ($mrX eq 0){u("invalid mask: \"".$mask."\", rx must be > 0.")} if ($mrX lt 0){u("invalid mask: \"".$mask."\", rx must be >= 0.")}
if ($mrX eq 0){u("invalid mask: \"".$mask."\", ry must be > 0.")} if ($mrX lt 0){u("invalid mask: \"".$mask."\", ry must be >= 0.")}
if ($mX eq 0) {u("invalid mask: \"".$mask."\", width must be > 0.")} if ($mX lt 0) {u("invalid mask: \"".$mask."\", width must be >= 0.")}
if ($mX eq 0){u("invalid mask: \"".$mask."\", height must be > 0.")} if ($mX lt 0){u("invalid mask: \"".$mask."\", height must be >= 0.")}
if (!$geo) { if (!$geo) {
u("missing --geo [DxD+DxD], eg.: 77x77+1129x807."); u("missing --geo [DxD+DxD], eg.: 77x77+1129x807.");
@ -421,11 +421,11 @@ if ($cmd eq "svg2svg") {
my ($geoX, $geoY, $geoW, $geoH) = my ($geoX, $geoY, $geoW, $geoH) =
$geo =~ m#(\d+)x(\d+)\+(\d+)x(\d+)#; $geo =~ m#(\d+)x(\d+)\+(\d+)x(\d+)#;
if ($geoX eq 0) {u("invalid geo: \"".$geo."\", x must be >0.")} if ($geoX lt 0) {u("invalid geo: \"".$geo."\", x must be >= 0.")}
if ($geoY eq 0) {u("invalid geo: \"".$geo."\", y must be >0.")} if ($geoY lt 0) {u("invalid geo: \"".$geo."\", y must be >= 0.")}
if ($geoW eq 0) {u("invalid geo: \"".$geo."\", width must be >0.")} if ($geoW eq 0) {u("invalid geo: \"".$geo."\", width must be > 0.")}
if ($geoH eq 0) {u("invalid geo: \"".$geo."\", height must be >0.")} if ($geoH eq 0) {u("invalid geo: \"".$geo."\", height must be > 0.")}
if (!defined $geoScale) { if (!defined $geoScale) {
u("missing --geoscale [float], eg.: 0.781."); u("missing --geoscale [float], eg.: 0.781.");

View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
RESOS="640x480,320x240,160x120,80x60,40x30,20x15" RESOS="640x480,320x240,160x120,80x60,40x30,20x15"
STYLE="simple flat fancy glossy" STYLE="none simple flat fancy glossy"
for s in $STYLE; do for s in $STYLE; do
echo "Processing style $s .."; echo "Processing style $s ..";

View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
RESOS="512x512,256x256,128x128,96x96,72x72,64x64,48x48,36x36,32x32,24x24,16x16" RESOS="512x512,256x256,128x128,96x96,72x72,64x64,48x48,36x36,32x32,24x24,16x16"
STYLE="simple flat fancy glossy" STYLE="none simple flat fancy glossy"
for s in $STYLE; do for s in $STYLE; do
echo -n " $s"; echo -n " $s";