@flighthq/bitmapfont-formats 0.3.0-next.906.07cea63 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitmapFontFnt.d.ts","sourceRoot":"","sources":["../src/bitmapFontFnt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,
|
|
1
|
+
{"version":3,"file":"bitmapFontFnt.d.ts","sourceRoot":"","sources":["../src/bitmapFontFnt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EAKV,sBAAsB,EAGvB,MAAM,0BAA0B,CAAC;AAYlC,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,MAAM,CAwCtE;AAOD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,sBAAsB,CAAC,GAAG,UAAU,GAAG,IAAI,CAI9G"}
|
package/dist/bitmapFontFnt.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getBitmapFontMetrics } from '@flighthq/bitmapfont/contract';
|
|
1
|
+
import { getBitmapFontMetrics, unpackBitmapFontKerningKey } from '@flighthq/bitmapfont/contract';
|
|
2
2
|
import { buildBitmapFontFromRecord } from './bitmapFontRecord';
|
|
3
3
|
// Re-emits a `BitmapFont` as the classic AngelCode/BMFont text `.fnt` (`info`/`common`/`page`/`char`/
|
|
4
4
|
// `kerning` lines of `key=value` pairs). Lossless for the fields the model carries — the glyph table
|
|
@@ -12,7 +12,8 @@ export function formatBitmapFontFnt(font) {
|
|
|
12
12
|
const metrics = getBitmapFontMetrics(font);
|
|
13
13
|
const lineHeight = metrics.ascent + metrics.descent + metrics.lineGap;
|
|
14
14
|
const base = metrics.ascent;
|
|
15
|
-
const
|
|
15
|
+
const primaryTexture = font.pages[0]?.texture;
|
|
16
|
+
const primaryImage = primaryTexture?.dimension === '2d' ? primaryTexture.source : null;
|
|
16
17
|
const scaleW = primaryImage !== null ? primaryImage.width : 0;
|
|
17
18
|
const scaleH = primaryImage !== null ? primaryImage.height : 0;
|
|
18
19
|
const pageCount = Math.max(font.pages.length, 1);
|
|
@@ -33,9 +34,8 @@ export function formatBitmapFontFnt(font) {
|
|
|
33
34
|
lines.push(`kernings count=${kernKeys.length}`);
|
|
34
35
|
for (const key of kernKeys) {
|
|
35
36
|
const amount = font.kerning.get(key);
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
lines.push(`kerning first=${first} second=${second} amount=${amount}`);
|
|
37
|
+
unpackBitmapFontKerningKey(key, _kerningPair);
|
|
38
|
+
lines.push(`kerning first=${_kerningPair.left} second=${_kerningPair.right} amount=${amount}`);
|
|
39
39
|
}
|
|
40
40
|
return lines.join('\n') + '\n';
|
|
41
41
|
}
|
|
@@ -138,4 +138,7 @@ function readFntNumber(value) {
|
|
|
138
138
|
const parsed = Number(value);
|
|
139
139
|
return Number.isFinite(parsed) ? parsed : null;
|
|
140
140
|
}
|
|
141
|
+
// Scratch target for the kerning-key unpack in `formatBitmapFontFnt`'s emit loop — read and stringified
|
|
142
|
+
// before the next iteration overwrites it, so it never outlives one line.
|
|
143
|
+
const _kerningPair = { left: 0, right: 0 };
|
|
141
144
|
//# sourceMappingURL=bitmapFontFnt.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitmapFontFnt.js","sourceRoot":"","sources":["../src/bitmapFontFnt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"bitmapFontFnt.js","sourceRoot":"","sources":["../src/bitmapFontFnt.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flighthq/bitmapfont-formats",
|
|
3
|
-
"version": "0.3.0
|
|
3
|
+
"version": "0.3.0",
|
|
4
|
+
"author": "Joshua Granick and other contributors",
|
|
5
|
+
"license": "MIT",
|
|
4
6
|
"repository": {
|
|
5
7
|
"type": "git",
|
|
6
8
|
"url": "https://github.com/flighthq/flight.git",
|
|
@@ -36,9 +38,9 @@
|
|
|
36
38
|
"clean:dist": "tsx ../../scripts/clean-package-dist.ts"
|
|
37
39
|
},
|
|
38
40
|
"dependencies": {
|
|
39
|
-
"@flighthq/bitmapfont": "0.3.0
|
|
40
|
-
"@flighthq/types": "0.3.0
|
|
41
|
-
"@flighthq/xml": "0.3.0
|
|
41
|
+
"@flighthq/bitmapfont": "0.3.0",
|
|
42
|
+
"@flighthq/types": "0.3.0",
|
|
43
|
+
"@flighthq/xml": "0.3.0"
|
|
42
44
|
},
|
|
43
45
|
"devDependencies": {
|
|
44
46
|
"@flighthq/textureatlas": "*",
|
|
@@ -5,8 +5,8 @@ import {
|
|
|
5
5
|
getBitmapFontMetrics,
|
|
6
6
|
getBitmapFontPage,
|
|
7
7
|
} from '@flighthq/bitmapfont/contract';
|
|
8
|
-
import { createTextureAtlas } from '@flighthq/textureatlas/contract';
|
|
9
|
-
import type { BitmapFontParseOptions,
|
|
8
|
+
import { createTextureAtlas, createTextureAtlasFromImageResource } from '@flighthq/textureatlas/contract';
|
|
9
|
+
import type { BitmapFontParseOptions, Image, TextureAtlas } from '@flighthq/types/contract';
|
|
10
10
|
import { describe, expect, it } from 'vitest';
|
|
11
11
|
|
|
12
12
|
import { formatBitmapFontFnt, parseBitmapFontFnt } from './bitmapFontFnt';
|
|
@@ -32,6 +32,17 @@ const FNT_TEXT = [
|
|
|
32
32
|
'kerning first=65 second=86 amount=-2',
|
|
33
33
|
].join('\n');
|
|
34
34
|
|
|
35
|
+
const FNT_ASTRAL = [
|
|
36
|
+
'info face="Test" size=32 unicode=1',
|
|
37
|
+
'common lineHeight=32 base=26 scaleW=64 scaleH=64 pages=1 packed=0',
|
|
38
|
+
'page id=0 file="test_0.png"',
|
|
39
|
+
'chars count=2',
|
|
40
|
+
'char id=128512 x=0 y=0 width=7 height=8 xoffset=1 yoffset=0 xadvance=9 page=0 chnl=15',
|
|
41
|
+
'char id=65 x=8 y=0 width=6 height=8 xoffset=0 yoffset=0 xadvance=8 page=0 chnl=15',
|
|
42
|
+
'kernings count=1',
|
|
43
|
+
'kerning first=128512 second=65 amount=-3',
|
|
44
|
+
].join('\n');
|
|
45
|
+
|
|
35
46
|
describe('formatBitmapFontFnt', () => {
|
|
36
47
|
it('round-trips a parsed font through parse → format → parse', () => {
|
|
37
48
|
const options = pageOptions();
|
|
@@ -47,6 +58,20 @@ describe('formatBitmapFontFnt', () => {
|
|
|
47
58
|
expect(getBitmapFontMetrics(reparsed!)).toEqual(getBitmapFontMetrics(font!));
|
|
48
59
|
});
|
|
49
60
|
|
|
61
|
+
it('round-trips kerning for a supplementary-plane pair', () => {
|
|
62
|
+
// The round-trip alone cannot catch a wrong inverse if both sides share it, so this asserts the
|
|
63
|
+
// emitted codepoints directly: the pair a 16-bit unpack would truncate outright.
|
|
64
|
+
const options = pageOptions();
|
|
65
|
+
const font = parseBitmapFontFnt(FNT_ASTRAL, options);
|
|
66
|
+
expect(font).not.toBeNull();
|
|
67
|
+
|
|
68
|
+
const text = formatBitmapFontFnt(font!);
|
|
69
|
+
expect(text).toContain('kerning first=128512 second=65 amount=-3');
|
|
70
|
+
|
|
71
|
+
const reparsed = parseBitmapFontFnt(text, options);
|
|
72
|
+
expect(getBitmapFontKerning(reparsed!, 0x1f600, 65)).toBe(-3);
|
|
73
|
+
});
|
|
74
|
+
|
|
50
75
|
it('emits an empty page file reference (the atlas is a live resource, not a path)', () => {
|
|
51
76
|
const font = parseBitmapFontFnt(FNT_TEXT, pageOptions());
|
|
52
77
|
expect(formatBitmapFontFnt(font!)).toContain('page id=0 file=""');
|
|
@@ -99,10 +124,10 @@ describe('parseBitmapFontFnt', () => {
|
|
|
99
124
|
});
|
|
100
125
|
|
|
101
126
|
it('resolves every page of a multi-page font and routes each glyph to the right page image', () => {
|
|
102
|
-
const image0 = {} as
|
|
103
|
-
const image1 = {} as
|
|
104
|
-
const page0 =
|
|
105
|
-
const page1 =
|
|
127
|
+
const image0 = {} as Image;
|
|
128
|
+
const image1 = {} as Image;
|
|
129
|
+
const page0 = createTextureAtlasFromImageResource(image0);
|
|
130
|
+
const page1 = createTextureAtlasFromImageResource(image1);
|
|
106
131
|
const seen: Array<[number, string]> = [];
|
|
107
132
|
const font = parseBitmapFontFnt(FNT_MULTIPAGE, {
|
|
108
133
|
resolvePage: (id, file) => {
|