Description:
Add portraits.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
|
|
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
|
|
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
|
|
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
|
|
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
|
|
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
|
|
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
|
|
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
| @@ -29,7 +29,7 | |||||
|
|
29 | isometric-park-fna/Content/Portraits/converted/%.png: isometric-park-fna/Content/Portraits/%.jpg |
|
29 | isometric-park-fna/Content/Portraits/converted/%.png: isometric-park-fna/Content/Portraits/%.jpg |
|
|
30 | convert $< -resize 500x500\> -dither FloydSteinberg -colors 8 -colorspace gray $@ |
|
30 | convert $< -resize 500x500\> -dither FloydSteinberg -colors 8 -colorspace gray $@ |
|
|
31 |
|
31 | ||
|
|
32 | isometric-park-fna/Content/portraits.png: $(shell find -ipath "*isometric-park-fna/Content/Portraits/*.jpg" | sed "s/.jpg/.png/" | sed "s:Portraits/:Portraits/converted/:") |
|
32 | isometric-park-fna/Content/portraits.png: $(shell find -ipath "*isometric-park-fna/Content/Portraits/*.jpg" | sed "s/.jpg/.png/" | sed "s:Portraits/:Portraits/converted/:" |sort) |
|
|
33 | # isometric-park-fna/Content/Portraits/converted/%.png |
|
33 | # isometric-park-fna/Content/Portraits/converted/%.png |
|
|
34 | montage $^ -background transparent -geometry 300x400 -gravity north PNG8:isometric-park-fna/Content/portraits.png |
|
34 | montage $^ -background transparent -geometry 300x400 -gravity north PNG8:isometric-park-fna/Content/portraits.png |
|
|
35 |
|
35 | ||
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
| @@ -34,3 +34,41 | |||||
|
|
34 | Source: Bain Collection, Via Library of Congress |
|
34 | Source: Bain Collection, Via Library of Congress |
|
|
35 | Filename: 5926007035_9d728b1837_o.jpg |
|
35 | Filename: 5926007035_9d728b1837_o.jpg |
|
|
36 | Subjects: 1 |
|
36 | Subjects: 1 |
|
|
|
37 | - Description: The Library of Congress A good job in the air cleaner of an army truck, Fort Knox, Ky. This Negro soldier, who serves as truckdriver and mechanic, plays an important part in keeping army transport fleets in operation | ||
|
|
|
38 | Subject: Person | ||
|
|
|
39 | Source: Palmer, Alfred T.,, photographer. Library of Congress | ||
|
|
|
40 | Filename: 2179058835_9cac75b168_b_0.jpg | ||
|
|
|
41 | Subjects: 1 | ||
|
|
|
42 | - Description: Celia Coleman, Carman case | ||
|
|
|
43 | Subject: Person | ||
|
|
|
44 | Source: Bain News Service,, publisher. | ||
|
|
|
45 | Filename: 6266476956_ebe0fc24b6_b_0+1.jpg | ||
|
|
|
46 | Subjects: 1 | ||
|
|
|
47 | - Description: "Operating a hand drill at Vultee-Nashville, woman is working on a 'Vengeance' dive bomber, Tennessee" | ||
|
|
|
48 | Subject: Person | ||
|
|
|
49 | Source: Palmer, Alfred T.,, photographer. Library of Congress | ||
|
|
|
50 | Filename: 2179077437_1c7c89a5d3_b.jpg | ||
|
|
|
51 | Subjects: 1 | ||
|
|
|
52 | - Description: Unidentified African American Civil War veteran of G.A.R. Col. John W. Patterson Post no. 151 of Pittsburgh, Pennsylvania | ||
|
|
|
53 | Subject: Person | ||
|
|
|
54 | Source: Homann, Edward,, 1864-1941,, photographer. Library of Congress | ||
|
|
|
55 | Filename: 45797139001_cb708aaaf9_b.jpg | ||
|
|
|
56 | Subjects: 1 | ||
|
|
|
57 | - Description: "Negro boy near Cincinnati, Ohio" | ||
|
|
|
58 | Subject: Person | ||
|
|
|
59 | Source: Rous, John,, photographer. Library of Congress | ||
|
|
|
60 | Filename: 2179172498_8d9cd1e7a1_b.jpg | ||
|
|
|
61 | Subjects: 3 | ||
|
|
|
62 | - Description: New York, New York. A Harlem newsboy (LOC) | ||
|
|
|
63 | Subject: Person | ||
|
|
|
64 | Source: Parks, Gordon,, 1912-2006,, photographer. Library of Congress | ||
|
|
|
65 | Filename: 51132697122_347f0b8e74_b.jpg | ||
|
|
|
66 | URL: https://www.flickr.com/photos/library_of_congress/51132697122/ | ||
|
|
|
67 | Subjects: 1 | ||
|
|
|
68 | - Description: Washington, D.C. Laborer listening to instructions of wrecking company foreman on Independence Avenue | ||
|
|
|
69 | Subject: Person | ||
|
|
|
70 | Source: Parks, Gordon,, 1912-2006,, photographer. Library of Congress | ||
|
|
|
71 | Filename: 51132694567_22fa6559da_b.jpg | ||
|
|
|
72 | URL: https://www.flickr.com/photos/library_of_congress/51132694567/in/photostream/ | ||
|
|
|
73 | Subjects: 1 | ||
|
|
|
74 | |||
| @@ -930,14 +930,22 | |||||
|
|
930 | additionalInfo.Add("mouse delta", delta.ToString()); |
|
930 | additionalInfo.Add("mouse delta", delta.ToString()); |
|
|
931 |
|
931 | ||
|
|
932 | string entries = ""; |
|
932 | string entries = ""; |
|
|
|
933 | string descriptions = ""; | ||
|
|
933 | foreach (var pair in DialogSpawner.indexes) |
|
934 | foreach (var pair in DialogSpawner.indexes) |
|
|
934 | { |
|
935 | { |
|
|
935 |
entries += String.Format("{0}={1}, |
|
936 | entries += String.Format("{0}={1},", pair.Key, pair.Value); |
|
|
|
937 | } | ||
|
|
|
938 | |||
|
|
|
939 | foreach (var meta in portraitsMap.Metadata) | ||
|
|
|
940 | { | ||
|
|
|
941 | descriptions += String.Format("{0}: {1}\n", meta.Filename, | ||
|
|
|
942 | meta.Description); | ||
|
|
936 | } |
|
943 | } |
|
|
937 |
|
944 | ||
|
|
938 | additionalInfo.Add("Tracery Test", this.output); |
|
945 | additionalInfo.Add("Tracery Test", this.output); |
|
|
939 | additionalInfo.Add("Log Entry", string.Format("{0} {1}", Logging.entries[Logging.entries.Count-1].level, Logging.entries[Logging.entries.Count-1].message)); |
|
946 | additionalInfo.Add("Log Entry", string.Format("{0} {1}", Logging.entries[Logging.entries.Count-1].level, Logging.entries[Logging.entries.Count-1].message)); |
|
|
940 | additionalInfo.Add("Dialog entries", entries); |
|
947 | additionalInfo.Add("Dialog entries", entries); |
|
|
|
948 | additionalInfo.Add("Metadata entries", descriptions); | ||
|
|
941 |
|
949 | ||
|
|
942 | debugWindow.Layout(debugInfo, additionalInfo, ref show_another_window); |
|
950 | debugWindow.Layout(debugInfo, additionalInfo, ref show_another_window); |
|
|
943 |
|
951 | ||
You need to be logged in to leave comments.
Login now