@tileflow/core 0.1.0-alpha.40 → 0.1.0-alpha.41

package/dist/index.js

@@ -3802,19 +3802,19 @@ function deriveGlyph(glyph, metrics) {
   const bitmap = new Uint8Array(width * rows);
   for (let row = 0; row < rows; row++) {
     const y = y0 + row + 0.5;
-    for (let column = 0; column < width; column++) {
-      const x = x0 + column + 0.5;
+    for (let column2 = 0; column2 < width; column2++) {
+      const x = x0 + column2 + 0.5;
       const distance = Math.min(x - cell.x0, cell.x1 - x, y - cell.y0, cell.y1 - y);
       const background = Math.min(CELL_VALUE, Math.max(0, CELL_EDGE + CELL_SLOPE * distance));
       let letter = 0;
       if (hasBitmap) {
-        const sourceColumn = x0 + column - sourceX;
+        const sourceColumn = x0 + column2 - sourceX;
         const sourceRow = y0 + row - sourceY;
         if (sourceColumn >= 0 && sourceColumn < sourceWidth && sourceRow >= 0 && sourceRow < sourceHeight) {
           letter = glyph.bitmap[sourceRow * sourceWidth + sourceColumn];
         }
       }
-      bitmap[row * width + column] = Math.round(Math.max(letter, background));
+      bitmap[row * width + column2] = Math.round(Math.max(letter, background));
     }
   }
   return {
@@ -13573,6 +13573,12 @@ var tileflowModelParts = Object.freeze({
   accent: 3,
   roof: 4
 });
+var tileflowModelArchitecturalPartNames = Object.freeze(
+  Object.keys(tileflowModelParts)
+);
+function isTileflowModelPartName(value) {
+  return typeof value === "string" && value.length <= 32 && /^[a-z][a-z0-9]*(?:[-_][a-z0-9]+)*$/u.test(value);
+}
 var tileflowModelLightingRoles = Object.freeze({
   unclassified: 0,
   wall: 1,
@@ -13582,7 +13588,16 @@ var tileflowModelLightingRoles = Object.freeze({
   lamp: 5,
   logo: 6
 });
-var tileflowModelDefaultLightingRoles = Object.freeze([1, 1, 4, 1, 3]);
+var architecturalRoles = {
+  surface: 1,
+  secondary: 1,
+  glass: 4,
+  accent: 1,
+  roof: 3
+};
+function tileflowModelDefaultLightingRole(part) {
+  return Object.hasOwn(architecturalRoles, part) ? architecturalRoles[part] : tileflowModelLightingRoles.unclassified;
+}
 var tileflowModelLimits = Object.freeze({
   /** Levels of detail, nearest first. */
   levels: 3,
@@ -13599,7 +13614,9 @@ var tileflowModelLimits = Object.freeze({
   /** Models in one prepared file, as a landmark tile holds them. */
   models: 512,
   /** Bytes of one prepared file. */
-  bytes: 16 * 1024 * 1024
+  bytes: 16 * 1024 * 1024,
+  /** Differently named parts of one level. */
+  parts: 16
 });
 var tileflowModelVertexBytes = 16;
 function tileflowInsideRings(rings, px, py) {
@@ -13887,8 +13904,8 @@ function modelsOf(value) {
 function modelColorsOf(value) {
   if (!isRecord7(value)) return {};
   const colors = {};
-  for (const part of Object.keys(tileflowModelParts))
-    if (typeof value[part] === "string") colors[part] = value[part];
+  for (const [part, color3] of Object.entries(value))
+    if (isTileflowModelPartName(part) && typeof color3 === "string") colors[part] = color3;
   return Object.keys(colors).length > 0 ? { modelColors: colors } : {};
 }
 function landmarksOf(value) {
@@ -14317,7 +14334,7 @@ function limitError(message) {
   return new Error(site ? `${message} Called at ${site}.` : message);
 }
 function authoringCallSite(stack) {
-  const locations = (stack ?? "").split("\n").slice(1).map((line) => /\(?([^()\s]+?):(\d+):(\d+)\)?$/.exec(line.trim())).filter((match3) => match3 !== null).map(([, file, line, column]) => ({ file: file.replace(/^file:\/\//, ""), line, column }));
+  const locations = (stack ?? "").split("\n").slice(1).map((line) => /\(?([^()\s]+?):(\d+):(\d+)\)?$/.exec(line.trim())).filter((match3) => match3 !== null).map(([, file, line, column2]) => ({ file: file.replace(/^file:\/\//, ""), line, column: column2 }));
   const own = locations[0]?.file;
   const site = locations.find(({ file }) => file !== own && !file.startsWith("node:"));
   return site ? `${site.file}:${site.line}:${site.column}` : void 0;
@@ -17392,13 +17409,14 @@ var buildingsModuleSchema = z7.object({
         }).optional()
       }).strict()
     ).max(256).optional(),
-    modelColors: z7.object({
-      surface: themeColorValueSchema.optional(),
-      secondary: themeColorValueSchema.optional(),
-      glass: themeColorValueSchema.optional(),
-      accent: themeColorValueSchema.optional(),
-      roof: themeColorValueSchema.optional()
-    }).strict().optional(),
+    modelColors: z7.record(
+      z7.string().refine(isTileflowModelPartName, {
+        message: "A model part is named in lower-case words joined by hyphens or underscores, at most 32 characters."
+      }),
+      themeColorValueSchema
+    ).refine((colors) => Object.keys(colors).length <= 64, {
+      message: "A map colours at most 64 model parts."
+    }).optional(),
     landmarks: z7.union([
       z7.boolean(),
       z7.object({
@@ -20622,7 +20640,7 @@ function placedModels(value, served) {
     throw new Error(
       `The buildings module places missing 3D models: ${missing.join(", ")}. Add ${missing.map((id2) => `${id2}.glb`).join(
         ", "
-      )} to a map.models directory, with materials named surface, secondary, glass, accent or roof, and run the Node build so the directories are prepared.`
+      )} to a map.models directory, with each material named after its part, such as surface, glass, roof or water, and run the Node build so the directories are prepared.`
     );
   return {
     models: placements.map((entry) => ({
@@ -22949,17 +22967,17 @@ function parseBoundaryLookupCsv(text) {
       );
     }
     const row = {};
-    header.forEach((column, position) => {
+    header.forEach((column2, position) => {
       const cell = record4[position];
-      if (cell === "" || !lookupColumns.has(column)) return;
-      if (numericLookupColumns.has(column)) {
+      if (cell === "" || !lookupColumns.has(column2)) return;
+      if (numericLookupColumns.has(column2)) {
         const number = Number(cell);
         if (!Number.isSafeInteger(number)) {
-          throw new Error(`Boundaries lookup CSV row ${index + 2} has a non-integer ${column}.`);
+          throw new Error(`Boundaries lookup CSV row ${index + 2} has a non-integer ${column2}.`);
         }
-        row[column] = number;
+        row[column2] = number;
       } else {
-        row[column] = cell;
+        row[column2] = cell;
       }
     });
     if (row.class_tier !== void 0 && !isClassTier(row.class_tier)) {
@@ -25196,6 +25214,7 @@ function checkTileflowModelSurface(surface, vertices, indices) {
     const value = attributes[i];
     if (!Number.isFinite(value) || Math.abs(value) > 65536) fail("unbounded vertex attributes");
     if (i % 8 >= 4 && (value < 0 || value > 1)) fail("vertex RGBA must be zero to one");
+    if ((i % 8 === 2 || i % 8 === 3) && (value < 0 || value > 1)) fail("UV1 must be zero to one");
   }
   if (!Array.isArray(materials) || materials.length < 1 || materials.length > tileflowModelSurfaceLimits.materials)
     fail("material count exceeds the limit");
@@ -25277,7 +25296,7 @@ function checkTileflowModelSurface(surface, vertices, indices) {
       fail("emitter count exceeds the limit");
     for (const emitter of emitters) {
       if (!emitter || typeof emitter !== "object") fail("invalid area emitter");
-      if (!tuple(emitter.start, 3, -2e3, 2e3) || !tuple(emitter.end, 3, -2e3, 2e3) || !number(emitter.height, 0.01, 1e3) || emitter.depth !== void 0 && !number(emitter.depth, 0, 100) || !Object.hasOwn(tileflowModelLightingRoles, emitter.role) || !Object.hasOwn(tileflowModelParts, emitter.part))
+      if (!tuple(emitter.start, 3, -2e3, 2e3) || !tuple(emitter.end, 3, -2e3, 2e3) || !number(emitter.height, 0.01, 1e3) || emitter.depth !== void 0 && !number(emitter.depth, 0, 100) || !Object.hasOwn(tileflowModelLightingRoles, emitter.role) || !isTileflowModelPartName(emitter.part))
         fail("invalid area emitter");
       if (Math.hypot(emitter.end[0] - emitter.start[0], emitter.end[1] - emitter.start[1]) < 1e-3 || Math.abs(emitter.end[2] - emitter.start[2]) > 0.01)
         fail("an area emitter needs a horizontal lower edge");
@@ -25320,7 +25339,6 @@ var levelNames = ["near", "mid", "far"];
 var meshopt = "EXT_meshopt_compression";
 var quantisation = "KHR_mesh_quantization";
 var steps = 32767;
-var partCount2 = Object.keys(tileflowModelParts).length;
 var roleCount = Object.keys(tileflowModelLightingRoles).length;
 var modelId2 = /^[a-z0-9]+(?:-[a-z0-9]+)*$/u;
 var [glbMagic, jsonChunk, binChunk] = [1179937895, 1313821514, 5130562];
@@ -25459,20 +25477,33 @@ function encodeTileflowModels(models, compressor) {
       let surface;
       if (mesh.surface && level.attributes) {
         const attributes = level.attributes;
-        const data = new Uint8Array(
-          attributes.buffer,
-          attributes.byteOffset,
-          attributes.byteLength
-        );
-        const view = addView(data, level.count, 32, true);
         const uv = accessors.length;
+        const rest = new Float32Array(level.count * 6);
+        const second = new Uint16Array(level.count * 2);
+        for (let vertex = 0; vertex < level.count; vertex++) {
+          const at = vertex * 8;
+          rest.set([attributes[at], attributes[at + 1]], vertex * 6);
+          rest.set(attributes.subarray(at + 4, at + 8), vertex * 6 + 2);
+          second[vertex * 2] = Math.round(attributes[at + 2] * 65535);
+          second[vertex * 2 + 1] = Math.round(attributes[at + 3] * 65535);
+        }
+        const view = addView(new Uint8Array(rest.buffer), level.count, 24, true);
+        const lightmap = addView(new Uint8Array(second.buffer), level.count, 4, true);
         accessors.push(
-          { bufferView: view, byteOffset: 0, componentType: 5126, count: level.count, type: "VEC4" },
-          { bufferView: view, byteOffset: 16, componentType: 5126, count: level.count, type: "VEC4" }
+          { bufferView: view, byteOffset: 0, componentType: 5126, count: level.count, type: "VEC2" },
+          {
+            bufferView: lightmap,
+            byteOffset: 0,
+            componentType: 5123,
+            normalized: true,
+            count: level.count,
+            type: "VEC2"
+          },
+          { bufferView: view, byteOffset: 8, componentType: 5126, count: level.count, type: "VEC4" }
         );
         surface = {
-          version: 1,
-          attributes: [uv, uv + 1],
+          version: 2,
+          attributes: [uv, uv + 1, uv + 2],
           materials: mesh.surface.materials,
           textures: mesh.surface.textures.map(({ bytes, ...texture }) => ({
             ...texture,
@@ -25489,7 +25520,7 @@ function encodeTileflowModels(models, compressor) {
         mesh: meshes.length - 1,
         translation: [...level.centre],
         scale: [level.step, level.step, level.step],
-        ...surface ? { extras: { tileflow: { surface } } } : {}
+        extras: { tileflow: { parts: [...partNamesOf(mesh)], ...surface ? { surface } : {} } }
       });
     }
     roots.push(nodes.length);
@@ -25559,7 +25590,7 @@ async function decodeTileflowModels(buffer, decompressor) {
         if (source !== 0 || byteStride !== stride || count * byteStride !== length)
           throw new Error();
         if (filter !== void 0 && filter !== "NONE") throw new Error();
-        if (mode !== (stride > 4 ? "ATTRIBUTES" : "TRIANGLES")) throw new Error();
+        if (mode !== (view.target === 34963 ? "TRIANGLES" : "ATTRIBUTES")) throw new Error();
         out = new Uint8Array(length);
         decoder.decodeGltfBuffer(out, count, byteStride, slice(bin, byteOffset, byteLength), mode);
       } else {
@@ -25598,6 +25629,7 @@ async function decodeTileflowModels(buffer, decompressor) {
         }
         levels.push({
           vertices: level.vertices,
+          partNames: level.partNames,
           indices: level.indices,
           centre: level.centre,
           step: level.step,
@@ -25752,6 +25784,7 @@ function quantise(mesh, compressor) {
     ...low.map((value, axis) => Math.max(centre[axis] - value, high[axis] - centre[axis]))
   );
   const step2 = Math.max(reach, 1e-3) / steps;
+  const names = partNamesOf(mesh);
   const raw = new Uint8Array(count * tileflowModelVertexBytes);
   const view = new DataView(raw.buffer);
   for (let vertex = 0; vertex < count; vertex += 1) {
@@ -25773,12 +25806,12 @@ function quantise(mesh, compressor) {
     for (let axis = 0; axis < 3; axis += 1)
       view.setInt8(at + 8 + axis, clamp3(Math.round(normal[axis] * 127), -127, 127));
     const part = mesh.parts[vertex];
-    if (!Number.isInteger(part) || part < 0 || part >= partCount2)
+    if (!Number.isInteger(part) || part < 0 || part >= names.length)
       throw new RangeError(`Vertex ${vertex} has no part.`);
     raw[at + 12] = part;
     raw[at + 13] = Math.round((clamp3(mesh.shades[vertex], -1, 1) + 1) / 2 * 255);
     raw[at + 14] = Math.round(clamp3(mesh.occlusion[vertex], 0, 1) * 255);
-    const role = mesh.lightingRoles?.[vertex] ?? tileflowModelDefaultLightingRoles[part];
+    const role = mesh.lightingRoles?.[vertex] ?? tileflowModelDefaultLightingRole(names[part]);
     if (!Number.isInteger(role) || role < 0 || role >= roleCount)
       throw new RangeError(`Vertex ${vertex} has no lighting role.`);
     raw[at + 15] = role;
@@ -25861,6 +25894,10 @@ function checkModel(model) {
         throw new RangeError(`Every vertex of level ${at} needs a part, a shade and a light.`);
     if (level.lightingRoles && level.lightingRoles.length !== count)
       throw new RangeError(`Every vertex of level ${at} needs a lighting role.`);
+    if (!isPartNames(partNamesOf(level)))
+      throw new RangeError(
+        `Level ${at} names 1 to ${tileflowModelLimits.parts} different parts, each in lower-case words joined by hyphens or underscores.`
+      );
     if (level.surface) checkTileflowModelSurface(level.surface, count, level.indices.length);
     for (let index = 0; index < count; index += 1)
       for (let axis = 0; axis < 3; axis += 1) {
@@ -25949,6 +25986,9 @@ function readLevelNode(json, node2, name, viewBytes, hasLightingRoles) {
   const indexCount = index?.count;
   if (!width || index.type !== "SCALAR" || (index.byteOffset ?? 0) !== 0 || !Number.isInteger(indexCount) || indexCount < 3 || indexCount % 3 !== 0 || indexCount / 3 > tileflowModelLimits.triangles)
     throw new Error();
+  const own = node2.extras?.tileflow?.parts;
+  const partNames = own === void 0 ? tileflowModelArchitecturalPartNames : own;
+  if (!isPartNames(partNames)) throw new Error();
   const vertices = viewBytes(
     position.bufferView,
     tileflowModelVertexBytes,
@@ -25957,8 +25997,8 @@ function readLevelNode(json, node2, name, viewBytes, hasLightingRoles) {
   for (let vertex = 0; vertex < count; vertex += 1) {
     const at = vertex * tileflowModelVertexBytes;
     const part = vertices[at + 12];
-    if (part >= partCount2) throw new Error();
-    if (!hasLightingRoles) vertices[at + 15] = tileflowModelDefaultLightingRoles[part];
+    if (part >= partNames.length) throw new Error();
+    if (!hasLightingRoles) vertices[at + 15] = tileflowModelDefaultLightingRole(partNames[part]);
     else if (vertices[at + 15] >= roleCount) throw new Error();
   }
   const indexBytes = viewBytes(index.bufferView, width, indexCount * width);
@@ -25967,18 +26007,30 @@ function readLevelNode(json, node2, name, viewBytes, hasLightingRoles) {
   const physical = node2.extras?.tileflow?.surface;
   let surface;
   if (physical !== void 0) {
-    if (physical?.version !== 1 || !Array.isArray(physical.attributes) || physical.attributes.length !== 2)
+    if (physical?.version !== 2 || !Array.isArray(physical.attributes) || physical.attributes.length !== 3)
       throw new Error();
-    const uv = accessor(physical.attributes[0]);
-    const colour = accessor(physical.attributes[1]);
-    if (!uv || !colour || (uv.byteOffset ?? 0) !== 0 || colour.byteOffset !== 16 || uv.bufferView !== colour.bufferView || [uv, colour].some(
-      (value) => value.componentType !== 5126 || value.type !== "VEC4" || value.count !== count || value.normalized === true
-    ))
+    const [uv, lightmap, colour] = physical.attributes.map(accessor);
+    if (!uv || !lightmap || !colour || (uv.byteOffset ?? 0) !== 0 || colour.byteOffset !== 8 || (lightmap.byteOffset ?? 0) !== 0 || uv.bufferView !== colour.bufferView || uv.bufferView === lightmap.bufferView || uv.componentType !== 5126 || uv.type !== "VEC2" || colour.componentType !== 5126 || colour.type !== "VEC4" || lightmap.componentType !== 5123 || lightmap.type !== "VEC2" || lightmap.normalized !== true || [uv, lightmap, colour].some((value) => value.count !== count))
       throw new Error();
-    const attributeBytes = viewBytes(uv.bufferView, 32, count * 32);
+    const restBytes = viewBytes(uv.bufferView, 24, count * 24);
+    const lightmapBytes = viewBytes(lightmap.bufferView, 4, count * 4);
+    const rest = new Float32Array(
+      restBytes.buffer.slice(restBytes.byteOffset, restBytes.byteOffset + count * 24)
+    );
+    const second = new Uint16Array(
+      lightmapBytes.buffer.slice(lightmapBytes.byteOffset, lightmapBytes.byteOffset + count * 4)
+    );
+    const attributes = new Float32Array(count * 8);
+    for (let vertex = 0; vertex < count; vertex++) {
+      const at = vertex * 8;
+      attributes[at] = rest[vertex * 6];
+      attributes[at + 1] = rest[vertex * 6 + 1];
+      attributes[at + 2] = second[vertex * 2] / 65535;
+      attributes[at + 3] = second[vertex * 2 + 1] / 65535;
+      attributes.set(rest.subarray(vertex * 6 + 2, vertex * 6 + 6), at + 4);
+    }
     if (!Array.isArray(physical.textures) || physical.textures.length > 32) throw new Error();
-    surface = {
-      attributes: new Float32Array(attributeBytes.buffer, attributeBytes.byteOffset, count * 8),
+    const read = {
       materials: physical.materials,
       ranges: physical.ranges,
       textures: physical.textures.map((texture) => {
@@ -25989,10 +26041,12 @@ function readLevelNode(json, node2, name, viewBytes, hasLightingRoles) {
       }),
       ...physical.emitters === void 0 ? {} : { emitters: physical.emitters }
     };
-    checkTileflowModelSurface(surface, count, indexCount);
+    checkTileflowModelSurface({ ...read, attributes }, count, indexCount);
+    surface = { ...read, uv: column(attributes, 0), rgba: column(attributes, 4) };
   }
   return {
     vertices,
+    partNames: [...partNames],
     indices,
     centre: [centre[0], centre[1], centre[2]],
     step: scale[0],
@@ -26001,6 +26055,24 @@ function readLevelNode(json, node2, name, viewBytes, hasLightingRoles) {
     surface
   };
 }
+function column(attributes, first) {
+  const out = attributes.slice(first, first + 4);
+  for (let at = 8 + first; at < attributes.length; at += 8)
+    for (let component = 0; component < 4; component += 1)
+      if (attributes[at + component] !== out[component]) {
+        const all2 = new Float32Array(attributes.length / 2);
+        for (let vertex = 0; vertex < all2.length / 4; vertex += 1)
+          all2.set(attributes.subarray(vertex * 8 + first, vertex * 8 + first + 4), vertex * 4);
+        return all2;
+      }
+  return out;
+}
+function partNamesOf(mesh) {
+  return mesh.partNames ?? tileflowModelArchitecturalPartNames;
+}
+function isPartNames(names) {
+  return Array.isArray(names) && names.length >= 1 && names.length <= tileflowModelLimits.parts && names.every(isTileflowModelPartName) && new Set(names).size === names.length;
+}
 function readGlb(bytes) {
   if (bytes.byteLength < 20 || bytes.byteLength > tileflowModelLimits.bytes) throw new Error();
   const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
@@ -26150,8 +26222,7 @@ function validFootprint(footprint) {
 }
 function readTileflowLandmarkRegion(json) {
   if (!isRecord18(json)) return void 0;
-  const named = json.format === "tileflow-landmark-region-v2";
-  if (!named && json.format !== "tileflow-landmark-region-v1") return void 0;
+  if (json.format !== "tileflow-landmark-region-v2") return void 0;
   const region = json.region;
   if (json.zoom !== tileflowLandmarkTileZoom || !Array.isArray(region) || region.length !== 3 || region[0] !== tileflowLandmarkRegionZoom || !Array.isArray(json.tiles))
     return void 0;
@@ -26159,17 +26230,13 @@ function readTileflowLandmarkRegion(json) {
   if (!Number.isInteger(x) || !Number.isInteger(y)) return void 0;
   const tiles = [];
   for (const tile of json.tiles) {
-    if (!Array.isArray(tile) || tile.length !== (named ? 4 : 3)) return void 0;
+    if (!Array.isArray(tile) || tile.length !== 4) return void 0;
     const [tx, ty, hash, listed] = tile;
     if (!Number.isInteger(tx) || !Number.isInteger(ty) || typeof hash !== "string")
       return void 0;
     if (!sha256.test(hash)) return void 0;
     const [rx, ry] = tileflowLandmarkRegionOf([tx, ty]);
     if (rx !== x || ry !== y) return void 0;
-    if (!named) {
-      tiles.push([tx, ty, hash]);
-      continue;
-    }
     const landmarks = readLandmarks(listed, tx, ty);
     if (!landmarks) return void 0;
     tiles.push([tx, ty, hash, landmarks]);
@@ -26298,6 +26365,7 @@ export {
   isTileflowCompilationPhase,
   isTileflowIconSetSource,
   isTileflowLocalDirectory,
+  isTileflowModelPartName,
   isTileflowPortableId,
   isTileflowThemeName,
   isTileflowTimeOfDay,
@@ -26473,8 +26541,9 @@ export {
   tileflowMapDefaultMaxDepth,
   tileflowMapIdSchema,
   tileflowMaxPitch,
+  tileflowModelArchitecturalPartNames,
   tileflowModelContentType,
-  tileflowModelDefaultLightingRoles,
+  tileflowModelDefaultLightingRole,
   tileflowModelFileName,
   tileflowModelImageSize,
   tileflowModelLightingRoles,