leaflet-city-mapper 0.0.3 → 0.0.4

package/src/walk/moveWalker.js

@@ -0,0 +1,23 @@
+import { L } from '../globals/L.js';
+import { radians } from '../globals/radians.js';
+import { sceneByLayer } from '../globals/sceneByLayer.js';
+import { local } from './local.js';
+import { blocked } from './blocked.js';
+
+export function moveWalker(forward, dt) {
+  const metres = forward * this.speed * dt, { lat, lng } = this.state.latlng;
+  const { position, scale } = sceneByLayer.get(this.layer).root;
+  let east = Math.sin(this.state.heading) * metres, north = Math.cos(this.state.heading) * metres;
+  const feet = local.call(this, this.local);
+  let i;
+  for (i = 0; i < feet.length; i++) feet[i] = position[i] + scale[i] * feet[i];
+  // World x is east, z south; keep 0.3 m from walls and slide along them.
+  const wall = blocked.call(this, east, north, feet);
+  if (wall) {
+    const into = east * wall[0] - north * wall[1];
+    east -= into * wall[0]; north += into * wall[1];
+    if (blocked.call(this, east, north, feet)) east = north = 0;
+  }
+  this.state.latlng = /* alloc */ new L.LatLng(lat + north / 111320, lng + east / (111320 * Math.cos(lat * radians)));
+  this.state.phase += Math.hypot(east, north) / 1.6 * Math.PI;
+}

package/src/walk/onAdd.js

@@ -1,4 +1,29 @@
+import { walkByMap } from '../globals/walkByMap.js';
+
 export function onAdd(map) {
+  let state = walkByMap.get(map);
+  if (state?.control && state.control !== this) {
+    this._map = null;
+    throw /* alloc */ new Error('Only one Walk control can be active per map');
+  }
+  if (!state) {
+    state = /* alloc */ {
+      control: null,
+      hitData: /* alloc */ {
+        x: 0, y: 0, z: 0, dx: 0, dz: 0, reach: 0, best: 0, found: false,
+        seen: /* alloc */ new Set(),
+        normal: /* alloc */ [0, 0],
+      },
+      local: /* alloc */ [0, 0, 0],
+    };
+    walkByMap.set(map, state);
+  }
+  state.control = this;
+  state.local.fill(0);
+  state.hitData.seen.clear();
+  state.hitData.normal.fill(0);
+  this._walk.hitData = state.hitData;
+  this._walk.local = state.local;
   this._walk.layer.addTo(map);
   return this._walk.container;
 }

package/src/walk/onKey.js

@@ -1,12 +1,15 @@
-import { moves } from '../constants/moves.js';
+import { moves } from '../globals/moves.js';
+
+
 import { stop } from './stop.js';
 
-export function onKey(event) {
-  // Text fields and sliders keep their keys; buttons and checkboxes don't.
-  if (event.target.closest?.('input:not([type=checkbox], [type=radio]), select, textarea, [contenteditable]') ||
-    event.ctrlKey || event.altKey || event.metaKey) return;
-  if (event.type === 'keydown' && event.code === 'Escape') { this.stop(); return; }
-  if (!moves[event.code]) return;
-  event.preventDefault();
-  if (event.type === 'keydown') this.keys.add(event.code); else this.keys.delete(event.code);
+export function onKey(event) {
+  if (event.type === 'keyup' && event.code === 'Space') this.keys.delete('Space');
+  // Text fields and sliders keep their keys; buttons and checkboxes don't.
+  if (event.target.closest?.('input:not([type=checkbox], [type=radio]), select, textarea, [contenteditable]') ||
+    event.ctrlKey || event.altKey || event.metaKey) return;
+  if (event.type === 'keydown' && event.code === 'Escape') { this.stop(); return; }
+  if (!moves[event.code] && event.code !== 'Space') return;
+  event.preventDefault();
+  if (event.type === 'keydown') this.keys.add(event.code); else this.keys.delete(event.code);
 }

package/src/walk/onPointer.js

@@ -1,13 +1,18 @@
-export function onPointer(event) {
-  // Dragging only turns the camera around the walker: horizontal = bearing, vertical = pitch.
-  const map = this.layer._map;
-  if (event.type === 'pointerdown') {
-    if (event.button !== 0 || event.target.closest('.leaflet-control')) return;
-    this.drag = { x: event.clientX, y: event.clientY };
-    map.getContainer().setPointerCapture(event.pointerId);
-  } else if (this.drag && event.type === 'pointermove') {
-    map._setPitchAndBearing(Math.max(20, Math.min(85, map.getPitch() - (event.clientY - this.drag.y) * 0.2)),
-      map.getBearing() - (event.clientX - this.drag.x) * 0.25);
-    this.drag = { x: event.clientX, y: event.clientY };
-  } else this.drag = null;
+import { mapSetPitchAndBearing } from '../camera/mapSetPitchAndBearing.js';
+import { mapGetPitch } from '../camera/mapGetPitch.js';
+import { mapGetBearing } from '../camera/mapGetBearing.js';
+export function onPointer(event) {
+  // Dragging only turns the camera around the walker: horizontal = bearing, vertical = pitch.
+  const map = this.layer._map;
+  if (event.type === 'pointerdown') {
+    if (event.button !== 0 || event.target.closest('.leaflet-control')) return;
+    this.dragX = event.clientX;
+    this.dragY = event.clientY;
+    this.dragging = true;
+    map.getContainer().setPointerCapture(event.pointerId);
+  } else if (this.dragging && event.type === 'pointermove') {
+    mapSetPitchAndBearing(map, Math.max(20, Math.min(85, mapGetPitch(map) - (event.clientY - this.dragY) * 0.2)), mapGetBearing(map) - (event.clientX - this.dragX) * 0.25);
+    this.dragX = event.clientX;
+    this.dragY = event.clientY;
+  } else this.dragging = false;
 }

package/src/walk/onRemove.js

@@ -1,4 +1,12 @@
-export function onRemove() {
+import { walkByMap } from '../globals/walkByMap.js';
+
+export function onRemove(map) {
+  const state = walkByMap.get(map);
+  if (state?.control !== this) return;
   this._walk.stop();
   this._walk.layer.remove();
+  state.control = null;
+  state.hitData.seen.clear();
+  this._walk.hitData = null;
+  this._walk.local = null;
 }

package/src/walk/place.js

@@ -1,9 +1,11 @@
+import { limbs } from '../globals/limbs.js';
+
 import { update } from '../scene/update.js';
-import { limbs } from '../constants/limbs.js';
+
 import { local } from './local.js';
 
 export function place() {
-  const [x, y, z] = local.call(this);
+  const [x, y, z] = local.call(this, this.local);
   // Model forward is -z; a yaw of -heading turns it to the compass heading (x east, -z north).
   const yaw = -this.state.heading, cos = Math.cos(yaw), sin = Math.sin(yaw);
   let i, px, py, sign, mesh;

package/src/walk/start.js

@@ -1,30 +1,39 @@
+import { radians } from '../globals/radians.js';
+import { earthCirc } from '../globals/earthCirc.js';
+import { L } from '../globals/L.js';
+import { sceneWalkHandlers } from '../globals/sceneWalkHandlers.js';
+import { mapGetPitch } from '../camera/mapGetPitch.js';
+import { mapGetBearing } from '../camera/mapGetBearing.js';
+import { mapSetPitch } from '../camera/mapSetPitch.js';
 import { step } from './step.js';
 import { onKey } from './onKey.js';
 import { onBlur } from './onBlur.js';
 import { onPointer } from './onPointer.js';
 import { onTerrain } from './onTerrain.js';
 
+
 export function start() {
   const map = this.layer._map;
   if (this.saved || !map) return;
   this.state.latlng = map.getCenter();
+  this.state.height = this.verticalSpeed = 0;
   // Zoom whose camera distance (1.5 viewport heights, as in scene/render.js) is about `distance` metres behind the walker.
   const pixelsPerMetre = map.getSize().y * 1.5 / this.distance;
-  const zoom = Math.min(map.getMaxZoom(), Math.log2(pixelsPerMetre * 40075016.68557849 * Math.cos(this.state.latlng.lat * Math.PI / 180) / 256));
-  const handlers = [];
+  const zoom = Math.min(map.getMaxZoom(), Math.log2(pixelsPerMetre * earthCirc * Math.cos(this.state.latlng.lat * radians) / 256));
   let name;
-  for (name of ['dragging', 'keyboard', 'doubleClickZoom', 'boxZoom']) {
-    if (map[name]?.enabled()) handlers.push(name);
-  }
-  this.saved = {
-    zoom: map.getZoom(), pitch: map.getPitch(), scrollWheelZoom: map.options.scrollWheelZoom, handlers
+  this.saved = /* alloc */ {
+    zoom: map.getZoom(), pitch: mapGetPitch(map), scrollWheelZoom: map.options.scrollWheelZoom,
+    handlers: /* alloc */ [],
   };
+  for (name of sceneWalkHandlers) {
+    if (map[name]?.enabled()) this.saved.handlers.push(name);
+  }
   for (name of this.saved.handlers) map[name].disable();
   // Wheel zoom moves the camera closer or farther, keeping the walker centred.
   map.options.scrollWheelZoom = this.saved.scrollWheelZoom && 'center';
-  this.state.heading = -map.getBearing() * Math.PI / 180;
-  map.setView(this.state.latlng, zoom, { animate: false });
-  map.setPitch(75);
+  this.state.heading = -mapGetBearing(map) * radians;
+  map.setView(this.state.latlng, zoom, /* alloc */ { animate: false });
+  mapSetPitch(map, 75);
   L.DomEvent.on(document, 'keydown keyup', this.onKey);
   L.DomEvent.on(window, 'blur', this.onBlur);
   L.DomEvent.on(map.getContainer(), 'pointerdown pointermove pointerup pointercancel', this.onPointer);

package/src/walk/step.js

@@ -1,53 +1,45 @@
+import { sceneByLayer } from '../globals/sceneByLayer.js';
+import { limbs } from '../globals/limbs.js';
+import { parts } from '../globals/parts.js';
+import { moves } from '../globals/moves.js';
+
+
 import * as createMesh from '../rendering/createMesh.js';
 import { build } from '../geometry/build.js';
-import { limbs } from '../constants/limbs.js';
-import { moves } from '../constants/moves.js';
-import { parts } from '../constants/parts.js';
+
 import { wrap } from '../utils/wrap.js';
 import { local } from './local.js';
 import { place } from './place.js';
-import { blocked } from './blocked.js';
+import { land } from './land.js';
+import { moveWalker } from './moveWalker.js';
+import { stepWalkerHeight } from './stepWalkerHeight.js';
+import { updateWalkerView } from './updateWalkerView.js';
 
 export function step(now) {
-  const layer = this.layer, map = layer._map;
+  const layer = this.layer;
   this.frame = requestAnimationFrame(this.step);
   const dt = Math.min(0.1, (now - (this.last ?? now)) / 1000);
   this.last = now;
-  if (!layer.renderer) return;
+  if (!sceneByLayer.get(layer).renderer) return;
   let changed = false;
-  let part, key, i;
+  let part, key;
   if (!this.meshes) {
-    this.meshes = [];
+    this.meshes = /* alloc */ [];
     for ([part] of limbs) this.meshes.push(createMesh.createMesh(layer, build(parts[part])));
     changed = true;
   }
+  const previousY = sceneByLayer.get(layer).root.position[1] +
+    local.call(this, this.local)[1] * sceneByLayer.get(layer).root.scale[1];
+  if (stepWalkerHeight.call(this, dt)) changed = true;
   let forward = 0, turn = 0;
   for (key of this.keys) { forward += moves[key]?.[0] || 0; turn += moves[key]?.[1] || 0; }
   forward = Math.sign(forward); turn = Math.sign(turn);
   if (turn) { this.state.heading = wrap(this.state.heading + turn * 2.5 * dt); changed = true; }
   if (forward) {
-    const metres = forward * this.speed * dt, { lat, lng } = this.state.latlng, { position, scale } = layer.root;
-    let east = Math.sin(this.state.heading) * metres, north = Math.cos(this.state.heading) * metres;
-    const feet = local.call(this);
-    for (i = 0; i < feet.length; i++) feet[i] = position[i] + scale[i] * feet[i];
-    // World x is east, z south; keep 0.3 m from walls and slide along the one in the way.
-    const wall = blocked.call(this, east, north, feet);
-    if (wall) {
-      const into = east * wall[0] - north * wall[1];
-      east -= into * wall[0]; north += into * wall[1];
-      if (blocked.call(this, east, north, feet)) east = north = 0;
-    }
-    this.state.latlng = new L.LatLng(lat + north / 111320, lng + east / (111320 * Math.cos(lat * Math.PI / 180)));
-    this.state.phase += Math.hypot(east, north) / 1.6 * Math.PI;
+    moveWalker.call(this, forward, dt);
     changed = true;
   }
-  if (forward || turn) {
-    // The camera (looking along -bearing) swings back behind the walker.
-    const bearing = map.getBearing() * Math.PI / 180, behind = wrap(-this.state.heading - bearing);
-    if (Math.abs(behind) > 1e-3) map._setPitchAndBearing(map.getPitch(), (bearing + behind * Math.min(1, dt * 4)) * 180 / Math.PI);
-    map.setView(this.state.latlng, map.getZoom(), { animate: false });
-  }
-  const target = forward ? 0.9 : 0;
-  if (Math.abs(this.swing - target) > 1e-3) { this.swing += (target - this.swing) * Math.min(1, dt * 10); changed = true; }
+  if (changed) land.call(this, previousY);
+  if (updateWalkerView.call(this, forward, turn, dt)) changed = true;
   if (changed) place.call(this);
 }

package/src/walk/stepWalkerHeight.js

@@ -0,0 +1,11 @@
+export function stepWalkerHeight(dt) {
+  if (this.keys.has('Space')) {
+    this.verticalSpeed = 6;
+    this.state.height += this.verticalSpeed * dt;
+    return true;
+  }
+  if (!this.verticalSpeed && !this.state.height) return false;
+  this.state.height = Math.max(0, this.state.height + this.verticalSpeed * dt - 9.81 * dt * dt / 2);
+  this.verticalSpeed = this.state.height > 0 ? this.verticalSpeed - 9.81 * dt : 0;
+  return true;
+}

package/src/walk/stop.js

@@ -1,3 +1,5 @@
+import { L } from '../globals/L.js';
+import { mapSetPitch } from '../camera/mapSetPitch.js';
 import * as disposeMesh from '../rendering/disposeMesh.js';
 import { onKey } from './onKey.js';
 import { onBlur } from './onBlur.js';
@@ -7,11 +9,12 @@ import { onTerrain } from './onTerrain.js';
 export function stop() {
   const map = this.layer._map;
   cancelAnimationFrame(this.frame);
-  this.keys.clear(); this.drag = null;
+  this.keys.clear(); this.dragging = false;
+  this.state.height = this.verticalSpeed = 0;
   L.DomEvent.off(document, 'keydown keyup', this.onKey);
   L.DomEvent.off(window, 'blur', this.onBlur);
   let mesh, name;
-  for (mesh of this.meshes || []) disposeMesh.disposeMesh(this.layer, mesh);
+  if (this.meshes) for (mesh of this.meshes) disposeMesh.disposeMesh(this.layer, mesh);
   this.meshes = null;
   this.button.setAttribute('aria-pressed', 'false');
   this.button.style.background = '#fff';
@@ -21,7 +24,7 @@ export function stop() {
   map.off('terrainchange', this.onTerrain);
   map.options.scrollWheelZoom = this.saved.scrollWheelZoom;
   for (name of this.saved.handlers) map[name].enable();
-  map.setView(this.state.latlng, this.saved.zoom, { animate: false });
-  map.setPitch(this.saved.pitch);
+  map.setView(this.state.latlng, this.saved.zoom, /* alloc */ { animate: false });
+  mapSetPitch(map, this.saved.pitch);
   this.saved = null;
 }

package/src/walk/updateWalkerView.js

@@ -0,0 +1,22 @@
+import { degrees } from '../globals/degrees.js';
+import { radians } from '../globals/radians.js';
+import { mapGetBearing } from '../camera/mapGetBearing.js';
+import { mapSetPitchAndBearing } from '../camera/mapSetPitchAndBearing.js';
+import { mapGetPitch } from '../camera/mapGetPitch.js';
+import { wrap } from '../utils/wrap.js';
+
+export function updateWalkerView(forward, turn, dt) {
+  const map = this.layer._map;
+  if (forward || turn) {
+    // Swing the camera behind the walker.
+    const bearing = mapGetBearing(map) * radians, behind = wrap(-this.state.heading - bearing);
+    if (Math.abs(behind) > 1e-3) mapSetPitchAndBearing(map, mapGetPitch(map), (bearing + behind * Math.min(1, dt * 4)) * degrees);
+    map.setView(this.state.latlng, map.getZoom(), /* alloc */ { animate: false });
+  }
+  const target = forward ? 0.9 : 0;
+  if (Math.abs(this.swing - target) > 1e-3) {
+    this.swing += (target - this.swing) * Math.min(1, dt * 10);
+    return true;
+  }
+  return false;
+}

package/src/constants/Compass.js

@@ -1,7 +0,0 @@
-import { compassAddHooks } from '../controls/compassAddHooks.js';
-import { compassRemoveHooks } from '../controls/compassRemoveHooks.js';
-
-export const Compass = L.Handler.extend({
-  addHooks: compassAddHooks,
-  removeHooks: compassRemoveHooks,
-});

package/src/constants/ContainerResize.js

@@ -1,7 +0,0 @@
-import { containerResizeAddHooks } from '../controls/containerResizeAddHooks.js';
-import { containerResizeRemoveHooks } from '../controls/containerResizeRemoveHooks.js';
-
-export const ContainerResize = L.Handler.extend({
-  addHooks: containerResizeAddHooks,
-  removeHooks: containerResizeRemoveHooks,
-});

package/src/constants/PitchDrag.js

@@ -1,7 +0,0 @@
-import { pitchDragAddHooks } from '../controls/pitchDragAddHooks.js';
-import { pitchDragRemoveHooks } from '../controls/pitchDragRemoveHooks.js';
-
-export const PitchDrag = L.Handler.extend({
-  addHooks: pitchDragAddHooks,
-  removeHooks: pitchDragRemoveHooks,
-});

package/src/constants/ShiftRotate.js

@@ -1,7 +0,0 @@
-import { shiftRotateAddHooks } from '../controls/shiftRotateAddHooks.js';
-import { shiftRotateRemoveHooks } from '../controls/shiftRotateRemoveHooks.js';
-
-export const ShiftRotate = L.Handler.extend({
-  addHooks: shiftRotateAddHooks,
-  removeHooks: shiftRotateRemoveHooks,
-});

package/src/constants/TouchMode.js

@@ -1,6 +0,0 @@
-import { notifyCameraTouchChange } from '../controls/notifyCameraTouchChange.js';
-
-export const TouchMode = L.Handler.extend({
-  addHooks: notifyCameraTouchChange,
-  removeHooks: notifyCameraTouchChange,
-});

package/src/constants/accessorSizes.js

@@ -1 +0,0 @@
-export const sizes = { SCALAR: 1, VEC2: 2, VEC3: 3, VEC4: 4 };

package/src/constants/attachState.js

@@ -1 +0,0 @@
-export const attachState = {};

package/src/constants/cameraControlsState.js

@@ -1 +0,0 @@
-export const cameraControlsState = {};

package/src/constants/cityMapper.js

@@ -1,6 +0,0 @@
-import { renderers } from './renderers.js';
-
-export const cityMapper = {
-  renderers,
-  nextId: 0,
-};

package/src/constants/hull.js

@@ -1 +0,0 @@
-export const hull = [[-5.5, 30], [5.5, 30], [5.5, -20], [4, -26], [1.5, -30], [-1.5, -30], [-4, -26], [-5.5, -20]];

package/src/constants/indexState.js

@@ -1 +0,0 @@
-export const indexState = {};

package/src/constants/mapCameraState.js

@@ -1 +0,0 @@
-export const mapCameraState = {};

package/src/constants/nativeLayerState.js

@@ -1 +0,0 @@
-export const nativeLayerState = {};

package/src/constants/onMapChangeState.js

@@ -1 +0,0 @@
-export const onMapChangeState = {};

package/src/constants/onZoomAnimState.js

@@ -1 +0,0 @@
-export const onZoomAnimState = {};

package/src/constants/parts.js

@@ -1,19 +0,0 @@
-import { box } from "../geometry/box.js";
-import { trousers } from './trousers.js';
-import { shirt } from './shirt.js';
-import { skin } from './skin.js';
-import { dark } from './dark.js';
-
-
-export const parts = {
-  body: [
-    [box(-0.17, 0.17, -0.1, 0.1), 0.82, 0.95, trousers],
-    [box(-0.19, 0.19, -0.11, 0.11), 0.95, 1.44, shirt],
-    [box(-0.05, 0.05, -0.05, 0.05), 1.44, 1.5, skin],
-    [box(-0.1, 0.1, -0.11, 0.1), 1.5, 1.72, skin],
-    [box(-0.105, 0.105, -0.06, 0.115), 1.58, 1.77, dark],
-    [box(-0.105, 0.105, -0.115, -0.06), 1.7, 1.77, dark],
-  ],
-  leg: [[box(-0.07, 0.07, -0.07, 0.07), -0.82, 0, trousers], [box(-0.07, 0.07, -0.17, 0.07), -0.9, -0.82, dark]],
-  arm: [[box(-0.05, 0.05, -0.05, 0.05), -0.55, 0, shirt], [box(-0.045, 0.045, -0.045, 0.045), -0.66, -0.55, skin]],
-};

package/src/constants/pumpState.js

@@ -1 +0,0 @@
-export const pumpState = {};

package/src/constants/ringDirections.js

@@ -1,10 +0,0 @@
-export const ringDirections = [
-  { x: Math.cos(0 * Math.PI / 4), y: Math.sin(0 * Math.PI / 4), nx: Math.cos((0 + 0.5) * Math.PI / 4), nz: -Math.sin((0 + 0.5) * Math.PI / 4) },
-  { x: Math.cos(1 * Math.PI / 4), y: Math.sin(1 * Math.PI / 4), nx: Math.cos((1 + 0.5) * Math.PI / 4), nz: -Math.sin((1 + 0.5) * Math.PI / 4) },
-  { x: Math.cos(2 * Math.PI / 4), y: Math.sin(2 * Math.PI / 4), nx: Math.cos((2 + 0.5) * Math.PI / 4), nz: -Math.sin((2 + 0.5) * Math.PI / 4) },
-  { x: Math.cos(3 * Math.PI / 4), y: Math.sin(3 * Math.PI / 4), nx: Math.cos((3 + 0.5) * Math.PI / 4), nz: -Math.sin((3 + 0.5) * Math.PI / 4) },
-  { x: Math.cos(4 * Math.PI / 4), y: Math.sin(4 * Math.PI / 4), nx: Math.cos((4 + 0.5) * Math.PI / 4), nz: -Math.sin((4 + 0.5) * Math.PI / 4) },
-  { x: Math.cos(5 * Math.PI / 4), y: Math.sin(5 * Math.PI / 4), nx: Math.cos((5 + 0.5) * Math.PI / 4), nz: -Math.sin((5 + 0.5) * Math.PI / 4) },
-  { x: Math.cos(6 * Math.PI / 4), y: Math.sin(6 * Math.PI / 4), nx: Math.cos((6 + 0.5) * Math.PI / 4), nz: -Math.sin((6 + 0.5) * Math.PI / 4) },
-  { x: Math.cos(7 * Math.PI / 4), y: Math.sin(7 * Math.PI / 4), nx: Math.cos((7 + 0.5) * Math.PI / 4), nz: -Math.sin((7 + 0.5) * Math.PI / 4) },
-];

package/src/constants/roundProfile.js

@@ -1 +0,0 @@
-export const roundProfile = [[0, 0], [0.35, 0.8], [0.6, 1], [0.85, 0.7], [1, 0]];

package/src/constants/underEntryState.js

@@ -1 +0,0 @@
-export const underEntryState = {};