@loaders.gl/terrain 3.4.13 → 3.4.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/es5/bundle.js +1 -1
- package/dist/es5/bundle.js.map +1 -1
- package/dist/es5/index.js +11 -30
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/decode-quantized-mesh.js +105 -116
- package/dist/es5/lib/decode-quantized-mesh.js.map +1 -1
- package/dist/es5/lib/delatin/index.js +309 -355
- package/dist/es5/lib/delatin/index.js.map +1 -1
- package/dist/es5/lib/helpers/skirt.js +40 -50
- package/dist/es5/lib/helpers/skirt.js.map +1 -1
- package/dist/es5/lib/parse-quantized-mesh.js +43 -45
- package/dist/es5/lib/parse-quantized-mesh.js.map +1 -1
- package/dist/es5/lib/parse-terrain.js +82 -97
- package/dist/es5/lib/parse-terrain.js.map +1 -1
- package/dist/es5/lib/utils/version.js +1 -1
- package/dist/es5/lib/utils/version.js.map +1 -1
- package/dist/es5/quantized-mesh-loader.js +2 -2
- package/dist/es5/quantized-mesh-loader.js.map +1 -1
- package/dist/es5/terrain-loader.js +2 -2
- package/dist/es5/terrain-loader.js.map +1 -1
- package/dist/esm/lib/utils/version.js +1 -1
- package/dist/quantized-mesh-worker.js +1 -1
- package/dist/terrain-worker.js +1 -1
- package/package.json +5 -5
|
@@ -5,58 +5,49 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.default = loadTerrain;
|
|
8
|
-
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
11
|
-
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
12
8
|
var _schema = require("@loaders.gl/schema");
|
|
13
9
|
var _martini = _interopRequireDefault(require("@mapbox/martini"));
|
|
14
10
|
var _delatin = _interopRequireDefault(require("./delatin"));
|
|
15
11
|
var _skirt = require("./helpers/skirt");
|
|
16
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
17
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
18
12
|
function getTerrain(imageData, width, height, elevationDecoder, tesselator) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
13
|
+
const {
|
|
14
|
+
rScaler,
|
|
15
|
+
bScaler,
|
|
16
|
+
gScaler,
|
|
17
|
+
offset
|
|
18
|
+
} = elevationDecoder;
|
|
19
|
+
const terrain = new Float32Array((width + 1) * (height + 1));
|
|
20
|
+
for (let i = 0, y = 0; y < height; y++) {
|
|
21
|
+
for (let x = 0; x < width; x++, i++) {
|
|
22
|
+
const k = i * 4;
|
|
23
|
+
const r = imageData[k + 0];
|
|
24
|
+
const g = imageData[k + 1];
|
|
25
|
+
const b = imageData[k + 2];
|
|
30
26
|
terrain[i + y] = r * rScaler + g * gScaler + b * bScaler + offset;
|
|
31
27
|
}
|
|
32
28
|
}
|
|
33
29
|
if (tesselator === 'martini') {
|
|
34
|
-
for (
|
|
35
|
-
terrain[
|
|
30
|
+
for (let i = (width + 1) * width, x = 0; x < width; x++, i++) {
|
|
31
|
+
terrain[i] = terrain[i - width - 1];
|
|
36
32
|
}
|
|
37
|
-
for (
|
|
38
|
-
terrain[
|
|
33
|
+
for (let i = height, y = 0; y < height + 1; y++, i += height + 1) {
|
|
34
|
+
terrain[i] = terrain[i - 1];
|
|
39
35
|
}
|
|
40
36
|
}
|
|
41
37
|
return terrain;
|
|
42
38
|
}
|
|
43
39
|
function getMeshAttributes(vertices, terrain, width, height, bounds) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
var yScale = (maxY - minY) / height;
|
|
56
|
-
for (var i = 0; i < numOfVerticies; i++) {
|
|
57
|
-
var x = vertices[i * 2];
|
|
58
|
-
var y = vertices[i * 2 + 1];
|
|
59
|
-
var pixelIdx = y * gridSize + x;
|
|
40
|
+
const gridSize = width + 1;
|
|
41
|
+
const numOfVerticies = vertices.length / 2;
|
|
42
|
+
const positions = new Float32Array(numOfVerticies * 3);
|
|
43
|
+
const texCoords = new Float32Array(numOfVerticies * 2);
|
|
44
|
+
const [minX, minY, maxX, maxY] = bounds || [0, 0, width, height];
|
|
45
|
+
const xScale = (maxX - minX) / width;
|
|
46
|
+
const yScale = (maxY - minY) / height;
|
|
47
|
+
for (let i = 0; i < numOfVerticies; i++) {
|
|
48
|
+
const x = vertices[i * 2];
|
|
49
|
+
const y = vertices[i * 2 + 1];
|
|
50
|
+
const pixelIdx = y * gridSize + x;
|
|
60
51
|
positions[3 * i + 0] = x * xScale + minX;
|
|
61
52
|
positions[3 * i + 1] = -y * yScale + maxY;
|
|
62
53
|
positions[3 * i + 2] = terrain[pixelIdx];
|
|
@@ -78,14 +69,18 @@ function getMesh(terrainImage, terrainOptions) {
|
|
|
78
69
|
if (terrainImage === null) {
|
|
79
70
|
return null;
|
|
80
71
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
72
|
+
const {
|
|
73
|
+
meshMaxError,
|
|
74
|
+
bounds,
|
|
75
|
+
elevationDecoder
|
|
76
|
+
} = terrainOptions;
|
|
77
|
+
const {
|
|
78
|
+
data,
|
|
79
|
+
width,
|
|
80
|
+
height
|
|
81
|
+
} = terrainImage;
|
|
82
|
+
let terrain;
|
|
83
|
+
let mesh;
|
|
89
84
|
switch (terrainOptions.tesselator) {
|
|
90
85
|
case 'martini':
|
|
91
86
|
terrain = getTerrain(data, width, height, elevationDecoder, terrainOptions.tesselator);
|
|
@@ -105,16 +100,19 @@ function getMesh(terrainImage, terrainOptions) {
|
|
|
105
100
|
}
|
|
106
101
|
break;
|
|
107
102
|
}
|
|
108
|
-
|
|
109
|
-
vertices
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
103
|
+
const {
|
|
104
|
+
vertices
|
|
105
|
+
} = mesh;
|
|
106
|
+
let {
|
|
107
|
+
triangles
|
|
108
|
+
} = mesh;
|
|
109
|
+
let attributes = getMeshAttributes(vertices, terrain, width, height, bounds);
|
|
110
|
+
const boundingBox = (0, _schema.getMeshBoundingBox)(attributes);
|
|
114
111
|
if (terrainOptions.skirtHeight) {
|
|
115
|
-
|
|
116
|
-
newAttributes
|
|
117
|
-
newTriangles
|
|
112
|
+
const {
|
|
113
|
+
attributes: newAttributes,
|
|
114
|
+
triangles: newTriangles
|
|
115
|
+
} = (0, _skirt.addSkirt)(attributes, triangles, terrainOptions.skirtHeight);
|
|
118
116
|
attributes = newAttributes;
|
|
119
117
|
triangles = newTriangles;
|
|
120
118
|
}
|
|
@@ -124,65 +122,52 @@ function getMesh(terrainImage, terrainOptions) {
|
|
|
124
122
|
},
|
|
125
123
|
header: {
|
|
126
124
|
vertexCount: triangles.length,
|
|
127
|
-
boundingBox
|
|
125
|
+
boundingBox
|
|
128
126
|
},
|
|
129
127
|
mode: 4,
|
|
130
128
|
indices: {
|
|
131
129
|
value: Uint32Array.from(triangles),
|
|
132
130
|
size: 1
|
|
133
131
|
},
|
|
134
|
-
attributes
|
|
132
|
+
attributes
|
|
135
133
|
};
|
|
136
134
|
}
|
|
137
135
|
function getMartiniTileMesh(meshMaxError, width, terrain) {
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
vertices
|
|
143
|
-
triangles
|
|
136
|
+
const gridSize = width + 1;
|
|
137
|
+
const martini = new _martini.default(gridSize);
|
|
138
|
+
const tile = martini.createTile(terrain);
|
|
139
|
+
const {
|
|
140
|
+
vertices,
|
|
141
|
+
triangles
|
|
142
|
+
} = tile.getMesh(meshMaxError);
|
|
144
143
|
return {
|
|
145
|
-
vertices
|
|
146
|
-
triangles
|
|
144
|
+
vertices,
|
|
145
|
+
triangles
|
|
147
146
|
};
|
|
148
147
|
}
|
|
149
148
|
function getDelatinTileMesh(meshMaxError, width, height, terrain) {
|
|
150
|
-
|
|
149
|
+
const tin = new _delatin.default(terrain, width + 1, height + 1);
|
|
151
150
|
tin.run(meshMaxError);
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
151
|
+
const {
|
|
152
|
+
coords,
|
|
153
|
+
triangles
|
|
154
|
+
} = tin;
|
|
155
|
+
const vertices = coords;
|
|
155
156
|
return {
|
|
156
|
-
vertices
|
|
157
|
-
triangles
|
|
157
|
+
vertices,
|
|
158
|
+
triangles
|
|
158
159
|
};
|
|
159
160
|
}
|
|
160
|
-
function loadTerrain(
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
image: _objectSpread(_objectSpread({}, options.image), {}, {
|
|
172
|
-
type: 'data'
|
|
173
|
-
})
|
|
174
|
-
});
|
|
175
|
-
_context.next = 3;
|
|
176
|
-
return context.parse(arrayBuffer, loadImageOptions);
|
|
177
|
-
case 3:
|
|
178
|
-
image = _context.sent;
|
|
179
|
-
return _context.abrupt("return", getMesh(image, options.terrain));
|
|
180
|
-
case 5:
|
|
181
|
-
case "end":
|
|
182
|
-
return _context.stop();
|
|
183
|
-
}
|
|
184
|
-
}, _callee);
|
|
185
|
-
}));
|
|
186
|
-
return _loadTerrain.apply(this, arguments);
|
|
161
|
+
async function loadTerrain(arrayBuffer, options, context) {
|
|
162
|
+
const loadImageOptions = {
|
|
163
|
+
...options,
|
|
164
|
+
mimeType: 'application/x.image',
|
|
165
|
+
image: {
|
|
166
|
+
...options.image,
|
|
167
|
+
type: 'data'
|
|
168
|
+
}
|
|
169
|
+
};
|
|
170
|
+
const image = await context.parse(arrayBuffer, loadImageOptions);
|
|
171
|
+
return getMesh(image, options.terrain);
|
|
187
172
|
}
|
|
188
173
|
//# sourceMappingURL=parse-terrain.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-terrain.js","names":["_schema","require","_martini","_interopRequireDefault","_delatin","_skirt","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","getTerrain","imageData","width","height","elevationDecoder","tesselator","rScaler","bScaler","gScaler","offset","terrain","Float32Array","y","x","k","r","g","b","getMeshAttributes","vertices","bounds","gridSize","numOfVerticies","positions","texCoords","_ref","_ref2","_slicedToArray2","minX","minY","maxX","maxY","xScale","yScale","pixelIdx","POSITION","value","size","TEXCOORD_0","getMesh","terrainImage","terrainOptions","meshMaxError","data","mesh","getMartiniTileMesh","getDelatinTileMesh","_mesh","_mesh2","triangles","attributes","boundingBox","getMeshBoundingBox","skirtHeight","_addSkirt","addSkirt","newAttributes","newTriangles","loaderData","header","vertexCount","mode","indices","Uint32Array","from","martini","Martini","tile","createTile","_tile$getMesh","tin","Delatin","run","coords","loadTerrain","_x2","_x3","_x4","_loadTerrain","_asyncToGenerator2","_regenerator","mark","_callee","arrayBuffer","options","context","loadImageOptions","image","wrap","_callee$","_context","prev","next","mimeType","type","parse","sent","abrupt","stop"],"sources":["../../../src/lib/parse-terrain.ts"],"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"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parse-terrain.js","names":["_schema","require","_martini","_interopRequireDefault","_delatin","_skirt","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","getMeshBoundingBox","skirtHeight","newAttributes","newTriangles","addSkirt","loaderData","header","vertexCount","mode","indices","Uint32Array","from","martini","Martini","tile","createTile","tin","Delatin","run","coords","loadTerrain","arrayBuffer","options","context","loadImageOptions","mimeType","image","type","parse"],"sources":["../../../src/lib/parse-terrain.ts"],"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"],"mappings":"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"}
|
|
@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.VERSION = void 0;
|
|
7
|
-
|
|
7
|
+
const VERSION = typeof "3.4.15" !== 'undefined' ? "3.4.15" : 'latest';
|
|
8
8
|
exports.VERSION = VERSION;
|
|
9
9
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","names":["VERSION","exports"],"sources":["../../../../src/lib/utils/version.ts"],"sourcesContent":["// Version constant cannot be imported, it needs to correspond to the build version of **this** module.\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nexport const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n"],"mappings":";;;;;;AAGO,
|
|
1
|
+
{"version":3,"file":"version.js","names":["VERSION","exports"],"sources":["../../../../src/lib/utils/version.ts"],"sourcesContent":["// Version constant cannot be imported, it needs to correspond to the build version of **this** module.\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nexport const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n"],"mappings":";;;;;;AAGO,MAAMA,OAAO,GAAG,eAAkB,KAAK,WAAW,cAAiB,QAAQ;AAACC,OAAA,CAAAD,OAAA,GAAAA,OAAA"}
|
|
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports._typecheckQuantizedMeshLoader = exports.QuantizedMeshLoader = void 0;
|
|
7
7
|
var _version = require("./lib/utils/version");
|
|
8
|
-
|
|
8
|
+
const QuantizedMeshLoader = {
|
|
9
9
|
name: 'Quantized Mesh',
|
|
10
10
|
id: 'quantized-mesh',
|
|
11
11
|
module: 'terrain',
|
|
@@ -21,6 +21,6 @@ var QuantizedMeshLoader = {
|
|
|
21
21
|
}
|
|
22
22
|
};
|
|
23
23
|
exports.QuantizedMeshLoader = QuantizedMeshLoader;
|
|
24
|
-
|
|
24
|
+
const _typecheckQuantizedMeshLoader = QuantizedMeshLoader;
|
|
25
25
|
exports._typecheckQuantizedMeshLoader = _typecheckQuantizedMeshLoader;
|
|
26
26
|
//# sourceMappingURL=quantized-mesh-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quantized-mesh-loader.js","names":["_version","require","QuantizedMeshLoader","name","id","module","version","VERSION","worker","extensions","mimeTypes","options","bounds","skirtHeight","exports","_typecheckQuantizedMeshLoader"],"sources":["../../src/quantized-mesh-loader.ts"],"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 QuantizedMeshLoader = {\n name: 'Quantized Mesh',\n id: 'quantized-mesh',\n module: 'terrain',\n version: VERSION,\n worker: true,\n extensions: ['terrain'],\n mimeTypes: ['application/vnd.quantized-mesh'],\n options: {\n 'quantized-mesh': {\n bounds: [0, 0, 1, 1],\n skirtHeight: null\n }\n }\n};\n\nexport const _typecheckQuantizedMeshLoader: Loader = QuantizedMeshLoader;\n"],"mappings":";;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AAKO,
|
|
1
|
+
{"version":3,"file":"quantized-mesh-loader.js","names":["_version","require","QuantizedMeshLoader","name","id","module","version","VERSION","worker","extensions","mimeTypes","options","bounds","skirtHeight","exports","_typecheckQuantizedMeshLoader"],"sources":["../../src/quantized-mesh-loader.ts"],"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 QuantizedMeshLoader = {\n name: 'Quantized Mesh',\n id: 'quantized-mesh',\n module: 'terrain',\n version: VERSION,\n worker: true,\n extensions: ['terrain'],\n mimeTypes: ['application/vnd.quantized-mesh'],\n options: {\n 'quantized-mesh': {\n bounds: [0, 0, 1, 1],\n skirtHeight: null\n }\n }\n};\n\nexport const _typecheckQuantizedMeshLoader: Loader = QuantizedMeshLoader;\n"],"mappings":";;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AAKO,MAAMC,mBAAmB,GAAG;EACjCC,IAAI,EAAE,gBAAgB;EACtBC,EAAE,EAAE,gBAAgB;EACpBC,MAAM,EAAE,SAAS;EACjBC,OAAO,EAAEC,gBAAO;EAChBC,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,CAAC,SAAS,CAAC;EACvBC,SAAS,EAAE,CAAC,gCAAgC,CAAC;EAC7CC,OAAO,EAAE;IACP,gBAAgB,EAAE;MAChBC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;MACpBC,WAAW,EAAE;IACf;EACF;AACF,CAAC;AAACC,OAAA,CAAAZ,mBAAA,GAAAA,mBAAA;AAEK,MAAMa,6BAAqC,GAAGb,mBAAmB;AAACY,OAAA,CAAAC,6BAAA,GAAAA,6BAAA"}
|
|
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports._typecheckTerrainWorkerLoader = exports.TerrainLoader = void 0;
|
|
7
7
|
var _version = require("./lib/utils/version");
|
|
8
|
-
|
|
8
|
+
const TerrainLoader = {
|
|
9
9
|
name: 'Terrain',
|
|
10
10
|
id: 'terrain',
|
|
11
11
|
module: 'terrain',
|
|
@@ -29,6 +29,6 @@ var TerrainLoader = {
|
|
|
29
29
|
}
|
|
30
30
|
};
|
|
31
31
|
exports.TerrainLoader = TerrainLoader;
|
|
32
|
-
|
|
32
|
+
const _typecheckTerrainWorkerLoader = TerrainLoader;
|
|
33
33
|
exports._typecheckTerrainWorkerLoader = _typecheckTerrainWorkerLoader;
|
|
34
34
|
//# sourceMappingURL=terrain-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terrain-loader.js","names":["_version","require","TerrainLoader","name","id","module","version","VERSION","worker","extensions","mimeTypes","options","terrain","tesselator","bounds","meshMaxError","elevationDecoder","rScaler","gScaler","bScaler","offset","skirtHeight","exports","_typecheckTerrainWorkerLoader"],"sources":["../../src/terrain-loader.ts"],"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"],"mappings":";;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AAKO,
|
|
1
|
+
{"version":3,"file":"terrain-loader.js","names":["_version","require","TerrainLoader","name","id","module","version","VERSION","worker","extensions","mimeTypes","options","terrain","tesselator","bounds","meshMaxError","elevationDecoder","rScaler","gScaler","bScaler","offset","skirtHeight","exports","_typecheckTerrainWorkerLoader"],"sources":["../../src/terrain-loader.ts"],"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"],"mappings":";;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AAKO,MAAMC,aAAa,GAAG;EAC3BC,IAAI,EAAE,SAAS;EACfC,EAAE,EAAE,SAAS;EACbC,MAAM,EAAE,SAAS;EACjBC,OAAO,EAAEC,gBAAO;EAChBC,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC;EAClEC,SAAS,EAAE,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC;EAC9EC,OAAO,EAAE;IACPC,OAAO,EAAE;MACPC,UAAU,EAAE,MAAM;MAClBC,MAAM,EAAE,IAAI;MACZC,YAAY,EAAE,EAAE;MAChBC,gBAAgB,EAAE;QAChBC,OAAO,EAAE,CAAC;QACVC,OAAO,EAAE,CAAC;QACVC,OAAO,EAAE,CAAC;QACVC,MAAM,EAAE;MACV,CAAC;MACDC,WAAW,EAAE;IACf;EACF;AACF,CAAC;AAACC,OAAA,CAAApB,aAAA,GAAAA,aAAA;AAKK,MAAMqB,6BAAqC,GAAGrB,aAAa;AAACoB,OAAA,CAAAC,6BAAA,GAAAA,6BAAA"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = typeof "3.4.
|
|
1
|
+
export const VERSION = typeof "3.4.15" !== 'undefined' ? "3.4.15" : 'latest';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
package/dist/terrain-worker.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/terrain",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.15",
|
|
4
4
|
"description": "Framework-independent loader for terrain raster formats",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -35,10 +35,10 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@babel/runtime": "^7.3.1",
|
|
38
|
-
"@loaders.gl/images": "3.4.
|
|
39
|
-
"@loaders.gl/loader-utils": "3.4.
|
|
40
|
-
"@loaders.gl/schema": "3.4.
|
|
38
|
+
"@loaders.gl/images": "3.4.15",
|
|
39
|
+
"@loaders.gl/loader-utils": "3.4.15",
|
|
40
|
+
"@loaders.gl/schema": "3.4.15",
|
|
41
41
|
"@mapbox/martini": "^0.2.0"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "19e941d5805568e449ef9092490d6568a4853298"
|
|
44
44
|
}
|