abstract-3d 4.0.8 → 4.0.10

package/lib/renderers/three/viewer.js

@@ -0,0 +1,435 @@
+import { AmbientLight, DirectionalLight, Group, NeutralToneMapping, OrthographicCamera, PerspectiveCamera, Raycaster, Scene as ThreeScene, Vector3, } from "three";
+import { RoomEnvironment } from "three/addons/environments/RoomEnvironment.js";
+import { PMREMGenerator, WebGPURenderer } from "three/webgpu";
+import { isDisabled } from "./appearance.js";
+import { buildScene } from "./build.js";
+import { applyFit, fitCamera } from "./camera.js";
+import { compileScene } from "./compile.js";
+import { createRig } from "./controls.js";
+import { createGeometryCache } from "./geometry.js";
+import { createGizmo } from "./gizmo.js";
+import { createInput } from "./input.js";
+import { createTextureCache } from "./materials.js";
+import { getChanges } from "./options.js";
+import { createOverlayLayer, mountDirectly } from "./overlays.js";
+import { createRenderPath, createTierGovernor, getPixelRatio } from "./quality.js";
+import { createGlyphAtlas } from "./text.js";
+const defaultControls = { type: "smooth" };
+const origin = new Vector3();
+export function createViewer(container, initialOptions) {
+    const current = { options: initialOptions };
+    const opts = () => current.options;
+    if (getComputedStyle(container).position === "static") {
+        container.style.position = "relative";
+    }
+    const canvas = document.createElement("canvas");
+    // Absolutely positioned, so the canvas' own size never feeds back into the container's
+    Object.assign(canvas.style, { position: "absolute", inset: "0", display: "block", width: "100%", height: "100%", touchAction: "none" });
+    container.prepend(canvas);
+    const renderer = new WebGPURenderer({ canvas, antialias: true, alpha: true, forceWebGL: opts().backend !== "webgpu" });
+    renderer.toneMapping = NeutralToneMapping;
+    renderer.setClearColor(0x000000, 0);
+    const world = new ThreeScene();
+    const lights = new Group();
+    world.add(lights);
+    const cameras = { Perspective: new PerspectiveCamera(), Orthographic: new OrthographicCamera() };
+    const getCamera = () => cameras[opts().camera?.type ?? "Perspective"];
+    const geometries = createGeometryCache();
+    const glyphs = createGlyphAtlas();
+    const textures = createTextureCache();
+    const overlays = createOverlayLayer(container, (list) => (opts().onOverlays ?? mountDirectly)(list));
+    const raycaster = new Raycaster();
+    const size = { width: 0, height: 0 };
+    const rt = { governor: createTierGovernor(opts().quality ?? "auto"), ready: false, loaded: false, fitted: false, disposed: false, seconds: 0 };
+    const loop = { frame: 0, last: 0, wasMoving: false };
+    const stats = { frames: 0, frameMs: 0, drawCalls: 0, pickMs: 0, paintMs: 0 };
+    renderer.info.autoReset = false;
+    const invalidate = () => {
+        if (!loop.frame && rt.ready && !rt.disposed && size.width > 0 && size.height > 0) {
+            loop.frame = requestAnimationFrame(renderFrame);
+        }
+    };
+    const getStructure = () => ({ activeComponents: opts().activeComponents, relationsActive: opts().activeRelations !== undefined });
+    const getPaintState = () => ({
+        ...getStructure(),
+        selectedIds: opts().selectedIds,
+        hoveredIds: new Set(opts().hoveredIds),
+        hoveredTarget: input.hovered()?.key,
+        dimensionsClickable: opts().onClickGroup !== undefined,
+    });
+    const isInteractive = (item) => {
+        const target = rt.compiled.targets[rt.compiled.items[item].target];
+        switch (target.kind) {
+            case "group":
+                return target.id !== "" && !isDisabled(target, getStructure());
+            case "dimension":
+                return target.id !== undefined && opts().activeRelations === undefined && opts().onClickGroup !== undefined;
+            default:
+                return true;
+        }
+    };
+    const toEvent = (hit, nativeEvent) => ({
+        nativeEvent,
+        point: { x: hit.point.x, y: hit.point.y, z: hit.point.z },
+    });
+    const input = createInput(canvas, {
+        pick: (ndc) => {
+            const { built, compiled } = rt;
+            if (!built || !compiled) {
+                return undefined;
+            }
+            const start = performance.now();
+            raycaster.setFromCamera(ndc, getCamera());
+            const hits = raycaster.intersectObjects([...built.getPickables()], false);
+            stats.pickMs = performance.now() - start;
+            for (const hit of hits) {
+                const item = built.getPickedItem(hit);
+                if (item !== undefined && isInteractive(item)) {
+                    return { item, key: compiled.items[item].target, point: hit.point.clone() };
+                }
+            }
+            return undefined;
+        },
+        isPaused: () => rt.rig?.isDragging() ?? false,
+        onHover: (hit, previous, event) => {
+            const compiled = rt.compiled;
+            const isGroupLike = (h) => compiled.targets[h.key].kind !== "relation";
+            if (previous && isGroupLike(previous)) {
+                opts().onHoverGroup?.(undefined, undefined, undefined, toEvent(previous, event));
+            }
+            if (hit && isGroupLike(hit)) {
+                const target = compiled.targets[hit.key];
+                const item = compiled.items[hit.item];
+                const [id, rootData, data] = target.kind === "group" ? [target.id, target.rootData, item.data] : [target.kind === "dimension" ? target.id : undefined];
+                opts().onHoverGroup?.(id, rootData, data, toEvent(hit, event));
+            }
+            apply(new Set(["paint", "overlays"]));
+        },
+        onClick: (hit, event) => {
+            const compiled = rt.compiled;
+            const target = compiled.targets[hit.key];
+            switch (target.kind) {
+                case "group":
+                    opts().onClickGroup?.(target.id, target.rootData, compiled.items[hit.item].data, toEvent(hit, event));
+                    break;
+                case "dimension":
+                    opts().onClickGroup?.(target.id, undefined, undefined, toEvent(hit, event));
+                    break;
+                default:
+                    opts().onClickRelation?.(target.relation, toEvent(hit, event));
+            }
+        },
+        onContextMenu: (hit, event) => {
+            const compiled = rt.compiled;
+            const target = compiled.targets[hit.key];
+            const id = target.kind === "group" ? target.id : target.kind === "dimension" ? target.id : undefined;
+            if (id !== undefined) {
+                const [rootData, data] = target.kind === "group" ? [target.rootData, compiled.items[hit.item].data] : [];
+                opts().onContextMenuGroup?.(id, rootData, data, event.x, event.y, toEvent(hit, event));
+            }
+        },
+    });
+    /** Turns the camera to look from `direction`, at the same target and distance, or at the fitted scene when the gizmo resets zoom and pan */
+    const onGizmoClick = (direction) => {
+        const rig = rt.rig;
+        if (!rig) {
+            return;
+        }
+        const reset = rt.gizmo?.resetZoomAndPanOnClick ?? false;
+        const fit = reset ? fitScene() : undefined;
+        const target = reset ? origin.clone() : rig.getTarget(new Vector3());
+        const distance = fit?.distance ?? getCamera().position.distanceTo(target);
+        rig.setPose(target.clone().addScaledVector(direction, distance), target, true);
+    };
+    /** Fits the camera's projection to the scene, and returns the fit for placing the camera */
+    const fitScene = () => {
+        const scene = opts().scene;
+        const fit = scene &&
+            fitCamera({
+                view: opts().view ?? "front",
+                size: scene.size_deprecated,
+                camera: opts().camera ?? { type: "Perspective" },
+                canvas: size,
+                bufferZones: opts().bufferZones ?? {},
+                fitPadding: opts().fitPadding ?? 0,
+            });
+        if (fit) {
+            applyFit(fit, getCamera());
+        }
+        return fit;
+    };
+    /** Fits the projection, and moves the camera to look at the scene from the view */
+    const fitPose = (animate) => {
+        const fit = fitScene();
+        if (fit && rt.rig) {
+            const { x, y, z } = fit.direction;
+            rt.rig.setPose(new Vector3(x, y, z).multiplyScalar(fit.distance), origin, animate);
+            rt.fitted = true;
+        }
+    };
+    const isOrbit = () => opts().controls?.type === "orbit";
+    const createControls = () => {
+        const previous = rt.rig && { position: getCamera().position.clone(), target: rt.rig.getTarget(new Vector3()) };
+        rt.rig?.dispose();
+        const controls = opts().controls ?? defaultControls;
+        // The orbit callbacks are read when called, so new ones need no new controls
+        const live = controls.type === "orbit"
+            ? {
+                type: "orbit",
+                options: {
+                    ...controls.options,
+                    onStart: () => opts().controls?.options?.onStart?.(),
+                    onChange: () => opts().controls?.options?.onChange?.(),
+                    onEnd: () => opts().controls?.options?.onEnd?.(),
+                },
+            }
+            : controls;
+        rt.rig = createRig(live, getCamera(), canvas, invalidate);
+        if (previous) {
+            rt.rig.setPose(previous.position, previous.target, false);
+        }
+    };
+    const updateLights = () => {
+        lights.clear();
+        const scene = opts().scene;
+        const custom = opts().lights;
+        const objects = custom
+            ? typeof custom === "function"
+                ? scene
+                    ? custom(scene)
+                    : []
+                : custom
+            : scene
+                ? createDefaultLights(scene, opts().lightIntensity ?? 0.4)
+                : [];
+        objects.forEach((o) => lights.add(o));
+        const environment = opts().environment;
+        if (environment === "room" && !rt.environment && rt.ready) {
+            const pmrem = new PMREMGenerator(renderer);
+            rt.environment = pmrem.fromScene(new RoomEnvironment(), 0.04).texture;
+            pmrem.dispose();
+        }
+        world.environment = environment === "room" ? (rt.environment ?? null) : (environment ?? null);
+        world.environmentIntensity = opts().environmentIntensity ?? 1;
+    };
+    const updateOverlays = () => {
+        const { compiled } = rt;
+        const popovers = compiled
+            ? (opts().popovers ?? []).map((p) => ({
+                key: `popover:${p.id}`,
+                position: new Vector3(p.pos.x, p.pos.y, p.pos.z).applyMatrix4(compiled.matrix),
+                content: p.content,
+            }))
+            : [];
+        const hovered = input.hovered();
+        const target = hovered && compiled?.targets[hovered.key];
+        const tooltips = target?.kind === "group" && opts().getTooltips
+            ? opts().getTooltips(target.id).map((p) => ({
+                key: `tooltip:${p.id}`,
+                position: new Vector3(p.pos.x, p.pos.y, p.pos.z).applyMatrix4(compiled.roots[target.root]),
+                content: p.content,
+            }))
+            : [];
+        const fallback = opts().fallback;
+        const loading = !opts().scene || !rt.loaded;
+        overlays.set([...popovers, ...tooltips, ...(loading && fallback !== undefined ? [{ key: "fallback", content: fallback }] : [])]);
+    };
+    const updateQuality = () => {
+        rt.path?.dispose();
+        const tier = rt.governor.tier();
+        renderer.setPixelRatio(getPixelRatio(tier, window.devicePixelRatio));
+        const s = opts().scene?.size_deprecated;
+        rt.path = createRenderPath(renderer, world, getCamera(), tier, s ? Math.max(s.x, s.y, s.z) * 0.02 : 1);
+    };
+    const build = () => {
+        rt.built?.dispose();
+        rt.built = undefined;
+        if (!rt.compiled) {
+            return;
+        }
+        const built = buildScene(rt.compiled, {
+            structure: getStructure(),
+            activeRelations: opts().activeRelations,
+            geometries,
+            glyphs,
+            loadTexture: textures.load,
+            materialStateImages: opts().materialStateImages,
+            useAlphaTest: opts().useAlphaTest,
+            onTextureLoaded: invalidate,
+        });
+        rt.built = built;
+        world.add(built.root);
+        built.dimensions.visible = opts().showDimensions ?? true;
+        built.paint(getPaintState());
+        if (rt.ready) {
+            void renderer.compileAsync(world, getCamera()).then(() => {
+                rt.loaded = true;
+                apply(new Set(["overlays"]));
+            });
+        }
+    };
+    /** Redoes what the changes need, in dependency order */
+    function apply(changes) {
+        if (changes.has("compile")) {
+            const scene = opts().scene;
+            rt.compiled = scene ? compileScene(scene, { createGroupId: opts().createGroupId }) : undefined;
+            input.refresh();
+        }
+        if (changes.has("build")) {
+            build();
+        }
+        if (changes.has("camera")) {
+            const { near = 0.1, far = 2000, ...camera } = opts().camera ?? { type: "Perspective" };
+            Object.assign(getCamera(), { near, far }, "fov" in camera && camera.fov !== undefined ? { fov: camera.fov } : {});
+        }
+        if (changes.has("rig")) {
+            createControls();
+        }
+        // The orbit controls keep the r3f renderer's behavior of refitting only for a new camera or canvas size
+        if (changes.has("fit") || (changes.has("build") && !rt.fitted)) {
+            const reset = !rt.fitted || !isOrbit() || changes.has("camera");
+            if (reset) {
+                fitPose(rt.fitted);
+            }
+        }
+        if (changes.has("gizmo")) {
+            rt.gizmo?.dispose();
+            rt.gizmo = opts().gizmo && createGizmo(container, opts().gizmo, onGizmoClick);
+        }
+        if (changes.has("lights")) {
+            updateLights();
+        }
+        if (changes.has("quality") || changes.has("camera") || (changes.has("build") && !rt.path)) {
+            if (changes.has("quality")) {
+                rt.governor = createTierGovernor(opts().quality ?? "auto");
+            }
+            updateQuality();
+        }
+        if (changes.has("paint")) {
+            const start = performance.now();
+            rt.built?.paint(getPaintState());
+            stats.paintMs = performance.now() - start;
+        }
+        if (changes.has("dimensions") && rt.built) {
+            rt.built.dimensions.visible = opts().showDimensions ?? true;
+            input.refresh();
+        }
+        if (changes.has("overlays") || changes.has("build")) {
+            updateOverlays();
+        }
+        invalidate();
+    }
+    function renderFrame(now) {
+        const start = performance.now();
+        renderer.info.reset();
+        loop.frame = 0;
+        const interval = loop.last ? now - loop.last : 0;
+        const delta = Math.min(interval / 1000, 0.1);
+        loop.last = now;
+        const camera = getCamera();
+        const moving = rt.rig?.update(delta) ?? false;
+        if (moving && loop.wasMoving && rt.governor.record(interval)) {
+            updateQuality();
+        }
+        loop.wasMoving = moving;
+        const animated = rt.built?.animated ?? false;
+        if (animated) {
+            rt.seconds += delta;
+            rt.built.animate(rt.seconds);
+        }
+        camera.updateMatrixWorld();
+        rt.built?.cull(camera.position);
+        const fading = rt.loaded && rt.path ? rt.path.render(moving || animated) : false;
+        rt.gizmo?.update(camera);
+        overlays.update(camera, size.width, size.height);
+        Object.assign(stats, { frames: stats.frames + 1, frameMs: performance.now() - start, drawCalls: renderer.info.render.drawCalls });
+        if (moving || animated || fading) {
+            invalidate();
+        }
+        else {
+            loop.last = 0;
+        }
+    }
+    const resizeObserver = new ResizeObserver(([entry]) => {
+        if (!entry) {
+            return;
+        }
+        size.width = entry.contentRect.width;
+        size.height = entry.contentRect.height;
+        renderer.setSize(size.width, size.height, false);
+        // The orbit controls refit for a new canvas size, the smooth ones keep the camera where the user put it
+        if (isOrbit() || !rt.fitted) {
+            fitPose(false);
+        }
+        else {
+            fitScene();
+        }
+        invalidate();
+    });
+    const ready = renderer.init().then(() => {
+        if (rt.disposed) {
+            return;
+        }
+        rt.ready = true;
+        resizeObserver.observe(container);
+        apply(new Set(["compile", "build", "camera", "rig", "fit", "gizmo", "lights", "quality", "overlays"]));
+    });
+    updateOverlays();
+    return {
+        update: (partial) => {
+            const next = { ...current.options, ...partial };
+            const changes = getChanges(current.options, next);
+            current.options = next;
+            if (rt.ready) {
+                apply(changes);
+            }
+        },
+        fitView: (view, animate = true) => {
+            if (view) {
+                current.options = { ...current.options, view };
+            }
+            fitPose(animate);
+            invalidate();
+        },
+        invalidate,
+        ready: ready.then(() => undefined),
+        getStats: () => ({ ...stats, loaded: rt.loaded, tier: rt.governor.tier() }),
+        three: { renderer, scene: world, getCamera },
+        dispose: () => {
+            rt.disposed = true;
+            cancelAnimationFrame(loop.frame);
+            resizeObserver.disconnect();
+            input.dispose();
+            rt.rig?.dispose();
+            rt.gizmo?.dispose();
+            rt.path?.dispose();
+            rt.built?.dispose();
+            rt.environment?.dispose();
+            geometries.dispose();
+            glyphs.dispose();
+            textures.dispose();
+            overlays.dispose();
+            renderer.dispose();
+            canvas.remove();
+        },
+    };
+}
+/** The r3f renderer's lights: a strong ambient light, and directional lights around the scene */
+function createDefaultLights(scene, intensity) {
+    const c = scene.center_deprecated ?? { x: 0, y: 0, z: 0 };
+    const s = scene.size_deprecated;
+    const directional = (x, y, z, i) => {
+        const light = new DirectionalLight(0xffffff, i);
+        light.position.set(-c.x + x, -c.y + y, -c.z + z);
+        return light;
+    };
+    return [
+        new AmbientLight(0xffffff, 3.5),
+        directional(-1.5 * s.x, 1.5 * s.y, 0, intensity),
+        directional(0, 1 * s.y, 1.5 * s.z, intensity),
+        directional(2 * s.x, 0, 1.5 * s.z, intensity),
+        directional(-1.5 * s.x, 0, 0, 0.4),
+        directional(1.5 * s.x, 0, 0, 0.4),
+    ];
+}
+//# sourceMappingURL=viewer.js.map

package/lib/renderers/three/viewer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"viewer.js","sourceRoot":"","sources":["../../../src/renderers/three/viewer.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "abstract-3d",
-  "version": "4.0.8",
-  "gitHead": "c87c770fd3d2a4a0acda6804122085191489f0d7",
+  "version": "4.0.10",
+  "gitHead": "99287f6df246d91f10bd416e9188440bf59aee85",
   "description": "Abstract 3D",
   "license": "MIT",
   "author": "Divid AB <info@divid.se>",
@@ -60,7 +60,7 @@
   },
   "dependencies": {
     "@mapbox/tiny-sdf": "^2.3.0",
-    "abstract-image": "^13.3.5",
+    "abstract-image": "^13.3.6",
     "three-viewport-gizmo": "^2.2.0",
     "ts-exhaustive-check": "^1.0.0"
   },

package/src/renderers/three/build/parts.ts

@@ -21,7 +21,7 @@ import { LineSegments2 } from "three/addons/lines/LineSegments2.js";
 import { LineSegmentsGeometry } from "three/addons/lines/LineSegmentsGeometry.js";
 import type { Vec3 } from "../../../abstract-3d.js";
 import type { GlyphAtlas } from "../text/text.js";
-import { layoutText, SDF_EDGE } from "../text/text.js";
+import { layoutText, SDF_EDGE, SDF_RADIUS } from "../text/text.js";
 
 /** The drawn objects: solids of a material class in one batch, all text in one instanced mesh, lines per thickness, images as meshes; each item a slot */
 
@@ -80,13 +80,13 @@ export function createTextPart(entries: ReadonlyArray<TextEntry>, atlas: GlyphAt
   geometry.setAttribute("glyphRect", new InstancedBufferAttribute(Float32Array.from(quads.flatMap((q) => q.glyph.rect)), 4));
   const colors = new InstancedBufferAttribute(new Float32Array(quads.length * 4), 4);
   geometry.setAttribute("glyphColor", colors);
-  // Glyphs colored per instance, one draw call as troika's BatchedText; edges antialiased by the distance field's fwidth, as troika does
+  // Glyphs colored per instance, one draw call as troika's BatchedText; edges antialiased over one screen pixel, by the atlas texels per pixel
   const material = new ShaderMaterial({
     side: FrontSide,
     transparent: true,
     depthWrite: false,
     uniforms: { atlas: { value: atlas.texture } },
-    defines: { SDF_EDGE },
+    defines: { SDF_EDGE, SDF_RADIUS: SDF_RADIUS.toFixed(1), ATLAS_SIZE: atlas.size.toFixed(1) },
     vertexShader: textVertexShader,
     fragmentShader: textFragmentShader,
   });
@@ -264,9 +264,10 @@ uniform sampler2D atlas;
 varying vec2 vUv;
 varying vec4 vColor;
 void main() {
-  float distance = texture2D(atlas, vUv).r;
-  float edge = fwidth(distance) * 0.7;
-  gl_FragColor = vec4(vColor.rgb, vColor.a * smoothstep(SDF_EDGE - edge, SDF_EDGE + edge, distance));
+  vec2 texel = vUv * ATLAS_SIZE;
+  float texelsPerPixel = 0.5 * (length(dFdx(texel)) + length(dFdy(texel)));
+  float pixels = (texture2D(atlas, vUv).r - SDF_EDGE) * SDF_RADIUS / texelsPerPixel;
+  gl_FragColor = vec4(vColor.rgb, vColor.a * clamp(pixels + 0.5, 0.0, 1.0));
   #include <tonemapping_fragment>
   #include <colorspace_fragment>
 }`;

package/src/renderers/three/text/text.test.ts

@@ -2,7 +2,8 @@ import { describe, expect, it } from "vitest";
 import type { GlyphBitmap } from "./text.js";
 import { createGlyphAtlas, getGlyph, layoutText, RASTER_SIZE, SDF_BUFFER } from "./text.js";
 
-/** Glyphs of 20 px ink, 30 px of it above the baseline, a 24 px advance, filled with their char code */
+/** Glyphs of 20 px ink, 30 px of it above the baseline, a 24 px advance, filled with their char code; their bitmaps add the buffer around */
+const [bitmapWidth, bitmapHeight] = [20 + 2 * SDF_BUFFER, 40 + 2 * SDF_BUFFER];
 const rasterize = (char: string): GlyphBitmap => {
   const [glyphWidth, glyphHeight] = char === " " ? [0, 0] : [20, 40];
   const [width, height] = [glyphWidth + 2 * SDF_BUFFER, glyphHeight + 2 * SDF_BUFFER];
@@ -22,34 +23,35 @@ const round = (v: number): number => Math.round(v * 1e4) / 1e4;
 
 describe("getGlyph", () => {
   it("packs each glyph once, left to right, and writes its bitmap", () => {
-    const atlas = createGlyphAtlas(rasterize, 64);
+    const atlas = createGlyphAtlas(rasterize, 128);
     const a = getGlyph(atlas, "A");
     expect(getGlyph(atlas, "A")).toBe(a);
     const b = getGlyph(atlas, "B");
     const data = atlas.texture.image.data as Uint8Array;
-    expect([data[0], data[28]]).toEqual([65, 66]);
-    expect(a.rect.map(round)).toEqual([0, round(48 / 64), round(28 / 64), round(-48 / 64)]);
-    expect(b.rect[0]).toBe(28 / 64);
+    expect([data[0], data[bitmapWidth]]).toEqual([65, 66]);
+    expect(a.rect.map(round)).toEqual([0, round(bitmapHeight / 128), round(bitmapWidth / 128), round(-bitmapHeight / 128)]);
+    expect(b.rect[0]).toBe(bitmapWidth / 128);
   });
 
   it("starts a new row when a row is full", () => {
-    const atlas = createGlyphAtlas(rasterize, 128);
+    const size = 4 * bitmapWidth + 1;
+    const atlas = createGlyphAtlas(rasterize, size);
     ["A", "B", "C", "D"].forEach((char) => getGlyph(atlas, char));
-    expect(getGlyph(atlas, "E").rect.slice(0, 2)).toEqual([0, 96 / 128]);
+    expect(getGlyph(atlas, "E").rect.slice(0, 2)).toEqual([0, (2 * bitmapHeight) / size]);
   });
 
   it("gives glyphs their bitmap's position and size in em, from the pen at the baseline", () => {
-    expect(getGlyph(createGlyphAtlas(rasterize, 64), "A")).toMatchObject({
+    expect(getGlyph(createGlyphAtlas(rasterize, 128), "A")).toMatchObject({
       left: em(2 - SDF_BUFFER),
       top: em(30 + SDF_BUFFER),
-      width: em(28),
-      height: em(48),
+      width: em(bitmapWidth),
+      height: em(bitmapHeight),
       advance: em(24),
     });
   });
 
   it("leaves glyphs without ink out of the atlas", () => {
-    const atlas = createGlyphAtlas(rasterize, 64);
+    const atlas = createGlyphAtlas(rasterize, 128);
     expect(getGlyph(atlas, " ").width).toBe(0);
     expect(getGlyph(atlas, "A").rect[0]).toBe(0);
   });
@@ -59,18 +61,21 @@ describe("layoutText", () => {
   const atlas = createGlyphAtlas(rasterize, 256);
 
   it("centers a line on the origin", () => {
-    const advance = 24 + 0.001 * 40;
+    const advance = (em(24) + 0.001) * 40;
+    // A glyph's center is 12 px right of its pen: the ink's left at 2 plus half its 20
+    const center = em(12) * 40;
     const quads = layoutText(atlas, "AA", 40);
-    expect(quads.map((q) => round(q.x))).toEqual([round(-advance + 2 - SDF_BUFFER + 14), round(2 - SDF_BUFFER + 14)]);
+    expect(quads.map((q) => round(q.x))).toEqual([round(-advance + center), round(center)]);
     expect(quads.map((q) => [round(q.width), round(q.height)])).toEqual([
-      [28, 48],
-      [28, 48],
+      [round(em(bitmapWidth) * 40), round(em(bitmapHeight) * 40)],
+      [round(em(bitmapWidth) * 40), round(em(bitmapHeight) * 40)],
     ]);
   });
 
   it("stacks lines 1.5 font sizes apart, centered vertically as a block", () => {
-    // The block is 120 high; each baseline is half the 20 of leading and an ascent of 32 below its line's top, and the glyphs' centers 10 above it
-    expect(layoutText(atlas, "A\nA", 40).map((q) => round(q.y))).toEqual([28, -32]);
+    // The block is 120 high; each baseline is half the 20 of leading and an ascent of 32 below its line's top, and the glyphs' centers 10 px above it
+    const above = em(10) * 40;
+    expect(layoutText(atlas, "A\nA", 40).map((q) => round(q.y))).toEqual([round(18 + above), round(-42 + above)]);
   });
 
   it("skips glyphs without ink but keeps their advance", () => {

package/src/renderers/three/text/text.ts

@@ -7,8 +7,10 @@ import { DataTexture, LinearFilter, RedFormat, UnsignedByteType } from "three";
  * Textures and Special Effects", SIGGRAPH 2007)
  */
 
-export const RASTER_SIZE = 40;
-export const SDF_BUFFER = 4;
+export const RASTER_SIZE = 96;
+export const SDF_BUFFER = 8;
+/** The distance, in raster pixels, the distance field's values span */
+export const SDF_RADIUS = 24;
 /** The distance field's value at the glyph's edge, from tiny-sdf's default cutoff of 0.25 */
 export const SDF_EDGE = 0.75;
 const LINE_HEIGHT = 1.5;
@@ -50,7 +52,7 @@ export type GlyphQuad = {
 };
 
 /** Without `rasterize`, glyphs are rasterized with the OS's built-in Helvetica or Arial, on a canvas created at first use */
-export function createGlyphAtlas(rasterize?: Rasterize, size = 1024): GlyphAtlas {
+export function createGlyphAtlas(rasterize?: Rasterize, size = 2048): GlyphAtlas {
   const texture = new DataTexture(new Uint8Array(size * size), size, size, RedFormat, UnsignedByteType);
   Object.assign(texture, { minFilter: LinearFilter, magFilter: LinearFilter, generateMipmaps: false });
   return { texture, size, glyphs: new Map(), shelf: { x: 0, y: 0, height: 0 }, rasterize, sdf: {} };
@@ -63,7 +65,7 @@ export function getGlyph(atlas: GlyphAtlas, char: string): Glyph {
   }
   atlas.sdf.current ??= atlas.rasterize
     ? undefined
-    : new TinySDF({ fontSize: RASTER_SIZE, buffer: SDF_BUFFER, radius: 10, fontFamily: "Helvetica, Arial, sans-serif" });
+    : new TinySDF({ fontSize: RASTER_SIZE, buffer: SDF_BUFFER, radius: SDF_RADIUS, fontFamily: "Helvetica, Arial, sans-serif" });
   const bitmap = atlas.rasterize?.(char) ?? atlas.sdf.current!.draw(char);
   const rect = bitmap.width > 2 * SDF_BUFFER && bitmap.height > 2 * SDF_BUFFER ? packGlyph(atlas, bitmap) : undefined;
   const glyph: Glyph = {