Skip to content

Commit

Permalink
Remove some irrelevant assets, such as Iosevka Wide
Browse files Browse the repository at this point in the history
All of the removed assets can either be reproduced by calling `font.width(w).height(h).initBySize()` to make a font stretch, or were unused and inaccessible from DefaultResources anyway. The font in `DefaultResources.getCrispPrintFamily()` has been improved so the letters line up more smoothly; this was mostly the result of calling `.font().setUseIntegerPositions(false)` on the TextFamily, and this may be used again on other distance field and MSDF fonts.
  • Loading branch information
tommyettinger committed Dec 22, 2018
1 parent a575dd0 commit 3a8778c
Show file tree
Hide file tree
Showing 18 changed files with 139 additions and 13,697 deletions.
677 changes: 0 additions & 677 deletions assets/Inconsolata-LGC-Square.fnt

This file was deleted.

Binary file removed assets/Inconsolata-LGC-Square.png
Binary file not shown.
18 changes: 0 additions & 18 deletions assets/Iosevka-License.md
@@ -1,47 +1,29 @@
The font is licensed under SIL OFL Version 1.1.
This covers the files in this distribution, when present:
* Iosevka-Bold-msdf.png
* Iosevka-BoldOblique-msdf.png
* Iosevka-distance.png
* Iosevka-Family-distance.png
* Iosevka-Family-msdf.png
* Iosevka-Light-distance.png
* Iosevka-msdf.png
* Iosevka-Oblique-msdf.png
* Iosevka-Slab-Bold-msdf.png
* Iosevka-Slab-BoldOblique-msdf.png
* Iosevka-Slab-distance.png
* Iosevka-Slab-Family-distance.png
* Iosevka-Slab-Family-msdf.png
* Iosevka-Slab-Light-distance.png
* Iosevka-Slab-msdf.png
* Iosevka-Slab-Oblique-msdf.png
* Iosevka-Slab-Thin-distance.png
* Iosevka-Wide-distance.png
* Iosevka-Wide-Light-distance.png
* Iosevka-Wide-Slab-distance.png
* Iosevka-Wide-Slab-Light-distance.png
* Iosevka-Bold-msdf.fnt
* Iosevka-BoldOblique-msdf.fnt
* Iosevka-distance.fnt
* Iosevka-Family-distance.fnt
* Iosevka-Family-msdf.fnt
* Iosevka-Light-distance.fnt
* Iosevka-msdf.fnt
* Iosevka-Oblique-msdf.fnt
* Iosevka-Slab-Bold-msdf.fnt
* Iosevka-Slab-BoldOblique-msdf.fnt
* Iosevka-Slab-distance.fnt
* Iosevka-Slab-Family-distance.fnt
* Iosevka-Slab-Family-msdf.fnt
* Iosevka-Slab-Light-distance.fnt
* Iosevka-Slab-msdf.fnt
* Iosevka-Slab-Oblique-msdf.fnt
* Iosevka-Slab-Thin-distance.fnt
* Iosevka-Wide-distance.fnt
* Iosevka-Wide-Light-distance.fnt
* Iosevka-Wide-Slab-distance.fnt
* Iosevka-Wide-Slab-Light-distance.fnt

The support code is licensed under Berkeley Software Distribution license.
The support code is not included in this distribution. It was used to prepare the aforementioned files.
Expand Down
2,477 changes: 0 additions & 2,477 deletions assets/Iosevka-Slab-Thin-distance.fnt

This file was deleted.

Binary file removed assets/Iosevka-Slab-Thin-distance.png
Binary file not shown.
2,549 changes: 0 additions & 2,549 deletions assets/Iosevka-Wide-Light-distance.fnt

This file was deleted.

Binary file removed assets/Iosevka-Wide-Light-distance.png
Binary file not shown.
2,549 changes: 0 additions & 2,549 deletions assets/Iosevka-Wide-Slab-Light-distance.fnt

This file was deleted.

Binary file removed assets/Iosevka-Wide-Slab-Light-distance.png
Binary file not shown.
2,549 changes: 0 additions & 2,549 deletions assets/Iosevka-Wide-Slab-distance.fnt

This file was deleted.

Binary file removed assets/Iosevka-Wide-Slab-distance.png
Binary file not shown.
2,549 changes: 0 additions & 2,549 deletions assets/Iosevka-Wide-distance.fnt

This file was deleted.

Binary file removed assets/Iosevka-Wide-distance.png
Binary file not shown.
10 changes: 5 additions & 5 deletions assets/NotoSerif-Family-msdf.fnt
Expand Up @@ -75,20 +75,20 @@ char id=100 x=3038 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=15 page=
char id=101 x=3082 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=13 page=0 chnl=15
char id=102 x=3126 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=12 page=0 chnl=15
char id=103 x=3170 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=15 page=0 chnl=15
char id=104 x=3214 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=17 page=0 chnl=15
char id=104 x=3214 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=16 page=0 chnl=15
char id=105 x=3258 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=9 page=0 chnl=15
char id=106 x=3302 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=8 page=0 chnl=15
char id=107 x=3346 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=16 page=0 chnl=15
char id=108 x=3390 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=9 page=0 chnl=15
char id=109 x=3434 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=24 page=0 chnl=15
char id=110 x=3478 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=17 page=0 chnl=15
char id=109 x=3434 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=23 page=0 chnl=15
char id=110 x=3478 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=16 page=0 chnl=15
char id=111 x=3522 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=14 page=0 chnl=15
char id=112 x=3566 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=16 page=0 chnl=15
char id=113 x=3610 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=15 page=0 chnl=15
char id=114 x=3654 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=13 page=0 chnl=15
char id=114 x=3654 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=12 page=0 chnl=15
char id=115 x=3698 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=11 page=0 chnl=15
char id=116 x=3742 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=10 page=0 chnl=15
char id=117 x=3786 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=17 page=0 chnl=15
char id=117 x=3786 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=16 page=0 chnl=15
char id=118 x=3830 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=16 page=0 chnl=15
char id=119 x=3874 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=23 page=0 chnl=15
char id=120 x=3918 y=2 width=42 height=40 xoffset=0 yOffset=-1 xadvance=16 page=0 chnl=15
Expand Down
231 changes: 18 additions & 213 deletions squidlib/src/main/java/squidpony/squidgrid/gui/gdx/DefaultResources.java

Large diffs are not rendered by default.

30 changes: 17 additions & 13 deletions squidlib/src/test/java/squidpony/gdx/tests/FontTest.java
Expand Up @@ -54,15 +54,15 @@ public class FontTest extends ApplicationAdapter {
private SquidPanel[] displays;
private TextPanel<Color> text;
private ArrayList<TextPanel<Color>> texts;
private int index = 6;
private int index = 17;
private static final int ZOOM = 1;
@Override
public void create() {
batch = new SpriteBatch();
//widths = new int[]{100, 95, 90, 110, 95, 50, 125, 170, 200, 90};
//heights = new int[]{20, 21, 20, 28, 18, 20, 22, 25, 25, 25};
widths = new int[]{120, 160, 120, 160, 120, 50, 50, 100, 95, 90, 110, 120, 120, 120, 120, 105, 105, 105, 105, 130, 170, 200, 220};
heights = new int[]{22, 29, 22, 29, 24, 25, 25, 20, 21, 20, 28, 22, 22, 22, 22, 27, 27, 27, 27, 45, 25, 25, 25};
widths = new int[]{120, 160, 120, 160, 120, 50, 50, 100, 95, 90, 110, 120, 120, 120, 120, 130, 70, 70, 70, 105, 70, 200, 220};
heights = new int[]{22, 29, 22, 29, 24, 25, 25, 20, 21, 20, 28, 22, 22, 22, 22, 45, 25, 25, 25, 27, 27, 25, 25};
factories = new TextCellFactory[]{
DefaultResources.getCrispSlabFont().width(ZOOM * 14).height(28).initBySize(),
DefaultResources.getCrispSlabFamily().width(ZOOM * 14).height(28).initBySize(),
Expand All @@ -83,12 +83,12 @@ public void create() {
DefaultResources.getStretchableLeanFont().width(ZOOM * 13).height(21).initBySize(),
DefaultResources.getStretchableLeanLightFont().width(ZOOM * 13).height(21).initBySize(),

DefaultResources.getStretchableWideSlabFont().width(ZOOM * 15).height(21).initBySize(),
DefaultResources.getStretchableWideSlabLightFont().width(ZOOM * 15).height(21).initBySize(),
DefaultResources.getStretchableWideFont().width(ZOOM * 15).height(21).initBySize(),
DefaultResources.getStretchableWideLightFont().width(ZOOM * 15).height(21).initBySize(),
DefaultResources.getStretchableCodeJPFont().width(ZOOM * 21).height(ZOOM * 22).initBySize(),
DefaultResources.getStretchableOrbitFont().initBySize(),
DefaultResources.getCrispCurvySquareFont().width(ZOOM * 19).height(19).initBySize(),
DefaultResources.getCrispLeanFont().width(ZOOM * 19).height(19).initBySize(),
DefaultResources.getCrispSlabFont().width(ZOOM * 19).height(19).initBySize(),
DefaultResources.getGoFamily().width(ZOOM * 14).height(25).initBySize(),
DefaultResources.getCrispPrintFamily().initBySize(),
DefaultResources.getStretchablePrintFont().initBySize(),
DefaultResources.getStretchableCleanFont().initBySize(),
};
Expand Down Expand Up @@ -134,18 +134,22 @@ public void create() {
new SquidPanel(widths[13], heights[13], factories[13]).setTextSize(factories[13].width() + 2f * ZOOM, factories[13].height() + 2.75f * ZOOM),
new SquidPanel(widths[14], heights[14], factories[14]).setTextSize(factories[14].width() + 2f * ZOOM, factories[14].height() + 2.75f * ZOOM),
new SquidPanel(widths[15], heights[15], factories[15]).setTextSize(factories[15].width() + 2f * ZOOM, factories[15].height() + 2.75f * ZOOM),
new SquidPanel(widths[16], heights[16], factories[16]).setTextSize(factories[16].width() + 2f * ZOOM, factories[16].height() + 2.75f * ZOOM),
new SquidPanel(widths[17], heights[17], factories[17]).setTextSize(factories[17].width() + 2f * ZOOM, factories[17].height() + 2.75f * ZOOM),
new SquidPanel(widths[18], heights[18], factories[18]).setTextSize(factories[18].width() + 2f * ZOOM, factories[18].height() + 2.75f * ZOOM),
new SquidPanel(widths[16], heights[16], factories[16]).setTextSize(factories[16].width() + -1f * ZOOM, factories[16].height() + -1f * ZOOM),
new SquidPanel(widths[17], heights[17], factories[17]).setTextSize(factories[17].width() + 1f * ZOOM, factories[17].height() + 1f * ZOOM),
new SquidPanel(widths[18], heights[18], factories[18]).setTextSize(factories[18].width() + 1f * ZOOM, factories[18].height() + 1f * ZOOM),
new SquidPanel(widths[19], heights[19], factories[19]).setTextSize(factories[19].width() + 0f * ZOOM, factories[19].height() + 0f * ZOOM),
new SquidPanel(widths[20], heights[20], factories[20]).setTextSize(factories[20].width() + 1f * ZOOM, factories[20].height() + 2f * ZOOM),
new SquidPanel(widths[21], heights[21], factories[21]).setTextSize(factories[21].width() + 1f * ZOOM, factories[21].height() + 2f * ZOOM),
new SquidPanel(widths[22], heights[22], factories[22]).setTextSize(factories[22].width() + 1f * ZOOM, factories[22].height() + 2f * ZOOM),
};
final String[] samples = {"The quick brown fox jumps over the lazy dog.",
"HAMBURGEVONS",
"Black Sphinx Of Quartz: Judge Ye My Vow!"};
texts = new ArrayList<>(4);
"Black Sphinx Of Quartz: Judge Ye My Vow!",
"Sun Tzu said: In the practical art of war, the best thing of all is to take the enemy's country whole and intact; to shatter and destroy it is not so good.",
"So, too, it is better to recapture an army entire than to destroy it, to capture a regiment, a detachment or a company entire than to destroy them.",
"Hence to fight and conquer in all your battles is not supreme excellence; supreme excellence consists in breaking the enemy's resistance without fighting."
};
texts = new ArrayList<>(3);
text = new TextPanel<Color>(null, factories[factories.length - 3]);
text.init(totalWidth, totalHeight, Color.WHITE, samples);
texts.add(text);
Expand Down

0 comments on commit 3a8778c

Please sign in to comment.