@loaders.gl/terrain 4.0.0-alpha.4 → 4.0.0-alpha.6

package/dist/workers/quantized-mesh-worker.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/workers/quantized-mesh-worker.ts"],"names":["createLoaderWorker","QuantizedMeshLoader"],"mappings":"AAAA,SAAQA,kBAAR,QAAiC,0BAAjC;AACA,SAAQC,mBAAR,QAAkC,UAAlC;AAEAD,kBAAkB,CAACC,mBAAD,CAAlB","sourcesContent":["import {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {QuantizedMeshLoader} from '../index';\n\ncreateLoaderWorker(QuantizedMeshLoader);\n"],"file":"quantized-mesh-worker.js"}

package/dist/workers/terrain-worker.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/workers/terrain-worker.ts"],"names":["createLoaderWorker","TerrainLoader"],"mappings":"AAAA,SAAQA,kBAAR,QAAiC,0BAAjC;AACA,SAAQC,aAAR,QAA4B,UAA5B;AAEAD,kBAAkB,CAACC,aAAD,CAAlB","sourcesContent":["import {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {TerrainLoader} from '../index';\n\ncreateLoaderWorker(TerrainLoader);\n"],"file":"terrain-worker.js"}

package/src/lib/helpers/skirt.js

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

package/src/lib/parse-quantized-mesh.js

@@ -1,98 +0,0 @@
-import {getMeshBoundingBox} from '@loaders.gl/schema';
-import decode, {DECODING_STEPS} from './decode-quantized-mesh';
-import {addSkirt} from './helpers/skirt';
-
-function getMeshAttributes(vertexData, header, bounds) {
-  const {minHeight, maxHeight} = header;
-  const [minX, minY, maxX, maxY] = bounds || [0, 0, 1, 1];
-  const xScale = maxX - minX;
-  const yScale = maxY - minY;
-  const zScale = maxHeight - minHeight;
-
-  const nCoords = vertexData.length / 3;
-  // vec3. x, y defined by bounds, z in meters
-  const positions = new Float32Array(nCoords * 3);
-
-  // vec2. 1 to 1 relationship with position. represents the uv on the texture image. 0,0 to 1,1.
-  const texCoords = new Float32Array(nCoords * 2);
-
-  // Data is not interleaved; all u, then all v, then all heights
-  for (let i = 0; i < nCoords; i++) {
-    const x = vertexData[i] / 32767;
-    const y = vertexData[i + nCoords] / 32767;
-    const z = vertexData[i + nCoords * 2] / 32767;
-
-    positions[3 * i + 0] = x * xScale + minX;
-    positions[3 * i + 1] = y * yScale + minY;
-    positions[3 * i + 2] = z * zScale + minHeight;
-
-    texCoords[2 * i + 0] = x;
-    texCoords[2 * i + 1] = y;
-  }
-
-  return {
-    POSITION: {value: positions, size: 3},
-    TEXCOORD_0: {value: texCoords, size: 2}
-    // TODO: Parse normals if they exist in the file
-    // NORMAL: {}, - optional, but creates the high poly look with lighting
-  };
-}
-
-function getTileMesh(arrayBuffer, options) {
-  if (!arrayBuffer) {
-    return null;
-  }
-  const {bounds} = options;
-  // Don't parse edge indices or format extensions
-  const {
-    header,
-    vertexData,
-    triangleIndices: originalTriangleIndices,
-    westIndices,
-    northIndices,
-    eastIndices,
-    southIndices
-  } = decode(arrayBuffer, DECODING_STEPS.triangleIndices);
-  let triangleIndices = originalTriangleIndices;
-  let attributes = getMeshAttributes(vertexData, header, bounds);
-
-  // Compute bounding box before adding skirt so that z values are not skewed
-  // TODO: Find bounding box from header, instead of doing extra pass over
-  // vertices.
-  const boundingBox = getMeshBoundingBox(attributes);
-
-  if (options.skirtHeight) {
-    const {attributes: newAttributes, triangles: newTriangles} = addSkirt(
-      attributes,
-      triangleIndices,
-      options.skirtHeight,
-      {
-        westIndices,
-        northIndices,
-        eastIndices,
-        southIndices
-      }
-    );
-    attributes = newAttributes;
-    triangleIndices = newTriangles;
-  }
-
-  return {
-    // Data return by this loader implementation
-    loaderData: {
-      header: {}
-    },
-    header: {
-      // @ts-ignore
-      vertexCount: triangleIndices.length,
-      boundingBox
-    },
-    mode: 4, // TRIANGLES
-    indices: {value: triangleIndices, size: 1},
-    attributes
-  };
-}
-
-export default function loadQuantizedMesh(arrayBuffer, options) {
-  return getTileMesh(arrayBuffer, options['quantized-mesh']);
-}

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

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

package/src/workers/terrain-worker.js

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