From b5d74b53a3da273fd03bc091ba0d5ce604fd9baf Mon Sep 17 00:00:00 2001 From: xenofem Date: Thu, 28 Jul 2022 17:26:09 -0400 Subject: [PATCH 1/5] add make target for numbers sampler --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 4aa46e4..22f60fc 100644 --- a/Makefile +++ b/Makefile @@ -11,5 +11,8 @@ build/%.svg: deck.asy cards.asy numerals.asy suits.asy nobles.asy $(foreach suit mkdir -p build sh -c "buf_size=5000000 asy -globalwrite deck.asy" +build/numbers.png: $(foreach card,$(cards),build/$(card).svg) + sh -c 'montage -density 100 -background transparent build/{1,2,3,4,5,6}-{blades,puppets,chairs,bread,cards,wheels}.svg -tile 6x6 -geometry +0+0 build/numbers.png' + build/%.png: build/%.svg convert -density 512 -background transparent $< $@ From e7c34ebd49275cc274c545e90e10e4cc01ac9b81 Mon Sep 17 00:00:00 2001 From: xenofem Date: Thu, 28 Jul 2022 18:14:15 -0400 Subject: [PATCH 2/5] adjust scaling and spacing on card elements slightly, make numerical suit icons bigger --- cards.asy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cards.asy b/cards.asy index b39f7fe..ab9ffa1 100644 --- a/cards.asy +++ b/cards.asy @@ -11,7 +11,7 @@ path corner = arc(((width/2 - corner_radius), (height/2 - corner_radius)), corne path card = corner--reverse(reflect((0,0), (0,1))*corner)--rotate(180)*corner--reverse(reflect((0,0), (1,0))*corner)--cycle; real scpx = 0.2; -real scpy = 0.35; +real scpy = 0.325; transform placements[][] = { // 0 @@ -39,13 +39,13 @@ transform placements[][] = { {}, {}, {}, {}, }; -real scale_factor = 0.15; +real scale_factor = 0.175; real one_scale_factor = 0.4; -real numeral_scale_factor = 0.15; -pair numeral_pos = (-width*0.38, height*0.4); -real indicator_scale_factor = 0.1; -pair indicator_pos = (-width*0.38, height*0.25); +real numeral_scale_factor = 0.125; +pair numeral_pos = (-width*0.4, height*0.4); +real indicator_scale_factor = 0.085; +pair indicator_pos = (-width*0.4, height*0.275); // note: if you bump this depth value to 4, you'll need to set // buf_size=5000000 so latex doesn't choke From 5d08d18678be44be5b797cf26f7d7218f3752b16 Mon Sep 17 00:00:00 2001 From: xenofem Date: Thu, 28 Jul 2022 18:16:11 -0400 Subject: [PATCH 3/5] replace numbers sample with full sample --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 22f60fc..76eb357 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,20 @@ -suits := puppets bread wheels blades chairs cards +suits := blades puppets chairs bread cards wheels values := 1 2 3 4 5 6 traveler knight wizard noble nobles := count-of-cards queen-of-puppets earl-of-bread scion-of-blades prince-of-wheels regent-of-chairs cards := $(foreach suit,$(suits),$(foreach value,$(values),$(value)-$(suit))) +svgcards := $(foreach card,$(cards),build/$(card).svg) +pngcards := $(foreach card,$(cards),build/$(card).png) -svgdeck: $(foreach card,$(cards),build/$(card).svg) +svgdeck: $(svgcards) -pngdeck: $(foreach card,$(cards),build/$(card).png) +pngdeck: $(pngcards) build/%.svg: deck.asy cards.asy numerals.asy suits.asy nobles.asy $(foreach suit,$(suits),$(suit).asy) $(foreach noble,$(nobles),$(noble).asy) mkdir -p build sh -c "buf_size=5000000 asy -globalwrite deck.asy" -build/numbers.png: $(foreach card,$(cards),build/$(card).svg) - sh -c 'montage -density 100 -background transparent build/{1,2,3,4,5,6}-{blades,puppets,chairs,bread,cards,wheels}.svg -tile 6x6 -geometry +0+0 build/numbers.png' +build/sample.png: $(svgcards) + montage -density 100 -background transparent $(svgcards) -tile 10x6 -geometry +0+0 build/sample.png build/%.png: build/%.svg convert -density 512 -background transparent $< $@ From ad4b24d415234a73cc4bfc887cf8893cf67608d4 Mon Sep 17 00:00:00 2001 From: xenofem Date: Thu, 28 Jul 2022 18:20:18 -0400 Subject: [PATCH 4/5] remove single-card from repo since we keep changing it without wanting to commit, it's just for local testing --- single-card.asy | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 single-card.asy diff --git a/single-card.asy b/single-card.asy deleted file mode 100644 index ca85bb0..0000000 --- a/single-card.asy +++ /dev/null @@ -1,22 +0,0 @@ -import "cards.asy" as cards; -import "numerals.asy" as numerals; -import "suits.asy" as suits; - -int suit = PUPPETS; -int value = 5; -filldraw(card, white, black); - -currentpen = evenodd+suit_colors[suit]; - -if (suit == CARDS && value == 1) { - // due to exponential growth, with the larger suit icon on the 1 - // card, the endpoint of the recursion is a *lot* more visible - fill(recursive_card(value, suit, 6)); -} else if (suit == CARDS && value > 6) { - // conversely, face cards don't need as much recursion depth - // because the only icons present are significantly smaller - fill(recursive_card(value, suit, 3)); -} else { - //fill(recursive_card(value, CARDS, 1), evenodd+lightgrey); - fill(recursive_card(value, suit); -} From 1f014aaad5edaa42cfcef8b9d4bd51042fc5903d Mon Sep 17 00:00:00 2001 From: xenofem Date: Thu, 28 Jul 2022 18:21:17 -0400 Subject: [PATCH 5/5] gitignore noop edit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d163863..567609b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -build/ \ No newline at end of file +build/