@aethervtt/shard-text 0.0.1 → 0.2.0

package/dist/fallback-font.d.ts

@@ -0,0 +1,7 @@
+import { Font } from './font.js';
+/**
+ * The engine's built-in fallback font (0061): printable ASCII from the gizmo label atlas (Inter at
+ * 13 px), what a font that failed to load draws with. Its coverage stands in for the distance field,
+ * so it reads cleanly near 13 px and softens when much larger; other characters show '?'.
+ */
+export declare function builtinFont(): Font;

package/dist/fallback-font.js

@@ -0,0 +1,48 @@
+import { LABEL_FONT, labelAtlas } from "@aethervtt/shard-render";
+import { Font } from "./font.js";
+function builtinFont() {
+  const f = LABEL_FONT;
+  const em = 13;
+  const atlas = labelAtlas();
+  const pixels = new Uint8Array(f.width * f.height * 4);
+  for (let i = 0; i < atlas.length; i++) {
+    const c = atlas[i];
+    pixels[i * 4] = c;
+    pixels[i * 4 + 1] = c;
+    pixels[i * 4 + 2] = c;
+    pixels[i * 4 + 3] = 255;
+  }
+  const glyph = (code) => {
+    const index = code - 32;
+    const col = index % f.columns;
+    const row = Math.floor(index / f.columns);
+    if (code === 32) return { u: code, a: f.advances[index] / em };
+    return {
+      u: code,
+      a: f.advances[index] / em,
+      b: [0, -(f.cellHeight - f.baseline) / em, f.cellWidth / em, f.baseline / em],
+      r: [col * f.cellWidth, row * f.cellHeight, f.cellWidth, f.cellHeight]
+    };
+  };
+  const glyphs = [];
+  for (let code = 32; code < 127; code++) glyphs.push(glyph(code));
+  const json = {
+    version: 1,
+    name: "shard-fallback",
+    size: em,
+    range: 1,
+    unitsPerEm: 1e3,
+    ascent: f.baseline / em,
+    descent: -(f.cellHeight - f.baseline) / em,
+    lineGap: 0,
+    pages: [{ width: f.width, height: f.height }],
+    glyphs,
+    notdef: { ...glyph(63), u: -1 },
+    kerning: [],
+    charset: "custom"
+  };
+  return Font.fromMetrics(json, { pixels: [pixels] });
+}
+export {
+  builtinFont
+};

package/dist/importer.js

@@ -11,6 +11,7 @@ import {
 } from "@aethervtt/shard-core";
 import { writeKtx2 } from "@aethervtt/shard-texture";
 import { buildFont } from "./build.js";
+import { builtinFont } from "./fallback-font.js";
 import { Font } from "./font.js";
 import { FontSource } from "./source.js";
 const FontImportSettings = defineSchema(
@@ -181,7 +182,9 @@ const FontAssetType = defineAssetType("Font", {
   update: (existing, next) => {
     existing.copyFrom(next);
     existing.linker?.link();
-  }
+  },
+  // A font that failed to load draws with the built-in one (0061).
+  fallback: () => builtinFont()
 });
 export {
   FontAssetType,

package/dist/index.d.ts

@@ -2,6 +2,7 @@ export { type PackItem, type PackResult, packRects, SkylinePacker } from '@aethe
 export { buildFont, type FontBuild, type FontBuildOptions, fontFromBytes } from './build.js';
 export { type CharsetName, charsetCodepoints } from './charset.js';
 export { Localized, SCREEN_CORNERS, ScreenText, TEXT_ALIGNS, Text } from './components.js';
+export { builtinFont } from './fallback-font.js';
 export { Font, type FontLoadOptions, type FontMetricsJson, FontPage, GLYPH_PADDING, Glyph, type GlyphJson, RUNTIME_PAGE_SIZE, } from './font.js';
 export { atlasLabel, FontAssetType, FontImporter, FontImportSettings, type FontImportSettingsValue, FontStore, Fonts, } from './importer.js';
 export { hasGposKerning, readGposKerning } from './kerning.js';

package/dist/index.js

@@ -2,6 +2,7 @@ import { packRects, SkylinePacker } from "@aethervtt/shard-texture";
 import { buildFont, fontFromBytes } from "./build.js";
 import { charsetCodepoints } from "./charset.js";
 import { Localized, SCREEN_CORNERS, ScreenText, TEXT_ALIGNS, Text } from "./components.js";
+import { builtinFont } from "./fallback-font.js";
 import {
   Font,
   FontPage,
@@ -105,6 +106,7 @@ export {
   atlasLabel,
   blitMsdf,
   buildFont,
+  builtinFont,
   charsetCodepoints,
   colorEdgesSimple,
   describeText,

package/dist/plugin.js

@@ -1,5 +1,12 @@
 import { Last } from "@aethervtt/shard-core";
-import { Gpu, Graph, RenderDescribers, RenderSet, Shaders } from "@aethervtt/shard-render";
+import {
+  addRenderFeatures,
+  Gpu,
+  Graph,
+  RenderDescribers,
+  RenderSet,
+  Shaders
+} from "@aethervtt/shard-render";
 import { definePlugin } from "@aethervtt/shard-runtime";
 import * as componentsModule from "./components.js";
 import * as importerModule from "./importer.js";
@@ -33,6 +40,12 @@ const textPlugin = definePlugin({
     for (const [path, source] of Object.entries(TEXT_SHADERS))
       shaders.register(path, source, `engine:${path}`);
     const graph = world.resource(Graph);
+    addRenderFeatures(world, {
+      name: "text",
+      description: "MSDF text in the world and on screen.",
+      nodes: ["text", "text/screen"],
+      baseline: { strategy: "Glyph and text records in data textures" }
+    });
     graph.addNode("text", textNode(world));
     graph.addNode("text/screen", screenTextNode(world));
     world.initResource(RenderDescribers).set("text", (w) => describeText(w));

package/dist/render.d.ts

@@ -1,6 +1,6 @@
 import { type Entity, type World } from '@aethervtt/shard-core';
 import { GpuBuffer, type GpuContext } from '@aethervtt/shard-gpu';
-import { type NodeDescriptor } from '@aethervtt/shard-render';
+import { DataStore, type NodeDescriptor } from '@aethervtt/shard-render';
 import type { Font, FontPage } from './font.js';
 import { TextLayout } from './layout.js';
 interface TextState {
@@ -44,8 +44,9 @@ export declare class TextStore {
     textCount: number;
     readonly groups: GlyphGroup[];
     groupCount: number;
-    readonly glyphBuffer: GpuBuffer;
-    readonly textBuffer: GpuBuffer;
+    /** Storage on the full tier, data textures on baseline (0064). */
+    readonly glyphBuffer: DataStore;
+    readonly textBuffer: DataStore;
     /** Layouts redone this frame, and characters nothing could draw. */
     relayouts: number;
     missing: number;

package/dist/render.js

@@ -6,6 +6,8 @@ import { GpuBuffer } from "@aethervtt/shard-gpu";
 import {
   ComputedVisibility,
   cameraOf,
+  DataStore,
+  dataEntry,
   GpuAssetsResource,
   RenderPhase,
   Shaders,
@@ -42,6 +44,7 @@ class TextStore {
   textCount = 0;
   groups = [];
   groupCount = 0;
+  /** Storage on the full tier, data textures on baseline (0064). */
   glyphBuffer;
   textBuffer;
   /** Layouts redone this frame, and characters nothing could draw. */
@@ -53,9 +56,8 @@ class TextStore {
   nextIndex = 0;
   dirtyGlyphs = true;
   constructor(gpu) {
-    const storage = GPUBufferUsage.STORAGE;
-    this.glyphBuffer = new GpuBuffer(gpu, { label: "text/glyphs", usage: storage, size: 4096 });
-    this.textBuffer = new GpuBuffer(gpu, { label: "text/records", usage: storage, size: 4096 });
+    this.glyphBuffer = new DataStore(gpu, { label: "text/glyphs", size: 4096 });
+    this.textBuffer = new DataStore(gpu, { label: "text/records", size: 4096 });
   }
   beginFrame() {
     this.frame++;
@@ -329,10 +331,7 @@ function caches(ctx) {
       }),
       data: gpu.layouts.bindGroupLayout({
         label: "text/data",
-        entries: [
-          { binding: 0, visibility: V | F, buffer: { type: "read-only-storage" } },
-          { binding: 1, visibility: V | F, buffer: { type: "read-only-storage" } }
-        ]
+        entries: [dataEntry(gpu, 0, V | F), dataEntry(gpu, 1, V | F)]
       }),
       page: gpu.layouts.bindGroupLayout({
         label: "text/page",
@@ -434,11 +433,11 @@ function drawText(ctx, space) {
     group(
       ctx,
       "text/data",
-      `${idOf(store.glyphBuffer.buffer)}/${idOf(store.textBuffer.buffer)}`,
+      `${idOf(store.glyphBuffer)}:${store.glyphBuffer.version}/${idOf(store.textBuffer)}:${store.textBuffer.version}`,
       c.layouts.data,
       () => [
-        { binding: 0, resource: { buffer: store.glyphBuffer.buffer } },
-        { binding: 1, resource: { buffer: store.textBuffer.buffer } }
+        { binding: 0, resource: store.glyphBuffer.resource() },
+        { binding: 1, resource: store.textBuffer.resource() }
       ]
     )
   );

package/dist/shaders.js

@@ -41,8 +41,8 @@ struct TextRecord {
 }
 
 @group(0) @binding(0) var<uniform> text_view: TextView;
-@group(1) @binding(0) var<storage, read> glyphs: array<Glyph>;
-@group(1) @binding(1) var<storage, read> texts: array<TextRecord>;
+@data @group(1) @binding(0) var<storage, read> glyphs: array<Glyph>;
+@data @group(1) @binding(1) var<storage, read> texts: array<TextRecord>;
 @group(2) @binding(0) var atlas: texture_2d<f32>;
 @group(2) @binding(1) var atlas_sampler: sampler;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aethervtt/shard-text",
-  "version": "0.0.1",
+  "version": "0.2.0",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -16,13 +16,13 @@
     "README.md"
   ],
   "dependencies": {
-    "@aethervtt/shard-assets": "0.0.1",
-    "@aethervtt/shard-core": "0.0.1",
-    "@aethervtt/shard-gpu": "0.0.1",
-    "@aethervtt/shard-render": "0.0.1",
-    "@aethervtt/shard-runtime": "0.0.1",
-    "@aethervtt/shard-texture": "0.0.1",
-    "@aethervtt/shard-transform": "0.0.1",
+    "@aethervtt/shard-assets": "0.2.0",
+    "@aethervtt/shard-core": "0.2.0",
+    "@aethervtt/shard-gpu": "0.2.0",
+    "@aethervtt/shard-render": "0.2.0",
+    "@aethervtt/shard-runtime": "0.2.0",
+    "@aethervtt/shard-texture": "0.2.0",
+    "@aethervtt/shard-transform": "0.2.0",
     "opentype.js": "^2.0.0"
   },
   "repository": {
@@ -35,6 +35,6 @@
     "provenance": true
   },
   "shard": {
-    "buildSha": "d6c5c6aef4675575c878b02cf2c8f738b4190229"
+    "buildSha": "32c22a3944ed23f5d1baa90bf7cc9fae724f5fd8"
   }
 }