@loaders.gl/terrain 3.1.3 → 3.1.7

package/dist/dist.min.js

@@ -323,12 +323,12 @@
     }
     edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));
     const outsideEdges = [];
-    let index = 1;
+    let index = 0;
     while (index < edges.length) {
-      if (edges[index][0] === edges[index - 1][1] && edges[index][1] === edges[index - 1][0]) {
+      if (edges[index][0] === edges[index + 1]?.[1] && edges[index][1] === edges[index + 1]?.[0]) {
         index += 2;
       } else {
-        outsideEdges.push(edges[index - 1]);
+        outsideEdges.push(edges[index]);
         index++;
       }
     }
@@ -1062,9 +1062,12 @@
     return { vertices, triangles };
   }
   async function loadTerrain(arrayBuffer, options, context) {
-    options.image = options.image || {};
-    options.image.type = "data";
-    const image = await context.parse(arrayBuffer, options, options.baseUri);
+    const loadImageOptions = {
+      ...options,
+      mimeType: "application/x.image",
+      image: { ...options.image, type: "data" }
+    };
+    const image = await context.parse(arrayBuffer, loadImageOptions);
     return getMesh(image, options.terrain);
   }
   var init_parse_terrain = __esm({
@@ -1095,8 +1098,8 @@
         module: "terrain",
         version: VERSION,
         worker: true,
-        extensions: ["png", "pngraw"],
-        mimeTypes: ["image/png"],
+        extensions: ["png", "pngraw", "jpg", "jpeg", "gif", "webp", "bmp"],
+        mimeTypes: ["image/png", "image/jpeg", "image/gif", "image/webp", "image/bmp"],
         options: {
           terrain: {
             tesselator: "auto",

package/dist/es5/lib/helpers/skirt.js

@@ -52,13 +52,15 @@ function getOutsideEdgesFromTriangles(triangles) {
     return Math.min.apply(Math, (0, _toConsumableArray2.default)(a)) - Math.min.apply(Math, (0, _toConsumableArray2.default)(b)) || Math.max.apply(Math, (0, _toConsumableArray2.default)(a)) - Math.max.apply(Math, (0, _toConsumableArray2.default)(b));
   });
   var outsideEdges = [];
-  var index = 1;
+  var index = 0;
 
   while (index < edges.length) {
-    if (edges[index][0] === edges[index - 1][1] && edges[index][1] === edges[index - 1][0]) {
+    var _edges, _edges2;
+
+    if (edges[index][0] === ((_edges = edges[index + 1]) === null || _edges === void 0 ? void 0 : _edges[1]) && edges[index][1] === ((_edges2 = edges[index + 1]) === null || _edges2 === void 0 ? void 0 : _edges2[0])) {
       index += 2;
     } else {
-      outsideEdges.push(edges[index - 1]);
+      outsideEdges.push(edges[index]);
       index++;
     }
   }

package/dist/es5/lib/helpers/skirt.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/helpers/skirt.ts"],"names":["addSkirt","attributes","triangles","skirtHeight","outsideIndices","outsideEdges","getOutsideEdgesFromIndices","POSITION","value","getOutsideEdgesFromTriangles","newPosition","constructor","length","newTexcoord0","TEXCOORD_0","newTriangles","i","edge","updateAttributesForNewEdge","edgeIndex","resultTriangles","Array","concat","edges","push","sort","a","b","Math","min","max","index","indices","position","westIndices","eastIndices","southIndices","northIndices","indexGroup","positionsLength","vertex1Offset","vertex2Offset","set","subarray","triangle1Offset"],"mappings":"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","sourcesContent":["import {concatenateTypedArrays} from '@loaders.gl/loader-utils';\n\nexport type EdgeIndices = {\n  westIndices: number[];\n  northIndices: number[];\n  eastIndices: number[];\n  southIndices: number[];\n};\n\n/**\n * Add skirt to existing mesh\n * @param {object} attributes - POSITION and TEXCOOD_0 attributes data\n * @param {any} triangles - indices array of the mesh geometry\n * @param skirtHeight - height of the skirt geometry\n * @param outsideIndices - edge indices from quantized mesh data\n * @returns - geometry data with added skirt\n */\nexport function addSkirt(attributes, triangles, skirtHeight: number, outsideIndices?: EdgeIndices) {\n  const outsideEdges = outsideIndices\n    ? getOutsideEdgesFromIndices(outsideIndices, attributes.POSITION.value)\n    : getOutsideEdgesFromTriangles(triangles);\n\n  // 2 new vertices for each outside edge\n  const newPosition = new attributes.POSITION.value.constructor(outsideEdges.length * 6);\n  const newTexcoord0 = new attributes.TEXCOORD_0.value.constructor(outsideEdges.length * 4);\n\n  // 2 new triangles for each outside edge\n  const newTriangles = new triangles.constructor(outsideEdges.length * 6);\n\n  for (let i = 0; i < outsideEdges.length; i++) {\n    const edge = outsideEdges[i];\n\n    updateAttributesForNewEdge({\n      edge,\n      edgeIndex: i,\n      attributes,\n      skirtHeight,\n      newPosition,\n      newTexcoord0,\n      newTriangles\n    });\n  }\n\n  attributes.POSITION.value = concatenateTypedArrays(attributes.POSITION.value, newPosition);\n  attributes.TEXCOORD_0.value = concatenateTypedArrays(attributes.TEXCOORD_0.value, newTexcoord0);\n  const resultTriangles =\n    triangles instanceof Array\n      ? triangles.concat(newTriangles)\n      : concatenateTypedArrays(triangles, newTriangles);\n\n  return {\n    attributes,\n    triangles: resultTriangles\n  };\n}\n\n/**\n * Get geometry edges that located on a border of the mesh\n * @param {any} triangles - indices array of the mesh geometry\n * @returns {number[][]} - outside edges data\n */\nfunction getOutsideEdgesFromTriangles(triangles) {\n  const edges: number[][] = [];\n  for (let i = 0; i < triangles.length; i += 3) {\n    edges.push([triangles[i], triangles[i + 1]]);\n    edges.push([triangles[i + 1], triangles[i + 2]]);\n    edges.push([triangles[i + 2], triangles[i]]);\n  }\n\n  edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));\n\n  const outsideEdges: number[][] = [];\n  let index = 1;\n  while (index < edges.length) {\n    if (edges[index][0] === edges[index - 1][1] && edges[index][1] === edges[index - 1][0]) {\n      index += 2;\n    } else {\n      outsideEdges.push(edges[index - 1]);\n      index++;\n    }\n  }\n  return outsideEdges;\n}\n\n/**\n * Get geometry edges that located on a border of the mesh\n * @param {object} indices - edge indices from quantized mesh data\n * @param {TypedArray} position - position attribute geometry data\n * @returns {number[][]} - outside edges data\n */\nfunction getOutsideEdgesFromIndices(indices: EdgeIndices, position) {\n  // Sort skirt indices to create adjacent triangles\n  indices.westIndices.sort((a, b) => position[3 * a + 1] - position[3 * b + 1]);\n  // Reverse (b - a) to match triangle winding\n  indices.eastIndices.sort((a, b) => position[3 * b + 1] - position[3 * a + 1]);\n  indices.southIndices.sort((a, b) => position[3 * b] - position[3 * a]);\n  // Reverse (b - a) to match triangle winding\n  indices.northIndices.sort((a, b) => position[3 * a] - position[3 * b]);\n\n  const edges: number[][] = [];\n  for (const index in indices) {\n    const indexGroup = indices[index];\n    for (let i = 0; i < indexGroup.length - 1; i++) {\n      edges.push([indexGroup[i], indexGroup[i + 1]]);\n    }\n  }\n  return edges;\n}\n\n/**\n * Get geometry edges that located on a border of the mesh\n * @param {object} args\n * @param {number[]} args.edge - edge indices in geometry\n * @param {number} args.edgeIndex - edge index in outsideEdges array\n * @param {object} args.attributes - POSITION and TEXCOORD_0 attributes\n * @param {number} args.skirtHeight - height of the skirt geometry\n * @param {TypedArray} args.newPosition - POSITION array for skirt data\n * @param {TypedArray} args.newTexcoord0 - TEXCOORD_0 array for skirt data\n * @param {TypedArray | Array} args.newTriangles - trinagle indices array for skirt data\n * @returns {void}\n */\nfunction updateAttributesForNewEdge({\n  edge,\n  edgeIndex,\n  attributes,\n  skirtHeight,\n  newPosition,\n  newTexcoord0,\n  newTriangles\n}) {\n  const positionsLength = attributes.POSITION.value.length;\n  const vertex1Offset = edgeIndex * 2;\n  const vertex2Offset = edgeIndex * 2 + 1;\n\n  // Define POSITION for new 1st vertex\n  newPosition.set(\n    attributes.POSITION.value.subarray(edge[0] * 3, edge[0] * 3 + 3),\n    vertex1Offset * 3\n  );\n  newPosition[vertex1Offset * 3 + 2] = newPosition[vertex1Offset * 3 + 2] - skirtHeight; // put down elevation on the skirt height\n\n  // Define POSITION for new 2nd vertex\n  newPosition.set(\n    attributes.POSITION.value.subarray(edge[1] * 3, edge[1] * 3 + 3),\n    vertex2Offset * 3\n  );\n  newPosition[vertex2Offset * 3 + 2] = newPosition[vertex2Offset * 3 + 2] - skirtHeight; // put down elevation on the skirt height\n\n  // Use same TEXCOORDS for skirt vertices\n  newTexcoord0.set(\n    attributes.TEXCOORD_0.value.subarray(edge[0] * 2, edge[0] * 2 + 2),\n    vertex1Offset * 2\n  );\n  newTexcoord0.set(\n    attributes.TEXCOORD_0.value.subarray(edge[1] * 2, edge[1] * 2 + 2),\n    vertex2Offset * 2\n  );\n\n  // Define new triangles\n  const triangle1Offset = edgeIndex * 2 * 3;\n  newTriangles[triangle1Offset] = edge[0];\n  newTriangles[triangle1Offset + 1] = edge[1];\n  newTriangles[triangle1Offset + 2] = positionsLength / 3 + vertex2Offset;\n\n  newTriangles[triangle1Offset + 3] = positionsLength / 3 + vertex2Offset;\n  newTriangles[triangle1Offset + 4] = positionsLength / 3 + vertex1Offset;\n  newTriangles[triangle1Offset + 5] = edge[0];\n}\n"],"file":"skirt.js"}
+{"version":3,"sources":["../../../../src/lib/helpers/skirt.ts"],"names":["addSkirt","attributes","triangles","skirtHeight","outsideIndices","outsideEdges","getOutsideEdgesFromIndices","POSITION","value","getOutsideEdgesFromTriangles","newPosition","constructor","length","newTexcoord0","TEXCOORD_0","newTriangles","i","edge","updateAttributesForNewEdge","edgeIndex","resultTriangles","Array","concat","edges","push","sort","a","b","Math","min","max","index","indices","position","westIndices","eastIndices","southIndices","northIndices","indexGroup","positionsLength","vertex1Offset","vertex2Offset","set","subarray","triangle1Offset"],"mappings":"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","sourcesContent":["import {concatenateTypedArrays} from '@loaders.gl/loader-utils';\n\nexport type EdgeIndices = {\n  westIndices: number[];\n  northIndices: number[];\n  eastIndices: number[];\n  southIndices: number[];\n};\n\n/**\n * Add skirt to existing mesh\n * @param {object} attributes - POSITION and TEXCOOD_0 attributes data\n * @param {any} triangles - indices array of the mesh geometry\n * @param skirtHeight - height of the skirt geometry\n * @param outsideIndices - edge indices from quantized mesh data\n * @returns - geometry data with added skirt\n */\nexport function addSkirt(attributes, triangles, skirtHeight: number, outsideIndices?: EdgeIndices) {\n  const outsideEdges = outsideIndices\n    ? getOutsideEdgesFromIndices(outsideIndices, attributes.POSITION.value)\n    : getOutsideEdgesFromTriangles(triangles);\n\n  // 2 new vertices for each outside edge\n  const newPosition = new attributes.POSITION.value.constructor(outsideEdges.length * 6);\n  const newTexcoord0 = new attributes.TEXCOORD_0.value.constructor(outsideEdges.length * 4);\n\n  // 2 new triangles for each outside edge\n  const newTriangles = new triangles.constructor(outsideEdges.length * 6);\n\n  for (let i = 0; i < outsideEdges.length; i++) {\n    const edge = outsideEdges[i];\n\n    updateAttributesForNewEdge({\n      edge,\n      edgeIndex: i,\n      attributes,\n      skirtHeight,\n      newPosition,\n      newTexcoord0,\n      newTriangles\n    });\n  }\n\n  attributes.POSITION.value = concatenateTypedArrays(attributes.POSITION.value, newPosition);\n  attributes.TEXCOORD_0.value = concatenateTypedArrays(attributes.TEXCOORD_0.value, newTexcoord0);\n  const resultTriangles =\n    triangles instanceof Array\n      ? triangles.concat(newTriangles)\n      : concatenateTypedArrays(triangles, newTriangles);\n\n  return {\n    attributes,\n    triangles: resultTriangles\n  };\n}\n\n/**\n * Get geometry edges that located on a border of the mesh\n * @param {any} triangles - indices array of the mesh geometry\n * @returns {number[][]} - outside edges data\n */\nfunction getOutsideEdgesFromTriangles(triangles) {\n  const edges: number[][] = [];\n  for (let i = 0; i < triangles.length; i += 3) {\n    edges.push([triangles[i], triangles[i + 1]]);\n    edges.push([triangles[i + 1], triangles[i + 2]]);\n    edges.push([triangles[i + 2], triangles[i]]);\n  }\n\n  edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));\n\n  const outsideEdges: number[][] = [];\n  let index = 0;\n  while (index < edges.length) {\n    if (edges[index][0] === edges[index + 1]?.[1] && edges[index][1] === edges[index + 1]?.[0]) {\n      index += 2;\n    } else {\n      outsideEdges.push(edges[index]);\n      index++;\n    }\n  }\n  return outsideEdges;\n}\n\n/**\n * Get geometry edges that located on a border of the mesh\n * @param {object} indices - edge indices from quantized mesh data\n * @param {TypedArray} position - position attribute geometry data\n * @returns {number[][]} - outside edges data\n */\nfunction getOutsideEdgesFromIndices(indices: EdgeIndices, position) {\n  // Sort skirt indices to create adjacent triangles\n  indices.westIndices.sort((a, b) => position[3 * a + 1] - position[3 * b + 1]);\n  // Reverse (b - a) to match triangle winding\n  indices.eastIndices.sort((a, b) => position[3 * b + 1] - position[3 * a + 1]);\n  indices.southIndices.sort((a, b) => position[3 * b] - position[3 * a]);\n  // Reverse (b - a) to match triangle winding\n  indices.northIndices.sort((a, b) => position[3 * a] - position[3 * b]);\n\n  const edges: number[][] = [];\n  for (const index in indices) {\n    const indexGroup = indices[index];\n    for (let i = 0; i < indexGroup.length - 1; i++) {\n      edges.push([indexGroup[i], indexGroup[i + 1]]);\n    }\n  }\n  return edges;\n}\n\n/**\n * Get geometry edges that located on a border of the mesh\n * @param {object} args\n * @param {number[]} args.edge - edge indices in geometry\n * @param {number} args.edgeIndex - edge index in outsideEdges array\n * @param {object} args.attributes - POSITION and TEXCOORD_0 attributes\n * @param {number} args.skirtHeight - height of the skirt geometry\n * @param {TypedArray} args.newPosition - POSITION array for skirt data\n * @param {TypedArray} args.newTexcoord0 - TEXCOORD_0 array for skirt data\n * @param {TypedArray | Array} args.newTriangles - trinagle indices array for skirt data\n * @returns {void}\n */\nfunction updateAttributesForNewEdge({\n  edge,\n  edgeIndex,\n  attributes,\n  skirtHeight,\n  newPosition,\n  newTexcoord0,\n  newTriangles\n}) {\n  const positionsLength = attributes.POSITION.value.length;\n  const vertex1Offset = edgeIndex * 2;\n  const vertex2Offset = edgeIndex * 2 + 1;\n\n  // Define POSITION for new 1st vertex\n  newPosition.set(\n    attributes.POSITION.value.subarray(edge[0] * 3, edge[0] * 3 + 3),\n    vertex1Offset * 3\n  );\n  newPosition[vertex1Offset * 3 + 2] = newPosition[vertex1Offset * 3 + 2] - skirtHeight; // put down elevation on the skirt height\n\n  // Define POSITION for new 2nd vertex\n  newPosition.set(\n    attributes.POSITION.value.subarray(edge[1] * 3, edge[1] * 3 + 3),\n    vertex2Offset * 3\n  );\n  newPosition[vertex2Offset * 3 + 2] = newPosition[vertex2Offset * 3 + 2] - skirtHeight; // put down elevation on the skirt height\n\n  // Use same TEXCOORDS for skirt vertices\n  newTexcoord0.set(\n    attributes.TEXCOORD_0.value.subarray(edge[0] * 2, edge[0] * 2 + 2),\n    vertex1Offset * 2\n  );\n  newTexcoord0.set(\n    attributes.TEXCOORD_0.value.subarray(edge[1] * 2, edge[1] * 2 + 2),\n    vertex2Offset * 2\n  );\n\n  // Define new triangles\n  const triangle1Offset = edgeIndex * 2 * 3;\n  newTriangles[triangle1Offset] = edge[0];\n  newTriangles[triangle1Offset + 1] = edge[1];\n  newTriangles[triangle1Offset + 2] = positionsLength / 3 + vertex2Offset;\n\n  newTriangles[triangle1Offset + 3] = positionsLength / 3 + vertex2Offset;\n  newTriangles[triangle1Offset + 4] = positionsLength / 3 + vertex1Offset;\n  newTriangles[triangle1Offset + 5] = edge[0];\n}\n"],"file":"skirt.js"}

package/dist/es5/lib/parse-terrain.js

@@ -9,6 +9,8 @@ exports.default = loadTerrain;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -21,6 +23,10 @@ var _delatin = _interopRequireDefault(require("./delatin"));
 
 var _skirt = require("./helpers/skirt");
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 function getTerrain(imageData, width, height, elevationDecoder, tesselator) {
   var rScaler = elevationDecoder.rScaler,
       bScaler = elevationDecoder.bScaler,
@@ -193,21 +199,25 @@ function loadTerrain(_x2, _x3, _x4) {
 
 function _loadTerrain() {
   _loadTerrain = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(arrayBuffer, options, context) {
-    var image;
+    var loadImageOptions, image;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            options.image = options.image || {};
-            options.image.type = 'data';
-            _context.next = 4;
-            return context.parse(arrayBuffer, options, options.baseUri);
-
-          case 4:
+            loadImageOptions = _objectSpread(_objectSpread({}, options), {}, {
+              mimeType: 'application/x.image',
+              image: _objectSpread(_objectSpread({}, options.image), {}, {
+                type: 'data'
+              })
+            });
+            _context.next = 3;
+            return context.parse(arrayBuffer, loadImageOptions);
+
+          case 3:
             image = _context.sent;
             return _context.abrupt("return", getMesh(image, options.terrain));
 
-          case 6:
+          case 5:
           case "end":
             return _context.stop();
         }

package/dist/es5/lib/parse-terrain.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/parse-terrain.ts"],"names":["getTerrain","imageData","width","height","elevationDecoder","tesselator","rScaler","bScaler","gScaler","offset","terrain","Float32Array","i","y","x","k","r","g","b","getMeshAttributes","vertices","bounds","gridSize","numOfVerticies","length","positions","texCoords","minX","minY","maxX","maxY","xScale","yScale","pixelIdx","POSITION","value","size","TEXCOORD_0","getMesh","terrainImage","terrainOptions","meshMaxError","data","mesh","getMartiniTileMesh","getDelatinTileMesh","triangles","attributes","boundingBox","skirtHeight","newAttributes","newTriangles","loaderData","header","vertexCount","mode","indices","Uint32Array","from","martini","Martini","tile","createTile","tin","Delatin","run","coords","loadTerrain","arrayBuffer","options","context","image","type","parse","baseUri"],"mappings":"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","sourcesContent":["import {getMeshBoundingBox} from '@loaders.gl/schema';\nimport Martini from '@mapbox/martini';\nimport Delatin from './delatin';\nimport {addSkirt} from './helpers/skirt';\n\ntype TerrainOptions = {\n  meshMaxError: number;\n  bounds: number[];\n  elevationDecoder: ElevationDecoder;\n  tesselator: 'martini' | 'delatin';\n  skirtHeight?: number;\n};\n\ntype TerrainImage = {\n  data: Uint8Array;\n  width: number;\n  height: number;\n};\n\ntype ElevationDecoder = {\n  rScaler: any;\n  bScaler: any;\n  gScaler: any;\n  offset: number;\n};\n\nfunction getTerrain(\n  imageData: Uint8Array,\n  width: number,\n  height: number,\n  elevationDecoder: ElevationDecoder,\n  tesselator: 'martini' | 'delatin'\n) {\n  const {rScaler, bScaler, gScaler, offset} = elevationDecoder;\n\n  // From Martini demo\n  // https://observablehq.com/@mourner/martin-real-time-rtin-terrain-mesh\n  const terrain = new Float32Array((width + 1) * (height + 1));\n  // decode terrain values\n  for (let i = 0, y = 0; y < height; y++) {\n    for (let x = 0; x < width; x++, i++) {\n      const k = i * 4;\n      const r = imageData[k + 0];\n      const g = imageData[k + 1];\n      const b = imageData[k + 2];\n      terrain[i + y] = r * rScaler + g * gScaler + b * bScaler + offset;\n    }\n  }\n\n  if (tesselator === 'martini') {\n    // backfill bottom border\n    for (let i = (width + 1) * width, x = 0; x < width; x++, i++) {\n      terrain[i] = terrain[i - width - 1];\n    }\n    // backfill right border\n    for (let i = height, y = 0; y < height + 1; y++, i += height + 1) {\n      terrain[i] = terrain[i - 1];\n    }\n  }\n\n  return terrain;\n}\n\nfunction getMeshAttributes(\n  vertices,\n  terrain: Uint8Array,\n  width: number,\n  height: number,\n  bounds: number[]\n) {\n  const gridSize = width + 1;\n  const numOfVerticies = vertices.length / 2;\n  // vec3. x, y in pixels, z in meters\n  const positions = new Float32Array(numOfVerticies * 3);\n  // vec2. 1 to 1 relationship with position. represents the uv on the texture image. 0,0 to 1,1.\n  const texCoords = new Float32Array(numOfVerticies * 2);\n\n  const [minX, minY, maxX, maxY] = bounds || [0, 0, width, height];\n  const xScale = (maxX - minX) / width;\n  const yScale = (maxY - minY) / height;\n\n  for (let i = 0; i < numOfVerticies; i++) {\n    const x = vertices[i * 2];\n    const y = vertices[i * 2 + 1];\n    const pixelIdx = y * gridSize + x;\n\n    positions[3 * i + 0] = x * xScale + minX;\n    positions[3 * i + 1] = -y * yScale + maxY;\n    positions[3 * i + 2] = terrain[pixelIdx];\n\n    texCoords[2 * i + 0] = x / width;\n    texCoords[2 * i + 1] = y / height;\n  }\n\n  return {\n    POSITION: {value: positions, size: 3},\n    TEXCOORD_0: {value: texCoords, size: 2}\n    // NORMAL: {}, - optional, but creates the high poly look with lighting\n  };\n}\n\n/**\n * Returns generated mesh object from image data\n *\n * @param {object} terrainImage terrain image data\n * @param {object} terrainOptions terrain options\n * @returns mesh object\n */\nfunction getMesh(terrainImage: TerrainImage, terrainOptions: TerrainOptions) {\n  if (terrainImage === null) {\n    return null;\n  }\n  const {meshMaxError, bounds, elevationDecoder} = terrainOptions;\n\n  const {data, width, height} = terrainImage;\n\n  let terrain;\n  let mesh;\n  switch (terrainOptions.tesselator) {\n    case 'martini':\n      terrain = getTerrain(data, width, height, elevationDecoder, terrainOptions.tesselator);\n      mesh = getMartiniTileMesh(meshMaxError, width, terrain);\n      break;\n    case 'delatin':\n      terrain = getTerrain(data, width, height, elevationDecoder, terrainOptions.tesselator);\n      mesh = getDelatinTileMesh(meshMaxError, width, height, terrain);\n      break;\n    // auto\n    default:\n      if (width === height && !(height & (width - 1))) {\n        terrain = getTerrain(data, width, height, elevationDecoder, 'martini');\n        mesh = getMartiniTileMesh(meshMaxError, width, terrain);\n      } else {\n        terrain = getTerrain(data, width, height, elevationDecoder, 'delatin');\n        mesh = getDelatinTileMesh(meshMaxError, width, height, terrain);\n      }\n      break;\n  }\n\n  const {vertices} = mesh;\n  let {triangles} = mesh;\n  let attributes = getMeshAttributes(vertices, terrain, width, height, bounds);\n\n  // Compute bounding box before adding skirt so that z values are not skewed\n  const boundingBox = getMeshBoundingBox(attributes);\n\n  if (terrainOptions.skirtHeight) {\n    const {attributes: newAttributes, triangles: newTriangles} = addSkirt(\n      attributes,\n      triangles,\n      terrainOptions.skirtHeight\n    );\n    attributes = newAttributes;\n    triangles = newTriangles;\n  }\n\n  return {\n    // Data return by this loader implementation\n    loaderData: {\n      header: {}\n    },\n    header: {\n      vertexCount: triangles.length,\n      boundingBox\n    },\n    mode: 4, // TRIANGLES\n    indices: {value: Uint32Array.from(triangles), size: 1},\n    attributes\n  };\n}\n\n/**\n * Get Martini generated vertices and triangles\n *\n * @param {number} meshMaxError threshold for simplifying mesh\n * @param {number} width width of the input data\n * @param {number[] | Float32Array} terrain elevation data\n * @returns {{vertices: Uint16Array, triangles: Uint32Array}} vertices and triangles data\n */\nfunction getMartiniTileMesh(meshMaxError, width, terrain) {\n  const gridSize = width + 1;\n  const martini = new Martini(gridSize);\n  const tile = martini.createTile(terrain);\n  const {vertices, triangles} = tile.getMesh(meshMaxError);\n\n  return {vertices, triangles};\n}\n\n/**\n * Get Delatin generated vertices and triangles\n *\n * @param {number} meshMaxError threshold for simplifying mesh\n * @param {number} width width of the input data array\n * @param {number} height height of the input data array\n * @param {number[] | Float32Array} terrain elevation data\n * @returns {{vertices: number[], triangles: number[]}} vertices and triangles data\n */\nfunction getDelatinTileMesh(meshMaxError, width, height, terrain) {\n  const tin = new Delatin(terrain, width + 1, height + 1);\n  tin.run(meshMaxError);\n  // @ts-expect-error\n  const {coords, triangles} = tin;\n  const vertices = coords;\n  return {vertices, triangles};\n}\n\nexport default async function loadTerrain(arrayBuffer, options, context) {\n  options.image = options.image || {};\n  options.image.type = 'data';\n  const image = await context.parse(arrayBuffer, options, options.baseUri);\n  // Extend function to support additional mesh generation options (square grid or delatin)\n  return getMesh(image, options.terrain);\n}\n"],"file":"parse-terrain.js"}
+{"version":3,"sources":["../../../src/lib/parse-terrain.ts"],"names":["getTerrain","imageData","width","height","elevationDecoder","tesselator","rScaler","bScaler","gScaler","offset","terrain","Float32Array","i","y","x","k","r","g","b","getMeshAttributes","vertices","bounds","gridSize","numOfVerticies","length","positions","texCoords","minX","minY","maxX","maxY","xScale","yScale","pixelIdx","POSITION","value","size","TEXCOORD_0","getMesh","terrainImage","terrainOptions","meshMaxError","data","mesh","getMartiniTileMesh","getDelatinTileMesh","triangles","attributes","boundingBox","skirtHeight","newAttributes","newTriangles","loaderData","header","vertexCount","mode","indices","Uint32Array","from","martini","Martini","tile","createTile","tin","Delatin","run","coords","loadTerrain","arrayBuffer","options","context","loadImageOptions","mimeType","image","type","parse"],"mappings":"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","sourcesContent":["import {getMeshBoundingBox} from '@loaders.gl/schema';\nimport Martini from '@mapbox/martini';\nimport Delatin from './delatin';\nimport {addSkirt} from './helpers/skirt';\n\ntype TerrainOptions = {\n  meshMaxError: number;\n  bounds: number[];\n  elevationDecoder: ElevationDecoder;\n  tesselator: 'martini' | 'delatin';\n  skirtHeight?: number;\n};\n\ntype TerrainImage = {\n  data: Uint8Array;\n  width: number;\n  height: number;\n};\n\ntype ElevationDecoder = {\n  rScaler: any;\n  bScaler: any;\n  gScaler: any;\n  offset: number;\n};\n\nfunction getTerrain(\n  imageData: Uint8Array,\n  width: number,\n  height: number,\n  elevationDecoder: ElevationDecoder,\n  tesselator: 'martini' | 'delatin'\n) {\n  const {rScaler, bScaler, gScaler, offset} = elevationDecoder;\n\n  // From Martini demo\n  // https://observablehq.com/@mourner/martin-real-time-rtin-terrain-mesh\n  const terrain = new Float32Array((width + 1) * (height + 1));\n  // decode terrain values\n  for (let i = 0, y = 0; y < height; y++) {\n    for (let x = 0; x < width; x++, i++) {\n      const k = i * 4;\n      const r = imageData[k + 0];\n      const g = imageData[k + 1];\n      const b = imageData[k + 2];\n      terrain[i + y] = r * rScaler + g * gScaler + b * bScaler + offset;\n    }\n  }\n\n  if (tesselator === 'martini') {\n    // backfill bottom border\n    for (let i = (width + 1) * width, x = 0; x < width; x++, i++) {\n      terrain[i] = terrain[i - width - 1];\n    }\n    // backfill right border\n    for (let i = height, y = 0; y < height + 1; y++, i += height + 1) {\n      terrain[i] = terrain[i - 1];\n    }\n  }\n\n  return terrain;\n}\n\nfunction getMeshAttributes(\n  vertices,\n  terrain: Uint8Array,\n  width: number,\n  height: number,\n  bounds: number[]\n) {\n  const gridSize = width + 1;\n  const numOfVerticies = vertices.length / 2;\n  // vec3. x, y in pixels, z in meters\n  const positions = new Float32Array(numOfVerticies * 3);\n  // vec2. 1 to 1 relationship with position. represents the uv on the texture image. 0,0 to 1,1.\n  const texCoords = new Float32Array(numOfVerticies * 2);\n\n  const [minX, minY, maxX, maxY] = bounds || [0, 0, width, height];\n  const xScale = (maxX - minX) / width;\n  const yScale = (maxY - minY) / height;\n\n  for (let i = 0; i < numOfVerticies; i++) {\n    const x = vertices[i * 2];\n    const y = vertices[i * 2 + 1];\n    const pixelIdx = y * gridSize + x;\n\n    positions[3 * i + 0] = x * xScale + minX;\n    positions[3 * i + 1] = -y * yScale + maxY;\n    positions[3 * i + 2] = terrain[pixelIdx];\n\n    texCoords[2 * i + 0] = x / width;\n    texCoords[2 * i + 1] = y / height;\n  }\n\n  return {\n    POSITION: {value: positions, size: 3},\n    TEXCOORD_0: {value: texCoords, size: 2}\n    // NORMAL: {}, - optional, but creates the high poly look with lighting\n  };\n}\n\n/**\n * Returns generated mesh object from image data\n *\n * @param {object} terrainImage terrain image data\n * @param {object} terrainOptions terrain options\n * @returns mesh object\n */\nfunction getMesh(terrainImage: TerrainImage, terrainOptions: TerrainOptions) {\n  if (terrainImage === null) {\n    return null;\n  }\n  const {meshMaxError, bounds, elevationDecoder} = terrainOptions;\n\n  const {data, width, height} = terrainImage;\n\n  let terrain;\n  let mesh;\n  switch (terrainOptions.tesselator) {\n    case 'martini':\n      terrain = getTerrain(data, width, height, elevationDecoder, terrainOptions.tesselator);\n      mesh = getMartiniTileMesh(meshMaxError, width, terrain);\n      break;\n    case 'delatin':\n      terrain = getTerrain(data, width, height, elevationDecoder, terrainOptions.tesselator);\n      mesh = getDelatinTileMesh(meshMaxError, width, height, terrain);\n      break;\n    // auto\n    default:\n      if (width === height && !(height & (width - 1))) {\n        terrain = getTerrain(data, width, height, elevationDecoder, 'martini');\n        mesh = getMartiniTileMesh(meshMaxError, width, terrain);\n      } else {\n        terrain = getTerrain(data, width, height, elevationDecoder, 'delatin');\n        mesh = getDelatinTileMesh(meshMaxError, width, height, terrain);\n      }\n      break;\n  }\n\n  const {vertices} = mesh;\n  let {triangles} = mesh;\n  let attributes = getMeshAttributes(vertices, terrain, width, height, bounds);\n\n  // Compute bounding box before adding skirt so that z values are not skewed\n  const boundingBox = getMeshBoundingBox(attributes);\n\n  if (terrainOptions.skirtHeight) {\n    const {attributes: newAttributes, triangles: newTriangles} = addSkirt(\n      attributes,\n      triangles,\n      terrainOptions.skirtHeight\n    );\n    attributes = newAttributes;\n    triangles = newTriangles;\n  }\n\n  return {\n    // Data return by this loader implementation\n    loaderData: {\n      header: {}\n    },\n    header: {\n      vertexCount: triangles.length,\n      boundingBox\n    },\n    mode: 4, // TRIANGLES\n    indices: {value: Uint32Array.from(triangles), size: 1},\n    attributes\n  };\n}\n\n/**\n * Get Martini generated vertices and triangles\n *\n * @param {number} meshMaxError threshold for simplifying mesh\n * @param {number} width width of the input data\n * @param {number[] | Float32Array} terrain elevation data\n * @returns {{vertices: Uint16Array, triangles: Uint32Array}} vertices and triangles data\n */\nfunction getMartiniTileMesh(meshMaxError, width, terrain) {\n  const gridSize = width + 1;\n  const martini = new Martini(gridSize);\n  const tile = martini.createTile(terrain);\n  const {vertices, triangles} = tile.getMesh(meshMaxError);\n\n  return {vertices, triangles};\n}\n\n/**\n * Get Delatin generated vertices and triangles\n *\n * @param {number} meshMaxError threshold for simplifying mesh\n * @param {number} width width of the input data array\n * @param {number} height height of the input data array\n * @param {number[] | Float32Array} terrain elevation data\n * @returns {{vertices: number[], triangles: number[]}} vertices and triangles data\n */\nfunction getDelatinTileMesh(meshMaxError, width, height, terrain) {\n  const tin = new Delatin(terrain, width + 1, height + 1);\n  tin.run(meshMaxError);\n  // @ts-expect-error\n  const {coords, triangles} = tin;\n  const vertices = coords;\n  return {vertices, triangles};\n}\n\nexport default async function loadTerrain(arrayBuffer, options, context) {\n  const loadImageOptions = {\n    ...options,\n    mimeType: 'application/x.image',\n    image: {...options.image, type: 'data'}\n  };\n  const image = await context.parse(arrayBuffer, loadImageOptions);\n  // Extend function to support additional mesh generation options (square grid or delatin)\n  return getMesh(image, options.terrain);\n}\n"],"file":"parse-terrain.js"}

package/dist/es5/lib/utils/version.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VERSION = void 0;
-var VERSION = typeof "3.1.3" !== 'undefined' ? "3.1.3" : 'latest';
+var VERSION = typeof "3.1.7" !== 'undefined' ? "3.1.7" : 'latest';
 exports.VERSION = VERSION;
 //# sourceMappingURL=version.js.map

package/dist/es5/terrain-loader.js

@@ -13,8 +13,8 @@ var TerrainLoader = {
   module: 'terrain',
   version: _version.VERSION,
   worker: true,
-  extensions: ['png', 'pngraw'],
-  mimeTypes: ['image/png'],
+  extensions: ['png', 'pngraw', 'jpg', 'jpeg', 'gif', 'webp', 'bmp'],
+  mimeTypes: ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/bmp'],
   options: {
     terrain: {
       tesselator: 'auto',

package/dist/es5/terrain-loader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/terrain-loader.ts"],"names":["TerrainLoader","name","id","module","version","VERSION","worker","extensions","mimeTypes","options","terrain","tesselator","bounds","meshMaxError","elevationDecoder","rScaler","gScaler","bScaler","offset","skirtHeight","_typecheckTerrainWorkerLoader"],"mappings":";;;;;;;AACA;;AAKO,IAAMA,aAAa,GAAG;AAC3BC,EAAAA,IAAI,EAAE,SADqB;AAE3BC,EAAAA,EAAE,EAAE,SAFuB;AAG3BC,EAAAA,MAAM,EAAE,SAHmB;AAI3BC,EAAAA,OAAO,EAAEC,gBAJkB;AAK3BC,EAAAA,MAAM,EAAE,IALmB;AAM3BC,EAAAA,UAAU,EAAE,CAAC,KAAD,EAAQ,QAAR,CANe;AAO3BC,EAAAA,SAAS,EAAE,CAAC,WAAD,CAPgB;AAQ3BC,EAAAA,OAAO,EAAE;AACPC,IAAAA,OAAO,EAAE;AACPC,MAAAA,UAAU,EAAE,MADL;AAEPC,MAAAA,MAAM,EAAE,IAFD;AAGPC,MAAAA,YAAY,EAAE,EAHP;AAIPC,MAAAA,gBAAgB,EAAE;AAChBC,QAAAA,OAAO,EAAE,CADO;AAEhBC,QAAAA,OAAO,EAAE,CAFO;AAGhBC,QAAAA,OAAO,EAAE,CAHO;AAIhBC,QAAAA,MAAM,EAAE;AAJQ,OAJX;AAUPC,MAAAA,WAAW,EAAE;AAVN;AADF;AARkB,CAAtB;;AA2BA,IAAMC,6BAAqC,GAAGpB,aAA9C","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\nimport {VERSION} from './lib/utils/version';\n\n/**\n * Worker loader for quantized meshes\n */\nexport const TerrainLoader = {\n  name: 'Terrain',\n  id: 'terrain',\n  module: 'terrain',\n  version: VERSION,\n  worker: true,\n  extensions: ['png', 'pngraw'],\n  mimeTypes: ['image/png'],\n  options: {\n    terrain: {\n      tesselator: 'auto',\n      bounds: null,\n      meshMaxError: 10,\n      elevationDecoder: {\n        rScaler: 1,\n        gScaler: 0,\n        bScaler: 0,\n        offset: 0\n      },\n      skirtHeight: null\n    }\n  }\n};\n\n/**\n * Loader for quantized meshes\n */\nexport const _typecheckTerrainWorkerLoader: Loader = TerrainLoader;\n"],"file":"terrain-loader.js"}
+{"version":3,"sources":["../../src/terrain-loader.ts"],"names":["TerrainLoader","name","id","module","version","VERSION","worker","extensions","mimeTypes","options","terrain","tesselator","bounds","meshMaxError","elevationDecoder","rScaler","gScaler","bScaler","offset","skirtHeight","_typecheckTerrainWorkerLoader"],"mappings":";;;;;;;AACA;;AAKO,IAAMA,aAAa,GAAG;AAC3BC,EAAAA,IAAI,EAAE,SADqB;AAE3BC,EAAAA,EAAE,EAAE,SAFuB;AAG3BC,EAAAA,MAAM,EAAE,SAHmB;AAI3BC,EAAAA,OAAO,EAAEC,gBAJkB;AAK3BC,EAAAA,MAAM,EAAE,IALmB;AAM3BC,EAAAA,UAAU,EAAE,CAAC,KAAD,EAAQ,QAAR,EAAkB,KAAlB,EAAyB,MAAzB,EAAiC,KAAjC,EAAwC,MAAxC,EAAgD,KAAhD,CANe;AAO3BC,EAAAA,SAAS,EAAE,CAAC,WAAD,EAAc,YAAd,EAA4B,WAA5B,EAAyC,YAAzC,EAAuD,WAAvD,CAPgB;AAQ3BC,EAAAA,OAAO,EAAE;AACPC,IAAAA,OAAO,EAAE;AACPC,MAAAA,UAAU,EAAE,MADL;AAEPC,MAAAA,MAAM,EAAE,IAFD;AAGPC,MAAAA,YAAY,EAAE,EAHP;AAIPC,MAAAA,gBAAgB,EAAE;AAChBC,QAAAA,OAAO,EAAE,CADO;AAEhBC,QAAAA,OAAO,EAAE,CAFO;AAGhBC,QAAAA,OAAO,EAAE,CAHO;AAIhBC,QAAAA,MAAM,EAAE;AAJQ,OAJX;AAUPC,MAAAA,WAAW,EAAE;AAVN;AADF;AARkB,CAAtB;;AA2BA,IAAMC,6BAAqC,GAAGpB,aAA9C","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\nimport {VERSION} from './lib/utils/version';\n\n/**\n * Worker loader for color-encoded images\n */\nexport const TerrainLoader = {\n  name: 'Terrain',\n  id: 'terrain',\n  module: 'terrain',\n  version: VERSION,\n  worker: true,\n  extensions: ['png', 'pngraw', 'jpg', 'jpeg', 'gif', 'webp', 'bmp'],\n  mimeTypes: ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/bmp'],\n  options: {\n    terrain: {\n      tesselator: 'auto',\n      bounds: null,\n      meshMaxError: 10,\n      elevationDecoder: {\n        rScaler: 1,\n        gScaler: 0,\n        bScaler: 0,\n        offset: 0\n      },\n      skirtHeight: null\n    }\n  }\n};\n\n/**\n * Loader for color-encoded images\n */\nexport const _typecheckTerrainWorkerLoader: Loader = TerrainLoader;\n"],"file":"terrain-loader.js"}

package/dist/esm/lib/helpers/skirt.js

@@ -38,13 +38,15 @@ function getOutsideEdgesFromTriangles(triangles) {
 
   edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));
   const outsideEdges = [];
-  let index = 1;
+  let index = 0;
 
   while (index < edges.length) {
-    if (edges[index][0] === edges[index - 1][1] && edges[index][1] === edges[index - 1][0]) {
+    var _edges, _edges2;
+
+    if (edges[index][0] === ((_edges = edges[index + 1]) === null || _edges === void 0 ? void 0 : _edges[1]) && edges[index][1] === ((_edges2 = edges[index + 1]) === null || _edges2 === void 0 ? void 0 : _edges2[0])) {
       index += 2;
     } else {
-      outsideEdges.push(edges[index - 1]);
+      outsideEdges.push(edges[index]);
       index++;
     }
   }

package/dist/esm/lib/helpers/skirt.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/helpers/skirt.ts"],"names":["concatenateTypedArrays","addSkirt","attributes","triangles","skirtHeight","outsideIndices","outsideEdges","getOutsideEdgesFromIndices","POSITION","value","getOutsideEdgesFromTriangles","newPosition","constructor","length","newTexcoord0","TEXCOORD_0","newTriangles","i","edge","updateAttributesForNewEdge","edgeIndex","resultTriangles","Array","concat","edges","push","sort","a","b","Math","min","max","index","indices","position","westIndices","eastIndices","southIndices","northIndices","indexGroup","positionsLength","vertex1Offset","vertex2Offset","set","subarray","triangle1Offset"],"mappings":"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","sourcesContent":["import {concatenateTypedArrays} from '@loaders.gl/loader-utils';\n\nexport type EdgeIndices = {\n  westIndices: number[];\n  northIndices: number[];\n  eastIndices: number[];\n  southIndices: number[];\n};\n\n/**\n * Add skirt to existing mesh\n * @param {object} attributes - POSITION and TEXCOOD_0 attributes data\n * @param {any} triangles - indices array of the mesh geometry\n * @param skirtHeight - height of the skirt geometry\n * @param outsideIndices - edge indices from quantized mesh data\n * @returns - geometry data with added skirt\n */\nexport function addSkirt(attributes, triangles, skirtHeight: number, outsideIndices?: EdgeIndices) {\n  const outsideEdges = outsideIndices\n    ? getOutsideEdgesFromIndices(outsideIndices, attributes.POSITION.value)\n    : getOutsideEdgesFromTriangles(triangles);\n\n  // 2 new vertices for each outside edge\n  const newPosition = new attributes.POSITION.value.constructor(outsideEdges.length * 6);\n  const newTexcoord0 = new attributes.TEXCOORD_0.value.constructor(outsideEdges.length * 4);\n\n  // 2 new triangles for each outside edge\n  const newTriangles = new triangles.constructor(outsideEdges.length * 6);\n\n  for (let i = 0; i < outsideEdges.length; i++) {\n    const edge = outsideEdges[i];\n\n    updateAttributesForNewEdge({\n      edge,\n      edgeIndex: i,\n      attributes,\n      skirtHeight,\n      newPosition,\n      newTexcoord0,\n      newTriangles\n    });\n  }\n\n  attributes.POSITION.value = concatenateTypedArrays(attributes.POSITION.value, newPosition);\n  attributes.TEXCOORD_0.value = concatenateTypedArrays(attributes.TEXCOORD_0.value, newTexcoord0);\n  const resultTriangles =\n    triangles instanceof Array\n      ? triangles.concat(newTriangles)\n      : concatenateTypedArrays(triangles, newTriangles);\n\n  return {\n    attributes,\n    triangles: resultTriangles\n  };\n}\n\n/**\n * Get geometry edges that located on a border of the mesh\n * @param {any} triangles - indices array of the mesh geometry\n * @returns {number[][]} - outside edges data\n */\nfunction getOutsideEdgesFromTriangles(triangles) {\n  const edges: number[][] = [];\n  for (let i = 0; i < triangles.length; i += 3) {\n    edges.push([triangles[i], triangles[i + 1]]);\n    edges.push([triangles[i + 1], triangles[i + 2]]);\n    edges.push([triangles[i + 2], triangles[i]]);\n  }\n\n  edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));\n\n  const outsideEdges: number[][] = [];\n  let index = 1;\n  while (index < edges.length) {\n    if (edges[index][0] === edges[index - 1][1] && edges[index][1] === edges[index - 1][0]) {\n      index += 2;\n    } else {\n      outsideEdges.push(edges[index - 1]);\n      index++;\n    }\n  }\n  return outsideEdges;\n}\n\n/**\n * Get geometry edges that located on a border of the mesh\n * @param {object} indices - edge indices from quantized mesh data\n * @param {TypedArray} position - position attribute geometry data\n * @returns {number[][]} - outside edges data\n */\nfunction getOutsideEdgesFromIndices(indices: EdgeIndices, position) {\n  // Sort skirt indices to create adjacent triangles\n  indices.westIndices.sort((a, b) => position[3 * a + 1] - position[3 * b + 1]);\n  // Reverse (b - a) to match triangle winding\n  indices.eastIndices.sort((a, b) => position[3 * b + 1] - position[3 * a + 1]);\n  indices.southIndices.sort((a, b) => position[3 * b] - position[3 * a]);\n  // Reverse (b - a) to match triangle winding\n  indices.northIndices.sort((a, b) => position[3 * a] - position[3 * b]);\n\n  const edges: number[][] = [];\n  for (const index in indices) {\n    const indexGroup = indices[index];\n    for (let i = 0; i < indexGroup.length - 1; i++) {\n      edges.push([indexGroup[i], indexGroup[i + 1]]);\n    }\n  }\n  return edges;\n}\n\n/**\n * Get geometry edges that located on a border of the mesh\n * @param {object} args\n * @param {number[]} args.edge - edge indices in geometry\n * @param {number} args.edgeIndex - edge index in outsideEdges array\n * @param {object} args.attributes - POSITION and TEXCOORD_0 attributes\n * @param {number} args.skirtHeight - height of the skirt geometry\n * @param {TypedArray} args.newPosition - POSITION array for skirt data\n * @param {TypedArray} args.newTexcoord0 - TEXCOORD_0 array for skirt data\n * @param {TypedArray | Array} args.newTriangles - trinagle indices array for skirt data\n * @returns {void}\n */\nfunction updateAttributesForNewEdge({\n  edge,\n  edgeIndex,\n  attributes,\n  skirtHeight,\n  newPosition,\n  newTexcoord0,\n  newTriangles\n}) {\n  const positionsLength = attributes.POSITION.value.length;\n  const vertex1Offset = edgeIndex * 2;\n  const vertex2Offset = edgeIndex * 2 + 1;\n\n  // Define POSITION for new 1st vertex\n  newPosition.set(\n    attributes.POSITION.value.subarray(edge[0] * 3, edge[0] * 3 + 3),\n    vertex1Offset * 3\n  );\n  newPosition[vertex1Offset * 3 + 2] = newPosition[vertex1Offset * 3 + 2] - skirtHeight; // put down elevation on the skirt height\n\n  // Define POSITION for new 2nd vertex\n  newPosition.set(\n    attributes.POSITION.value.subarray(edge[1] * 3, edge[1] * 3 + 3),\n    vertex2Offset * 3\n  );\n  newPosition[vertex2Offset * 3 + 2] = newPosition[vertex2Offset * 3 + 2] - skirtHeight; // put down elevation on the skirt height\n\n  // Use same TEXCOORDS for skirt vertices\n  newTexcoord0.set(\n    attributes.TEXCOORD_0.value.subarray(edge[0] * 2, edge[0] * 2 + 2),\n    vertex1Offset * 2\n  );\n  newTexcoord0.set(\n    attributes.TEXCOORD_0.value.subarray(edge[1] * 2, edge[1] * 2 + 2),\n    vertex2Offset * 2\n  );\n\n  // Define new triangles\n  const triangle1Offset = edgeIndex * 2 * 3;\n  newTriangles[triangle1Offset] = edge[0];\n  newTriangles[triangle1Offset + 1] = edge[1];\n  newTriangles[triangle1Offset + 2] = positionsLength / 3 + vertex2Offset;\n\n  newTriangles[triangle1Offset + 3] = positionsLength / 3 + vertex2Offset;\n  newTriangles[triangle1Offset + 4] = positionsLength / 3 + vertex1Offset;\n  newTriangles[triangle1Offset + 5] = edge[0];\n}\n"],"file":"skirt.js"}
+{"version":3,"sources":["../../../../src/lib/helpers/skirt.ts"],"names":["concatenateTypedArrays","addSkirt","attributes","triangles","skirtHeight","outsideIndices","outsideEdges","getOutsideEdgesFromIndices","POSITION","value","getOutsideEdgesFromTriangles","newPosition","constructor","length","newTexcoord0","TEXCOORD_0","newTriangles","i","edge","updateAttributesForNewEdge","edgeIndex","resultTriangles","Array","concat","edges","push","sort","a","b","Math","min","max","index","indices","position","westIndices","eastIndices","southIndices","northIndices","indexGroup","positionsLength","vertex1Offset","vertex2Offset","set","subarray","triangle1Offset"],"mappings":"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","sourcesContent":["import {concatenateTypedArrays} from '@loaders.gl/loader-utils';\n\nexport type EdgeIndices = {\n  westIndices: number[];\n  northIndices: number[];\n  eastIndices: number[];\n  southIndices: number[];\n};\n\n/**\n * Add skirt to existing mesh\n * @param {object} attributes - POSITION and TEXCOOD_0 attributes data\n * @param {any} triangles - indices array of the mesh geometry\n * @param skirtHeight - height of the skirt geometry\n * @param outsideIndices - edge indices from quantized mesh data\n * @returns - geometry data with added skirt\n */\nexport function addSkirt(attributes, triangles, skirtHeight: number, outsideIndices?: EdgeIndices) {\n  const outsideEdges = outsideIndices\n    ? getOutsideEdgesFromIndices(outsideIndices, attributes.POSITION.value)\n    : getOutsideEdgesFromTriangles(triangles);\n\n  // 2 new vertices for each outside edge\n  const newPosition = new attributes.POSITION.value.constructor(outsideEdges.length * 6);\n  const newTexcoord0 = new attributes.TEXCOORD_0.value.constructor(outsideEdges.length * 4);\n\n  // 2 new triangles for each outside edge\n  const newTriangles = new triangles.constructor(outsideEdges.length * 6);\n\n  for (let i = 0; i < outsideEdges.length; i++) {\n    const edge = outsideEdges[i];\n\n    updateAttributesForNewEdge({\n      edge,\n      edgeIndex: i,\n      attributes,\n      skirtHeight,\n      newPosition,\n      newTexcoord0,\n      newTriangles\n    });\n  }\n\n  attributes.POSITION.value = concatenateTypedArrays(attributes.POSITION.value, newPosition);\n  attributes.TEXCOORD_0.value = concatenateTypedArrays(attributes.TEXCOORD_0.value, newTexcoord0);\n  const resultTriangles =\n    triangles instanceof Array\n      ? triangles.concat(newTriangles)\n      : concatenateTypedArrays(triangles, newTriangles);\n\n  return {\n    attributes,\n    triangles: resultTriangles\n  };\n}\n\n/**\n * Get geometry edges that located on a border of the mesh\n * @param {any} triangles - indices array of the mesh geometry\n * @returns {number[][]} - outside edges data\n */\nfunction getOutsideEdgesFromTriangles(triangles) {\n  const edges: number[][] = [];\n  for (let i = 0; i < triangles.length; i += 3) {\n    edges.push([triangles[i], triangles[i + 1]]);\n    edges.push([triangles[i + 1], triangles[i + 2]]);\n    edges.push([triangles[i + 2], triangles[i]]);\n  }\n\n  edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));\n\n  const outsideEdges: number[][] = [];\n  let index = 0;\n  while (index < edges.length) {\n    if (edges[index][0] === edges[index + 1]?.[1] && edges[index][1] === edges[index + 1]?.[0]) {\n      index += 2;\n    } else {\n      outsideEdges.push(edges[index]);\n      index++;\n    }\n  }\n  return outsideEdges;\n}\n\n/**\n * Get geometry edges that located on a border of the mesh\n * @param {object} indices - edge indices from quantized mesh data\n * @param {TypedArray} position - position attribute geometry data\n * @returns {number[][]} - outside edges data\n */\nfunction getOutsideEdgesFromIndices(indices: EdgeIndices, position) {\n  // Sort skirt indices to create adjacent triangles\n  indices.westIndices.sort((a, b) => position[3 * a + 1] - position[3 * b + 1]);\n  // Reverse (b - a) to match triangle winding\n  indices.eastIndices.sort((a, b) => position[3 * b + 1] - position[3 * a + 1]);\n  indices.southIndices.sort((a, b) => position[3 * b] - position[3 * a]);\n  // Reverse (b - a) to match triangle winding\n  indices.northIndices.sort((a, b) => position[3 * a] - position[3 * b]);\n\n  const edges: number[][] = [];\n  for (const index in indices) {\n    const indexGroup = indices[index];\n    for (let i = 0; i < indexGroup.length - 1; i++) {\n      edges.push([indexGroup[i], indexGroup[i + 1]]);\n    }\n  }\n  return edges;\n}\n\n/**\n * Get geometry edges that located on a border of the mesh\n * @param {object} args\n * @param {number[]} args.edge - edge indices in geometry\n * @param {number} args.edgeIndex - edge index in outsideEdges array\n * @param {object} args.attributes - POSITION and TEXCOORD_0 attributes\n * @param {number} args.skirtHeight - height of the skirt geometry\n * @param {TypedArray} args.newPosition - POSITION array for skirt data\n * @param {TypedArray} args.newTexcoord0 - TEXCOORD_0 array for skirt data\n * @param {TypedArray | Array} args.newTriangles - trinagle indices array for skirt data\n * @returns {void}\n */\nfunction updateAttributesForNewEdge({\n  edge,\n  edgeIndex,\n  attributes,\n  skirtHeight,\n  newPosition,\n  newTexcoord0,\n  newTriangles\n}) {\n  const positionsLength = attributes.POSITION.value.length;\n  const vertex1Offset = edgeIndex * 2;\n  const vertex2Offset = edgeIndex * 2 + 1;\n\n  // Define POSITION for new 1st vertex\n  newPosition.set(\n    attributes.POSITION.value.subarray(edge[0] * 3, edge[0] * 3 + 3),\n    vertex1Offset * 3\n  );\n  newPosition[vertex1Offset * 3 + 2] = newPosition[vertex1Offset * 3 + 2] - skirtHeight; // put down elevation on the skirt height\n\n  // Define POSITION for new 2nd vertex\n  newPosition.set(\n    attributes.POSITION.value.subarray(edge[1] * 3, edge[1] * 3 + 3),\n    vertex2Offset * 3\n  );\n  newPosition[vertex2Offset * 3 + 2] = newPosition[vertex2Offset * 3 + 2] - skirtHeight; // put down elevation on the skirt height\n\n  // Use same TEXCOORDS for skirt vertices\n  newTexcoord0.set(\n    attributes.TEXCOORD_0.value.subarray(edge[0] * 2, edge[0] * 2 + 2),\n    vertex1Offset * 2\n  );\n  newTexcoord0.set(\n    attributes.TEXCOORD_0.value.subarray(edge[1] * 2, edge[1] * 2 + 2),\n    vertex2Offset * 2\n  );\n\n  // Define new triangles\n  const triangle1Offset = edgeIndex * 2 * 3;\n  newTriangles[triangle1Offset] = edge[0];\n  newTriangles[triangle1Offset + 1] = edge[1];\n  newTriangles[triangle1Offset + 2] = positionsLength / 3 + vertex2Offset;\n\n  newTriangles[triangle1Offset + 3] = positionsLength / 3 + vertex2Offset;\n  newTriangles[triangle1Offset + 4] = positionsLength / 3 + vertex1Offset;\n  newTriangles[triangle1Offset + 5] = edge[0];\n}\n"],"file":"skirt.js"}

package/dist/esm/lib/parse-terrain.js

@@ -172,9 +172,13 @@ function getDelatinTileMesh(meshMaxError, width, height, terrain) {
 }
 
 export default async function loadTerrain(arrayBuffer, options, context) {
-  options.image = options.image || {};
-  options.image.type = 'data';
-  const image = await context.parse(arrayBuffer, options, options.baseUri);
+  const loadImageOptions = { ...options,
+    mimeType: 'application/x.image',
+    image: { ...options.image,
+      type: 'data'
+    }
+  };
+  const image = await context.parse(arrayBuffer, loadImageOptions);
   return getMesh(image, options.terrain);
 }
 //# sourceMappingURL=parse-terrain.js.map

package/dist/esm/lib/parse-terrain.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/parse-terrain.ts"],"names":["getMeshBoundingBox","Martini","Delatin","addSkirt","getTerrain","imageData","width","height","elevationDecoder","tesselator","rScaler","bScaler","gScaler","offset","terrain","Float32Array","i","y","x","k","r","g","b","getMeshAttributes","vertices","bounds","gridSize","numOfVerticies","length","positions","texCoords","minX","minY","maxX","maxY","xScale","yScale","pixelIdx","POSITION","value","size","TEXCOORD_0","getMesh","terrainImage","terrainOptions","meshMaxError","data","mesh","getMartiniTileMesh","getDelatinTileMesh","triangles","attributes","boundingBox","skirtHeight","newAttributes","newTriangles","loaderData","header","vertexCount","mode","indices","Uint32Array","from","martini","tile","createTile","tin","run","coords","loadTerrain","arrayBuffer","options","context","image","type","parse","baseUri"],"mappings":"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","sourcesContent":["import {getMeshBoundingBox} from '@loaders.gl/schema';\nimport Martini from '@mapbox/martini';\nimport Delatin from './delatin';\nimport {addSkirt} from './helpers/skirt';\n\ntype TerrainOptions = {\n  meshMaxError: number;\n  bounds: number[];\n  elevationDecoder: ElevationDecoder;\n  tesselator: 'martini' | 'delatin';\n  skirtHeight?: number;\n};\n\ntype TerrainImage = {\n  data: Uint8Array;\n  width: number;\n  height: number;\n};\n\ntype ElevationDecoder = {\n  rScaler: any;\n  bScaler: any;\n  gScaler: any;\n  offset: number;\n};\n\nfunction getTerrain(\n  imageData: Uint8Array,\n  width: number,\n  height: number,\n  elevationDecoder: ElevationDecoder,\n  tesselator: 'martini' | 'delatin'\n) {\n  const {rScaler, bScaler, gScaler, offset} = elevationDecoder;\n\n  // From Martini demo\n  // https://observablehq.com/@mourner/martin-real-time-rtin-terrain-mesh\n  const terrain = new Float32Array((width + 1) * (height + 1));\n  // decode terrain values\n  for (let i = 0, y = 0; y < height; y++) {\n    for (let x = 0; x < width; x++, i++) {\n      const k = i * 4;\n      const r = imageData[k + 0];\n      const g = imageData[k + 1];\n      const b = imageData[k + 2];\n      terrain[i + y] = r * rScaler + g * gScaler + b * bScaler + offset;\n    }\n  }\n\n  if (tesselator === 'martini') {\n    // backfill bottom border\n    for (let i = (width + 1) * width, x = 0; x < width; x++, i++) {\n      terrain[i] = terrain[i - width - 1];\n    }\n    // backfill right border\n    for (let i = height, y = 0; y < height + 1; y++, i += height + 1) {\n      terrain[i] = terrain[i - 1];\n    }\n  }\n\n  return terrain;\n}\n\nfunction getMeshAttributes(\n  vertices,\n  terrain: Uint8Array,\n  width: number,\n  height: number,\n  bounds: number[]\n) {\n  const gridSize = width + 1;\n  const numOfVerticies = vertices.length / 2;\n  // vec3. x, y in pixels, z in meters\n  const positions = new Float32Array(numOfVerticies * 3);\n  // vec2. 1 to 1 relationship with position. represents the uv on the texture image. 0,0 to 1,1.\n  const texCoords = new Float32Array(numOfVerticies * 2);\n\n  const [minX, minY, maxX, maxY] = bounds || [0, 0, width, height];\n  const xScale = (maxX - minX) / width;\n  const yScale = (maxY - minY) / height;\n\n  for (let i = 0; i < numOfVerticies; i++) {\n    const x = vertices[i * 2];\n    const y = vertices[i * 2 + 1];\n    const pixelIdx = y * gridSize + x;\n\n    positions[3 * i + 0] = x * xScale + minX;\n    positions[3 * i + 1] = -y * yScale + maxY;\n    positions[3 * i + 2] = terrain[pixelIdx];\n\n    texCoords[2 * i + 0] = x / width;\n    texCoords[2 * i + 1] = y / height;\n  }\n\n  return {\n    POSITION: {value: positions, size: 3},\n    TEXCOORD_0: {value: texCoords, size: 2}\n    // NORMAL: {}, - optional, but creates the high poly look with lighting\n  };\n}\n\n/**\n * Returns generated mesh object from image data\n *\n * @param {object} terrainImage terrain image data\n * @param {object} terrainOptions terrain options\n * @returns mesh object\n */\nfunction getMesh(terrainImage: TerrainImage, terrainOptions: TerrainOptions) {\n  if (terrainImage === null) {\n    return null;\n  }\n  const {meshMaxError, bounds, elevationDecoder} = terrainOptions;\n\n  const {data, width, height} = terrainImage;\n\n  let terrain;\n  let mesh;\n  switch (terrainOptions.tesselator) {\n    case 'martini':\n      terrain = getTerrain(data, width, height, elevationDecoder, terrainOptions.tesselator);\n      mesh = getMartiniTileMesh(meshMaxError, width, terrain);\n      break;\n    case 'delatin':\n      terrain = getTerrain(data, width, height, elevationDecoder, terrainOptions.tesselator);\n      mesh = getDelatinTileMesh(meshMaxError, width, height, terrain);\n      break;\n    // auto\n    default:\n      if (width === height && !(height & (width - 1))) {\n        terrain = getTerrain(data, width, height, elevationDecoder, 'martini');\n        mesh = getMartiniTileMesh(meshMaxError, width, terrain);\n      } else {\n        terrain = getTerrain(data, width, height, elevationDecoder, 'delatin');\n        mesh = getDelatinTileMesh(meshMaxError, width, height, terrain);\n      }\n      break;\n  }\n\n  const {vertices} = mesh;\n  let {triangles} = mesh;\n  let attributes = getMeshAttributes(vertices, terrain, width, height, bounds);\n\n  // Compute bounding box before adding skirt so that z values are not skewed\n  const boundingBox = getMeshBoundingBox(attributes);\n\n  if (terrainOptions.skirtHeight) {\n    const {attributes: newAttributes, triangles: newTriangles} = addSkirt(\n      attributes,\n      triangles,\n      terrainOptions.skirtHeight\n    );\n    attributes = newAttributes;\n    triangles = newTriangles;\n  }\n\n  return {\n    // Data return by this loader implementation\n    loaderData: {\n      header: {}\n    },\n    header: {\n      vertexCount: triangles.length,\n      boundingBox\n    },\n    mode: 4, // TRIANGLES\n    indices: {value: Uint32Array.from(triangles), size: 1},\n    attributes\n  };\n}\n\n/**\n * Get Martini generated vertices and triangles\n *\n * @param {number} meshMaxError threshold for simplifying mesh\n * @param {number} width width of the input data\n * @param {number[] | Float32Array} terrain elevation data\n * @returns {{vertices: Uint16Array, triangles: Uint32Array}} vertices and triangles data\n */\nfunction getMartiniTileMesh(meshMaxError, width, terrain) {\n  const gridSize = width + 1;\n  const martini = new Martini(gridSize);\n  const tile = martini.createTile(terrain);\n  const {vertices, triangles} = tile.getMesh(meshMaxError);\n\n  return {vertices, triangles};\n}\n\n/**\n * Get Delatin generated vertices and triangles\n *\n * @param {number} meshMaxError threshold for simplifying mesh\n * @param {number} width width of the input data array\n * @param {number} height height of the input data array\n * @param {number[] | Float32Array} terrain elevation data\n * @returns {{vertices: number[], triangles: number[]}} vertices and triangles data\n */\nfunction getDelatinTileMesh(meshMaxError, width, height, terrain) {\n  const tin = new Delatin(terrain, width + 1, height + 1);\n  tin.run(meshMaxError);\n  // @ts-expect-error\n  const {coords, triangles} = tin;\n  const vertices = coords;\n  return {vertices, triangles};\n}\n\nexport default async function loadTerrain(arrayBuffer, options, context) {\n  options.image = options.image || {};\n  options.image.type = 'data';\n  const image = await context.parse(arrayBuffer, options, options.baseUri);\n  // Extend function to support additional mesh generation options (square grid or delatin)\n  return getMesh(image, options.terrain);\n}\n"],"file":"parse-terrain.js"}
+{"version":3,"sources":["../../../src/lib/parse-terrain.ts"],"names":["getMeshBoundingBox","Martini","Delatin","addSkirt","getTerrain","imageData","width","height","elevationDecoder","tesselator","rScaler","bScaler","gScaler","offset","terrain","Float32Array","i","y","x","k","r","g","b","getMeshAttributes","vertices","bounds","gridSize","numOfVerticies","length","positions","texCoords","minX","minY","maxX","maxY","xScale","yScale","pixelIdx","POSITION","value","size","TEXCOORD_0","getMesh","terrainImage","terrainOptions","meshMaxError","data","mesh","getMartiniTileMesh","getDelatinTileMesh","triangles","attributes","boundingBox","skirtHeight","newAttributes","newTriangles","loaderData","header","vertexCount","mode","indices","Uint32Array","from","martini","tile","createTile","tin","run","coords","loadTerrain","arrayBuffer","options","context","loadImageOptions","mimeType","image","type","parse"],"mappings":"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","sourcesContent":["import {getMeshBoundingBox} from '@loaders.gl/schema';\nimport Martini from '@mapbox/martini';\nimport Delatin from './delatin';\nimport {addSkirt} from './helpers/skirt';\n\ntype TerrainOptions = {\n  meshMaxError: number;\n  bounds: number[];\n  elevationDecoder: ElevationDecoder;\n  tesselator: 'martini' | 'delatin';\n  skirtHeight?: number;\n};\n\ntype TerrainImage = {\n  data: Uint8Array;\n  width: number;\n  height: number;\n};\n\ntype ElevationDecoder = {\n  rScaler: any;\n  bScaler: any;\n  gScaler: any;\n  offset: number;\n};\n\nfunction getTerrain(\n  imageData: Uint8Array,\n  width: number,\n  height: number,\n  elevationDecoder: ElevationDecoder,\n  tesselator: 'martini' | 'delatin'\n) {\n  const {rScaler, bScaler, gScaler, offset} = elevationDecoder;\n\n  // From Martini demo\n  // https://observablehq.com/@mourner/martin-real-time-rtin-terrain-mesh\n  const terrain = new Float32Array((width + 1) * (height + 1));\n  // decode terrain values\n  for (let i = 0, y = 0; y < height; y++) {\n    for (let x = 0; x < width; x++, i++) {\n      const k = i * 4;\n      const r = imageData[k + 0];\n      const g = imageData[k + 1];\n      const b = imageData[k + 2];\n      terrain[i + y] = r * rScaler + g * gScaler + b * bScaler + offset;\n    }\n  }\n\n  if (tesselator === 'martini') {\n    // backfill bottom border\n    for (let i = (width + 1) * width, x = 0; x < width; x++, i++) {\n      terrain[i] = terrain[i - width - 1];\n    }\n    // backfill right border\n    for (let i = height, y = 0; y < height + 1; y++, i += height + 1) {\n      terrain[i] = terrain[i - 1];\n    }\n  }\n\n  return terrain;\n}\n\nfunction getMeshAttributes(\n  vertices,\n  terrain: Uint8Array,\n  width: number,\n  height: number,\n  bounds: number[]\n) {\n  const gridSize = width + 1;\n  const numOfVerticies = vertices.length / 2;\n  // vec3. x, y in pixels, z in meters\n  const positions = new Float32Array(numOfVerticies * 3);\n  // vec2. 1 to 1 relationship with position. represents the uv on the texture image. 0,0 to 1,1.\n  const texCoords = new Float32Array(numOfVerticies * 2);\n\n  const [minX, minY, maxX, maxY] = bounds || [0, 0, width, height];\n  const xScale = (maxX - minX) / width;\n  const yScale = (maxY - minY) / height;\n\n  for (let i = 0; i < numOfVerticies; i++) {\n    const x = vertices[i * 2];\n    const y = vertices[i * 2 + 1];\n    const pixelIdx = y * gridSize + x;\n\n    positions[3 * i + 0] = x * xScale + minX;\n    positions[3 * i + 1] = -y * yScale + maxY;\n    positions[3 * i + 2] = terrain[pixelIdx];\n\n    texCoords[2 * i + 0] = x / width;\n    texCoords[2 * i + 1] = y / height;\n  }\n\n  return {\n    POSITION: {value: positions, size: 3},\n    TEXCOORD_0: {value: texCoords, size: 2}\n    // NORMAL: {}, - optional, but creates the high poly look with lighting\n  };\n}\n\n/**\n * Returns generated mesh object from image data\n *\n * @param {object} terrainImage terrain image data\n * @param {object} terrainOptions terrain options\n * @returns mesh object\n */\nfunction getMesh(terrainImage: TerrainImage, terrainOptions: TerrainOptions) {\n  if (terrainImage === null) {\n    return null;\n  }\n  const {meshMaxError, bounds, elevationDecoder} = terrainOptions;\n\n  const {data, width, height} = terrainImage;\n\n  let terrain;\n  let mesh;\n  switch (terrainOptions.tesselator) {\n    case 'martini':\n      terrain = getTerrain(data, width, height, elevationDecoder, terrainOptions.tesselator);\n      mesh = getMartiniTileMesh(meshMaxError, width, terrain);\n      break;\n    case 'delatin':\n      terrain = getTerrain(data, width, height, elevationDecoder, terrainOptions.tesselator);\n      mesh = getDelatinTileMesh(meshMaxError, width, height, terrain);\n      break;\n    // auto\n    default:\n      if (width === height && !(height & (width - 1))) {\n        terrain = getTerrain(data, width, height, elevationDecoder, 'martini');\n        mesh = getMartiniTileMesh(meshMaxError, width, terrain);\n      } else {\n        terrain = getTerrain(data, width, height, elevationDecoder, 'delatin');\n        mesh = getDelatinTileMesh(meshMaxError, width, height, terrain);\n      }\n      break;\n  }\n\n  const {vertices} = mesh;\n  let {triangles} = mesh;\n  let attributes = getMeshAttributes(vertices, terrain, width, height, bounds);\n\n  // Compute bounding box before adding skirt so that z values are not skewed\n  const boundingBox = getMeshBoundingBox(attributes);\n\n  if (terrainOptions.skirtHeight) {\n    const {attributes: newAttributes, triangles: newTriangles} = addSkirt(\n      attributes,\n      triangles,\n      terrainOptions.skirtHeight\n    );\n    attributes = newAttributes;\n    triangles = newTriangles;\n  }\n\n  return {\n    // Data return by this loader implementation\n    loaderData: {\n      header: {}\n    },\n    header: {\n      vertexCount: triangles.length,\n      boundingBox\n    },\n    mode: 4, // TRIANGLES\n    indices: {value: Uint32Array.from(triangles), size: 1},\n    attributes\n  };\n}\n\n/**\n * Get Martini generated vertices and triangles\n *\n * @param {number} meshMaxError threshold for simplifying mesh\n * @param {number} width width of the input data\n * @param {number[] | Float32Array} terrain elevation data\n * @returns {{vertices: Uint16Array, triangles: Uint32Array}} vertices and triangles data\n */\nfunction getMartiniTileMesh(meshMaxError, width, terrain) {\n  const gridSize = width + 1;\n  const martini = new Martini(gridSize);\n  const tile = martini.createTile(terrain);\n  const {vertices, triangles} = tile.getMesh(meshMaxError);\n\n  return {vertices, triangles};\n}\n\n/**\n * Get Delatin generated vertices and triangles\n *\n * @param {number} meshMaxError threshold for simplifying mesh\n * @param {number} width width of the input data array\n * @param {number} height height of the input data array\n * @param {number[] | Float32Array} terrain elevation data\n * @returns {{vertices: number[], triangles: number[]}} vertices and triangles data\n */\nfunction getDelatinTileMesh(meshMaxError, width, height, terrain) {\n  const tin = new Delatin(terrain, width + 1, height + 1);\n  tin.run(meshMaxError);\n  // @ts-expect-error\n  const {coords, triangles} = tin;\n  const vertices = coords;\n  return {vertices, triangles};\n}\n\nexport default async function loadTerrain(arrayBuffer, options, context) {\n  const loadImageOptions = {\n    ...options,\n    mimeType: 'application/x.image',\n    image: {...options.image, type: 'data'}\n  };\n  const image = await context.parse(arrayBuffer, loadImageOptions);\n  // Extend function to support additional mesh generation options (square grid or delatin)\n  return getMesh(image, options.terrain);\n}\n"],"file":"parse-terrain.js"}

package/dist/esm/lib/utils/version.js

@@ -1,2 +1,2 @@
-export const VERSION = typeof "3.1.3" !== 'undefined' ? "3.1.3" : 'latest';
+export const VERSION = typeof "3.1.7" !== 'undefined' ? "3.1.7" : 'latest';
 //# sourceMappingURL=version.js.map

package/dist/esm/terrain-loader.js

@@ -5,8 +5,8 @@ export const TerrainLoader = {
   module: 'terrain',
   version: VERSION,
   worker: true,
-  extensions: ['png', 'pngraw'],
-  mimeTypes: ['image/png'],
+  extensions: ['png', 'pngraw', 'jpg', 'jpeg', 'gif', 'webp', 'bmp'],
+  mimeTypes: ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/bmp'],
   options: {
     terrain: {
       tesselator: 'auto',

package/dist/esm/terrain-loader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/terrain-loader.ts"],"names":["VERSION","TerrainLoader","name","id","module","version","worker","extensions","mimeTypes","options","terrain","tesselator","bounds","meshMaxError","elevationDecoder","rScaler","gScaler","bScaler","offset","skirtHeight","_typecheckTerrainWorkerLoader"],"mappings":"AACA,SAAQA,OAAR,QAAsB,qBAAtB;AAKA,OAAO,MAAMC,aAAa,GAAG;AAC3BC,EAAAA,IAAI,EAAE,SADqB;AAE3BC,EAAAA,EAAE,EAAE,SAFuB;AAG3BC,EAAAA,MAAM,EAAE,SAHmB;AAI3BC,EAAAA,OAAO,EAAEL,OAJkB;AAK3BM,EAAAA,MAAM,EAAE,IALmB;AAM3BC,EAAAA,UAAU,EAAE,CAAC,KAAD,EAAQ,QAAR,CANe;AAO3BC,EAAAA,SAAS,EAAE,CAAC,WAAD,CAPgB;AAQ3BC,EAAAA,OAAO,EAAE;AACPC,IAAAA,OAAO,EAAE;AACPC,MAAAA,UAAU,EAAE,MADL;AAEPC,MAAAA,MAAM,EAAE,IAFD;AAGPC,MAAAA,YAAY,EAAE,EAHP;AAIPC,MAAAA,gBAAgB,EAAE;AAChBC,QAAAA,OAAO,EAAE,CADO;AAEhBC,QAAAA,OAAO,EAAE,CAFO;AAGhBC,QAAAA,OAAO,EAAE,CAHO;AAIhBC,QAAAA,MAAM,EAAE;AAJQ,OAJX;AAUPC,MAAAA,WAAW,EAAE;AAVN;AADF;AARkB,CAAtB;AA2BP,OAAO,MAAMC,6BAAqC,GAAGnB,aAA9C","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\nimport {VERSION} from './lib/utils/version';\n\n/**\n * Worker loader for quantized meshes\n */\nexport const TerrainLoader = {\n  name: 'Terrain',\n  id: 'terrain',\n  module: 'terrain',\n  version: VERSION,\n  worker: true,\n  extensions: ['png', 'pngraw'],\n  mimeTypes: ['image/png'],\n  options: {\n    terrain: {\n      tesselator: 'auto',\n      bounds: null,\n      meshMaxError: 10,\n      elevationDecoder: {\n        rScaler: 1,\n        gScaler: 0,\n        bScaler: 0,\n        offset: 0\n      },\n      skirtHeight: null\n    }\n  }\n};\n\n/**\n * Loader for quantized meshes\n */\nexport const _typecheckTerrainWorkerLoader: Loader = TerrainLoader;\n"],"file":"terrain-loader.js"}
+{"version":3,"sources":["../../src/terrain-loader.ts"],"names":["VERSION","TerrainLoader","name","id","module","version","worker","extensions","mimeTypes","options","terrain","tesselator","bounds","meshMaxError","elevationDecoder","rScaler","gScaler","bScaler","offset","skirtHeight","_typecheckTerrainWorkerLoader"],"mappings":"AACA,SAAQA,OAAR,QAAsB,qBAAtB;AAKA,OAAO,MAAMC,aAAa,GAAG;AAC3BC,EAAAA,IAAI,EAAE,SADqB;AAE3BC,EAAAA,EAAE,EAAE,SAFuB;AAG3BC,EAAAA,MAAM,EAAE,SAHmB;AAI3BC,EAAAA,OAAO,EAAEL,OAJkB;AAK3BM,EAAAA,MAAM,EAAE,IALmB;AAM3BC,EAAAA,UAAU,EAAE,CAAC,KAAD,EAAQ,QAAR,EAAkB,KAAlB,EAAyB,MAAzB,EAAiC,KAAjC,EAAwC,MAAxC,EAAgD,KAAhD,CANe;AAO3BC,EAAAA,SAAS,EAAE,CAAC,WAAD,EAAc,YAAd,EAA4B,WAA5B,EAAyC,YAAzC,EAAuD,WAAvD,CAPgB;AAQ3BC,EAAAA,OAAO,EAAE;AACPC,IAAAA,OAAO,EAAE;AACPC,MAAAA,UAAU,EAAE,MADL;AAEPC,MAAAA,MAAM,EAAE,IAFD;AAGPC,MAAAA,YAAY,EAAE,EAHP;AAIPC,MAAAA,gBAAgB,EAAE;AAChBC,QAAAA,OAAO,EAAE,CADO;AAEhBC,QAAAA,OAAO,EAAE,CAFO;AAGhBC,QAAAA,OAAO,EAAE,CAHO;AAIhBC,QAAAA,MAAM,EAAE;AAJQ,OAJX;AAUPC,MAAAA,WAAW,EAAE;AAVN;AADF;AARkB,CAAtB;AA2BP,OAAO,MAAMC,6BAAqC,GAAGnB,aAA9C","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\nimport {VERSION} from './lib/utils/version';\n\n/**\n * Worker loader for color-encoded images\n */\nexport const TerrainLoader = {\n  name: 'Terrain',\n  id: 'terrain',\n  module: 'terrain',\n  version: VERSION,\n  worker: true,\n  extensions: ['png', 'pngraw', 'jpg', 'jpeg', 'gif', 'webp', 'bmp'],\n  mimeTypes: ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/bmp'],\n  options: {\n    terrain: {\n      tesselator: 'auto',\n      bounds: null,\n      meshMaxError: 10,\n      elevationDecoder: {\n        rScaler: 1,\n        gScaler: 0,\n        bScaler: 0,\n        offset: 0\n      },\n      skirtHeight: null\n    }\n  }\n};\n\n/**\n * Loader for color-encoded images\n */\nexport const _typecheckTerrainWorkerLoader: Loader = TerrainLoader;\n"],"file":"terrain-loader.js"}

package/dist/lib/helpers/skirt.js

@@ -56,13 +56,13 @@ function getOutsideEdgesFromTriangles(triangles) {
     }
     edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));
     const outsideEdges = [];
-    let index = 1;
+    let index = 0;
     while (index < edges.length) {
-        if (edges[index][0] === edges[index - 1][1] && edges[index][1] === edges[index - 1][0]) {
+        if (edges[index][0] === edges[index + 1]?.[1] && edges[index][1] === edges[index + 1]?.[0]) {
             index += 2;
         }
         else {
-            outsideEdges.push(edges[index - 1]);
+            outsideEdges.push(edges[index]);
             index++;
         }
     }

package/dist/lib/parse-terrain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-terrain.d.ts","sourceRoot":"","sources":["../../src/lib/parse-terrain.ts"],"names":[],"mappings":"AA8MA,wBAA8B,WAAW,CAAC,WAAW,KAAA,EAAE,OAAO,KAAA,EAAE,OAAO,KAAA;;;;;;;;;;;;;;;;;;;;;;;UAMtE"}
+{"version":3,"file":"parse-terrain.d.ts","sourceRoot":"","sources":["../../src/lib/parse-terrain.ts"],"names":[],"mappings":"AA8MA,wBAA8B,WAAW,CAAC,WAAW,KAAA,EAAE,OAAO,KAAA,EAAE,OAAO,KAAA;;;;;;;;;;;;;;;;;;;;;;;UAStE"}

package/dist/lib/parse-terrain.js

@@ -153,9 +153,12 @@ function getDelatinTileMesh(meshMaxError, width, height, terrain) {
     return { vertices, triangles };
 }
 async function loadTerrain(arrayBuffer, options, context) {
-    options.image = options.image || {};
-    options.image.type = 'data';
-    const image = await context.parse(arrayBuffer, options, options.baseUri);
+    const loadImageOptions = {
+        ...options,
+        mimeType: 'application/x.image',
+        image: { ...options.image, type: 'data' }
+    };
+    const image = await context.parse(arrayBuffer, loadImageOptions);
     // Extend function to support additional mesh generation options (square grid or delatin)
     return getMesh(image, options.terrain);
 }

package/dist/quantized-mesh-worker.js

@@ -434,12 +434,12 @@
     }
     edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));
     const outsideEdges = [];
-    let index = 1;
+    let index = 0;
     while (index < edges.length) {
-      if (edges[index][0] === edges[index - 1][1] && edges[index][1] === edges[index - 1][0]) {
+      if (edges[index][0] === edges[index + 1]?.[1] && edges[index][1] === edges[index + 1]?.[0]) {
         index += 2;
       } else {
-        outsideEdges.push(edges[index - 1]);
+        outsideEdges.push(edges[index]);
         index++;
       }
     }
@@ -1151,14 +1151,17 @@
     return { vertices, triangles };
   }
   async function loadTerrain(arrayBuffer, options, context) {
-    options.image = options.image || {};
-    options.image.type = "data";
-    const image = await context.parse(arrayBuffer, options, options.baseUri);
+    const loadImageOptions = {
+      ...options,
+      mimeType: "application/x.image",
+      image: { ...options.image, type: "data" }
+    };
+    const image = await context.parse(arrayBuffer, loadImageOptions);
     return getMesh(image, options.terrain);
   }
 
   // src/lib/utils/version.ts
-  var VERSION = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
+  var VERSION = true ? "3.1.7" : "latest";
 
   // src/terrain-loader.ts
   var TerrainLoader = {
@@ -1167,8 +1170,8 @@
     module: "terrain",
     version: VERSION,
     worker: true,
-    extensions: ["png", "pngraw"],
-    mimeTypes: ["image/png"],
+    extensions: ["png", "pngraw", "jpg", "jpeg", "gif", "webp", "bmp"],
+    mimeTypes: ["image/png", "image/jpeg", "image/gif", "image/webp", "image/bmp"],
     options: {
       terrain: {
         tesselator: "auto",
@@ -1213,6 +1216,6 @@
     parse: async (arrayBuffer, options) => loadQuantizedMesh(arrayBuffer, options)
   };
 
-  // src/workers/quantized-mesh-worker.js
+  // src/workers/quantized-mesh-worker.ts
   createLoaderWorker(QuantizedMeshLoader2);
 })();

package/dist/terrain-loader.d.ts

@@ -1,6 +1,6 @@
 import type { Loader } from '@loaders.gl/loader-utils';
 /**
- * Worker loader for quantized meshes
+ * Worker loader for color-encoded images
  */
 export declare const TerrainLoader: {
     name: string;
@@ -26,7 +26,7 @@ export declare const TerrainLoader: {
     };
 };
 /**
- * Loader for quantized meshes
+ * Loader for color-encoded images
  */
 export declare const _typecheckTerrainWorkerLoader: Loader;
 //# sourceMappingURL=terrain-loader.d.ts.map

package/dist/terrain-loader.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports._typecheckTerrainWorkerLoader = exports.TerrainLoader = void 0;
 const version_1 = require("./lib/utils/version");
 /**
- * Worker loader for quantized meshes
+ * Worker loader for color-encoded images
  */
 exports.TerrainLoader = {
     name: 'Terrain',
@@ -11,8 +11,8 @@ exports.TerrainLoader = {
     module: 'terrain',
     version: version_1.VERSION,
     worker: true,
-    extensions: ['png', 'pngraw'],
-    mimeTypes: ['image/png'],
+    extensions: ['png', 'pngraw', 'jpg', 'jpeg', 'gif', 'webp', 'bmp'],
+    mimeTypes: ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/bmp'],
     options: {
         terrain: {
             tesselator: 'auto',
@@ -29,6 +29,6 @@ exports.TerrainLoader = {
     }
 };
 /**
- * Loader for quantized meshes
+ * Loader for color-encoded images
  */
 exports._typecheckTerrainWorkerLoader = exports.TerrainLoader;

package/dist/terrain-worker.js

@@ -434,12 +434,12 @@
     }
     edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));
     const outsideEdges = [];
-    let index = 1;
+    let index = 0;
     while (index < edges.length) {
-      if (edges[index][0] === edges[index - 1][1] && edges[index][1] === edges[index - 1][0]) {
+      if (edges[index][0] === edges[index + 1]?.[1] && edges[index][1] === edges[index + 1]?.[0]) {
         index += 2;
       } else {
-        outsideEdges.push(edges[index - 1]);
+        outsideEdges.push(edges[index]);
         index++;
       }
     }
@@ -1151,14 +1151,17 @@
     return { vertices, triangles };
   }
   async function loadTerrain(arrayBuffer, options, context) {
-    options.image = options.image || {};
-    options.image.type = "data";
-    const image = await context.parse(arrayBuffer, options, options.baseUri);
+    const loadImageOptions = {
+      ...options,
+      mimeType: "application/x.image",
+      image: { ...options.image, type: "data" }
+    };
+    const image = await context.parse(arrayBuffer, loadImageOptions);
     return getMesh(image, options.terrain);
   }
 
   // src/lib/utils/version.ts
-  var VERSION = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
+  var VERSION = true ? "3.1.7" : "latest";
 
   // src/terrain-loader.ts
   var TerrainLoader = {
@@ -1167,8 +1170,8 @@
     module: "terrain",
     version: VERSION,
     worker: true,
-    extensions: ["png", "pngraw"],
-    mimeTypes: ["image/png"],
+    extensions: ["png", "pngraw", "jpg", "jpeg", "gif", "webp", "bmp"],
+    mimeTypes: ["image/png", "image/jpeg", "image/gif", "image/webp", "image/bmp"],
     options: {
       terrain: {
         tesselator: "auto",
@@ -1213,6 +1216,6 @@
     parse: async (arrayBuffer, options) => loadQuantizedMesh(arrayBuffer, options)
   };
 
-  // src/workers/terrain-worker.js
+  // src/workers/terrain-worker.ts
   createLoaderWorker(TerrainLoader2);
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/terrain",
-  "version": "3.1.3",
+  "version": "3.1.7",
   "description": "Framework-independent loader for terrain raster formats",
   "license": "MIT",
   "publishConfig": {
@@ -30,14 +30,14 @@
   "scripts": {
     "pre-build": "npm run build-worker && npm run build-worker2 && npm run build-bundle",
     "build-bundle": "esbuild src/bundle.ts --bundle --outfile=dist/dist.min.js",
-    "build-worker": "esbuild src/workers/terrain-worker.js --bundle --outfile=dist/terrain-worker.js",
-    "build-worker2": "esbuild src/workers/quantized-mesh-worker.js --bundle --outfile=dist/quantized-mesh-worker.js"
+    "build-worker": "esbuild src/workers/terrain-worker.ts --bundle --outfile=dist/terrain-worker.js --define:__VERSION__=\\\"$npm_package_version\\\"",
+    "build-worker2": "esbuild src/workers/quantized-mesh-worker.ts --bundle --outfile=dist/quantized-mesh-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/loader-utils": "3.1.3",
-    "@loaders.gl/schema": "3.1.3",
+    "@loaders.gl/loader-utils": "3.1.7",
+    "@loaders.gl/schema": "3.1.7",
     "@mapbox/martini": "^0.2.0"
   },
-  "gitHead": "4a690c369779346d73c9a27395d1c08d77d279a4"
+  "gitHead": "e48d29e426e9f23879875763e73efc5c58345be1"
 }

package/src/lib/helpers/skirt.ts

@@ -70,12 +70,12 @@ function getOutsideEdgesFromTriangles(triangles) {
   edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));
 
   const outsideEdges: number[][] = [];
-  let index = 1;
+  let index = 0;
   while (index < edges.length) {
-    if (edges[index][0] === edges[index - 1][1] && edges[index][1] === edges[index - 1][0]) {
+    if (edges[index][0] === edges[index + 1]?.[1] && edges[index][1] === edges[index + 1]?.[0]) {
       index += 2;
     } else {
-      outsideEdges.push(edges[index - 1]);
+      outsideEdges.push(edges[index]);
       index++;
     }
   }

package/src/lib/parse-terrain.ts

@@ -205,9 +205,12 @@ function getDelatinTileMesh(meshMaxError, width, height, terrain) {
 }
 
 export default async function loadTerrain(arrayBuffer, options, context) {
-  options.image = options.image || {};
-  options.image.type = 'data';
-  const image = await context.parse(arrayBuffer, options, options.baseUri);
+  const loadImageOptions = {
+    ...options,
+    mimeType: 'application/x.image',
+    image: {...options.image, type: 'data'}
+  };
+  const image = await context.parse(arrayBuffer, loadImageOptions);
   // Extend function to support additional mesh generation options (square grid or delatin)
   return getMesh(image, options.terrain);
 }

package/src/terrain-loader.ts

@@ -2,7 +2,7 @@ import type {Loader} from '@loaders.gl/loader-utils';
 import {VERSION} from './lib/utils/version';
 
 /**
- * Worker loader for quantized meshes
+ * Worker loader for color-encoded images
  */
 export const TerrainLoader = {
   name: 'Terrain',
@@ -10,8 +10,8 @@ export const TerrainLoader = {
   module: 'terrain',
   version: VERSION,
   worker: true,
-  extensions: ['png', 'pngraw'],
-  mimeTypes: ['image/png'],
+  extensions: ['png', 'pngraw', 'jpg', 'jpeg', 'gif', 'webp', 'bmp'],
+  mimeTypes: ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/bmp'],
   options: {
     terrain: {
       tesselator: 'auto',
@@ -29,6 +29,6 @@ export const TerrainLoader = {
 };
 
 /**
- * Loader for quantized meshes
+ * Loader for color-encoded images
  */
 export const _typecheckTerrainWorkerLoader: Loader = TerrainLoader;

package/src/workers/quantized-mesh-worker.js

@@ -1,3 +0,0 @@
-import {createLoaderWorker} from '@loaders.gl/loader-utils';
-import {QuantizedMeshLoader} from '../index';
-createLoaderWorker(QuantizedMeshLoader);

package/src/workers/terrain-worker.js

@@ -1,3 +0,0 @@
-import {createLoaderWorker} from '@loaders.gl/loader-utils';
-import {TerrainLoader} from '../index';
-createLoaderWorker(TerrainLoader);