mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-22 11:12:18 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
146b7e6027 | ||
|
|
7b6ec7f963 |
No files matched your search
@@ -0,0 +1,4 @@
|
|||||||
|
- Fix the page freezing for three to five seconds when Shipwrecks is switched
|
||||||
|
on over a loaded globe. Each of the 7,958 markers read the terrain height as
|
||||||
|
it was created; they are now placed on the ellipsoid, where they already
|
||||||
|
drew (mazy1998, #1703).
|
||||||
@@ -194,8 +194,8 @@ refers to a person by a title or role (Mr, captain, master, owner, crew,
|
|||||||
such word can still pass. Deaths appear only as a Wikidata count.
|
such word can still pass. Deaths appear only as a Wikidata count.
|
||||||
|
|
||||||
The globe draws a round marker with a hull and mast per wreck, all in one
|
The globe draws a round marker with a hull and mast per wreck, all in one
|
||||||
billboard collection, ground-clamped with the depth test off and the horizon
|
billboard collection, placed on the ellipsoid (no terrain height read per
|
||||||
cull GhostMaps uses, sized by deaths (a bigger toll draws on top) and coloured
|
marker) with the depth test off and the horizon cull GhostMaps uses, sized by deaths (a bigger toll draws on top) and coloured
|
||||||
by era (a legend under the row): before 1900 (ancient wrecks dated only by
|
by era (a legend under the row): before 1900 (ancient wrecks dated only by
|
||||||
period count here), 1900–1945, after 1945, and date unknown. A period filter
|
period count here), 1900–1945, after 1945, and date unknown. A period filter
|
||||||
under the row picks a start year and an end year side by side (two pickers
|
under the row picks a start year and an end year side by side (two pickers
|
||||||
|
|||||||
@@ -159,6 +159,11 @@ export function createShipwrecksLayer({
|
|||||||
(a, b) => (a.casualties || 0) - (b.casualties || 0),
|
(a, b) => (a.casualties || 0) - (b.casualties || 0),
|
||||||
);
|
);
|
||||||
for (const record of ordered) {
|
for (const record of ordered) {
|
||||||
|
// On the ellipsoid, with no height reference. A ground-clamped billboard
|
||||||
|
// reads the terrain height as it is created, and that read for every
|
||||||
|
// wreck in one pass froze the page for seconds. Wrecks lie at sea, the
|
||||||
|
// depth test is off and the card already sits here, so the marker
|
||||||
|
// shows in the same place.
|
||||||
const position = Cesium.Cartesian3.fromDegrees(record.lon, record.lat);
|
const position = Cesium.Cartesian3.fromDegrees(record.lon, record.lat);
|
||||||
const size = markerPixelSize(record.casualties);
|
const size = markerPixelSize(record.casualties);
|
||||||
const billboard = _markers.add({
|
const billboard = _markers.add({
|
||||||
@@ -167,7 +172,6 @@ export function createShipwrecksLayer({
|
|||||||
image: _images[eraOf(record)],
|
image: _images[eraOf(record)],
|
||||||
width: size,
|
width: size,
|
||||||
height: size,
|
height: size,
|
||||||
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
|
|
||||||
disableDepthTestDistance: Number.POSITIVE_INFINITY,
|
disableDepthTestDistance: Number.POSITIVE_INFINITY,
|
||||||
});
|
});
|
||||||
const pin = {
|
const pin = {
|
||||||
|
|||||||
@@ -163,6 +163,20 @@ test('markers sit on the wreck: no eye offset, bigger toll drawn last', async ()
|
|||||||
assert.equal(h.markers.billboards[2].width, markerPixelSize(1500));
|
assert.equal(h.markers.billboards[2].width, markerPixelSize(1500));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('markers are placed without a terrain height read each', async () => {
|
||||||
|
// A ground-clamped billboard reads the terrain height when it is created;
|
||||||
|
// for every wreck in one pass that froze the page for seconds.
|
||||||
|
const h = harness({ snapshots: [snapshot([wreck('a'), wreck('b')])] });
|
||||||
|
h.layer.enable();
|
||||||
|
await h.layer.update();
|
||||||
|
assert.equal(h.markers.billboards.length, 2);
|
||||||
|
for (const billboard of h.markers.billboards) {
|
||||||
|
assert.equal(billboard.heightReference, undefined);
|
||||||
|
const { height } = Cesium.Cartographic.fromCartesian(billboard.position);
|
||||||
|
assert.equal(Math.abs(height) < 1e-6, true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
test('an unchanged snapshot does not rebuild the markers', async () => {
|
test('an unchanged snapshot does not rebuild the markers', async () => {
|
||||||
const records = [wreck('a')];
|
const records = [wreck('a')];
|
||||||
const h = harness({
|
const h = harness({
|
||||||
|
|||||||
Reference in new issue
Block a user