react-three-map 0.4.0 → 0.4.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # react-three-map
 
+## 0.4.1
+
+### Patch Changes
+
+- 41dd225: Improve camera decomposition so the camera matrix and world matrix have more useful values.
+
 ## 0.4.0
 
 ### Minor Changes

package/README.md

@@ -140,7 +140,7 @@ Therefore, the following `<Canvas>` props are ignored:
 
 ### Coordinates
 
-[![Coordinates example](docs/coordinates.png)](https://rodrigohamuy.github.io/react-three-map/?story=multi-coordinates--default--default)
+[![Coordinates example](docs/coordinates.png)](https://rodrigohamuy.github.io/react-three-map/?story=multi-coordinates--default)
 
 This component allows you to have 3D objects at different coordinates.
 
@@ -162,4 +162,4 @@ import { Canvas, Coordinates } from 'react-three-map'
 | ---------  | ------------------------------------------------ | ---------- |
 | latitude   | The latitude coordinate where to add the scene.  |            |
 | longitude  | The longitude coordinate where to add the scene. |            |
-| altitude   | The altitude coordinate where to add the scene.  | `0`        |
+| altitude   | The altitude coordinate where to add the scene.  | `0`        |

package/dist/cjs/main.js

@@ -1 +1,337 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("react/jsx-runtime"),l=require("@react-three/fiber"),b=require("mapbox-gl"),s=require("react"),S=require("react-map-gl"),m=require("three");function L(n){const c=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(n){for(const t in n)if(t!=="default"){const e=Object.getOwnPropertyDescriptor(n,t);Object.defineProperty(c,t,e.get?e:{enumerable:!0,get:()=>n[t]})}}return c.default=n,Object.freeze(c)}const O=L(m),h=new m.Quaternion,T=new m.Euler,M=new m.Vector3,R=new m.Vector3,A=new m.Matrix4;function z({longitude:n,latitude:c,altitude:t,fromLngLat:e}){const o=e([n,c],t),r=o.meterInMercatorCoordinateUnits();return M.set(o.x,o.y,o.z||0),R.set(r,-r,r),h.setFromEuler(T.set(-Math.PI*.5,0,0)),A.compose(M,h,R).toArray()}function C({latitude:n,longitude:c,altitude:t,fromLngLat:e}){return s.useMemo(()=>z({latitude:n,longitude:c,altitude:t,fromLngLat:e}),[n,c,t,e])}const x={onClick:["click",!1],onContextMenu:["contextmenu",!1],onDoubleClick:["dblclick",!1],onWheel:["wheel",!0],onPointerDown:["pointerdown",!0],onPointerUp:["pointerup",!0],onPointerLeave:["pointerleave",!0],onPointerMove:["pointermove",!0],onPointerCancel:["pointercancel",!0],onLostPointerCapture:["lostpointercapture",!0]};function q(){return n=>{const{handlePointer:c}=l.createEvents(n);return{priority:1,enabled:!0,compute(t,e){e.size.width=e.gl.domElement.width/window.devicePixelRatio,e.size.height=e.gl.domElement.height/window.devicePixelRatio,e.pointer.x=t.offsetX/e.size.width*2-1,e.pointer.y=1-t.offsetY/e.size.height*2,e.raycaster.camera=e.camera,e.raycaster.ray.origin.setScalar(0).applyMatrix4(e.camera.projectionMatrixInverse),e.raycaster.ray.direction.set(e.pointer.x,e.pointer.y,1).applyMatrix4(e.camera.projectionMatrixInverse).sub(e.raycaster.ray.origin).normalize()},connected:void 0,handlers:Object.keys(x).reduce((t,e)=>({...t,[e]:c(e)}),{}),update:()=>{var o;const{events:t,internal:e}=n.getState();(o=e.lastEvent)!=null&&o.current&&t.handlers&&t.handlers.onPointerMove(e.lastEvent.current)},connect:t=>{var r;const{set:e,events:o}=n.getState();(r=o.disconnect)==null||r.call(o),e(a=>({events:{...a.events,connected:t.parentNode}})),Object.entries(o.handlers??[]).forEach(([a,u])=>{const[i,f]=x[a];t.addEventListener(i,u,{passive:f})})},disconnect:()=>{const{set:t,events:e}=n.getState();e.connected&&(Object.entries(e.handlers??[]).forEach(([o,r])=>{if(e&&e.connected instanceof HTMLElement){const[a]=x[o];e.connected.removeEventListener(a,r)}}),t(o=>({events:{...o.events,connected:void 0}})))}}}}const y=n=>{const c=s.useRef(n);return c.current=n,s.useCallback((...t)=>c.current(...t),[])};function k(n,{frameloop:c,...t}){const[e,o]=s.useState(!1),r=s.useRef({fromLngLat:n}),a=y((i,f)=>{const p=i.getCanvas(),v=l.createRoot(p);v.configure({dpr:window.devicePixelRatio,events:q(),...t,frameloop:"never",gl:{context:f,depth:!0,autoClear:!1,antialias:!0,...t==null?void 0:t.gl},onCreated:j=>{j.gl.forceContextLoss=()=>{}},camera:{matrixAutoUpdate:!1},size:{width:p.clientWidth,height:p.clientHeight,top:0,left:0,...t==null?void 0:t.size}});const g=l._roots.get(p).store;r.current.map=i,r.current.root=v,r.current.state=g.getState(),g.setState({r3m:r.current}),c==="demand"&&g.setState({frameloop:c,invalidate:()=>{i.triggerRepaint()}}),setTimeout(()=>o(!0))}),u=y(()=>{setTimeout(()=>{r.current.root&&r.current.root.unmount()})});return{onAdd:a,onRemove:u,mounted:e,r3mRef:r}}const D=({children:n,frameloop:c,fromLngLat:t,...e})=>{const o=s.useId(),{onAdd:r,onRemove:a,mounted:u,r3mRef:i}=k(t,{frameloop:c,...e});return s.useEffect(()=>{u&&i.current.root&&i.current.root.render(d.jsx(d.Fragment,{children:n}))},[i,u,n]),{id:o,onAdd:r,onRemove:a,r3mRef:i}},F=new m.Matrix4;function w(n,c,t){n.projectionMatrix.fromArray(t).multiply(F.fromArray(c)),n.projectionMatrixInverse.copy(n.projectionMatrix).invert()}function I(n,c,t){return y((o,r)=>{const a=c.current;if(!a.state||!a.map)return;const u=a.state.camera,i=a.state.gl,f=a.state.advance;a.mapCamMx=r,w(u,n,r),i.resetState(),f(Date.now()*.001,!0),t==="always"&&a.map.triggerRepaint()})}function N({longitude:n,latitude:c,altitude:t=0,frameloop:e="always",fromLngLat:o,...r}){const a=C({latitude:c,longitude:n,altitude:t,fromLngLat:o}),{id:u,onAdd:i,onRemove:f,r3mRef:p}=D({frameloop:e,fromLngLat:o,...r}),v=I(a,p,e);return{id:u,onAdd:i,onRemove:f,render:v}}l.extend(O);const P=b.MercatorCoordinate.fromLngLat,_=s.memo(n=>{const{id:c,onAdd:t,onRemove:e,render:o}=N({...n,fromLngLat:P});return d.jsx(S.Layer,{id:c,type:"custom",renderingMode:"3d",onAdd:t,onRemove:e,render:o})}),H=()=>l.useThree(n=>n.r3m),E=s.memo(({latitude:n,longitude:c,altitude:t=0,children:e})=>{const[o]=s.useState(()=>new m.Scene),r=H(),a=C({latitude:n,longitude:c,altitude:t,fromLngLat:r.fromLngLat});return d.jsx(d.Fragment,{children:l.createPortal(d.jsxs(d.Fragment,{children:[d.jsx(U,{r3m:r,origin:a}),e]}),o,{events:{priority:2}})})});E.displayName="Coordinates";function U({r3m:n,origin:c}){const{gl:t,scene:e,set:o}=l.useThree(),r=s.useRef(null);return l.useFrame(()=>{n.mapCamMx&&r.current&&(w(r.current,c,n.mapCamMx),t.render(e,r.current))}),s.useLayoutEffect(()=>{r.current&&o({invalidate:()=>{n.map&&n.map.triggerRepaint()},camera:r.current})},[o,n]),d.jsx("perspectiveCamera",{ref:r})}exports.Canvas=_;exports.Coordinates=E;
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const jsxRuntime = require("react/jsx-runtime");
+const fiber = require("@react-three/fiber");
+const mapboxGl = require("mapbox-gl");
+const react = require("react");
+const reactMapGl = require("react-map-gl");
+const THREE = require("three");
+function _interopNamespaceDefault(e) {
+  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
+  if (e) {
+    for (const k in e) {
+      if (k !== "default") {
+        const d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: () => e[k]
+        });
+      }
+    }
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+const THREE__namespace = /* @__PURE__ */ _interopNamespaceDefault(THREE);
+const quat = new THREE.Quaternion();
+const euler = new THREE.Euler();
+const pos = new THREE.Vector3();
+const scale = new THREE.Vector3();
+const m4 = new THREE.Matrix4();
+function coordsToMatrix({ longitude, latitude, altitude, fromLngLat: fromLngLat2 }) {
+  const center = fromLngLat2([longitude, latitude], altitude);
+  const scaleUnit = center.meterInMercatorCoordinateUnits();
+  pos.set(center.x, center.y, center.z || 0);
+  scale.set(scaleUnit, -scaleUnit, scaleUnit);
+  quat.setFromEuler(euler.set(-Math.PI * 0.5, 0, 0));
+  return m4.compose(pos, quat, scale).toArray();
+}
+function useCoords({ latitude, longitude, altitude, fromLngLat: fromLngLat2 }) {
+  const m42 = react.useMemo(() => coordsToMatrix({
+    latitude,
+    longitude,
+    altitude,
+    fromLngLat: fromLngLat2
+  }), [latitude, longitude, altitude, fromLngLat2]);
+  return m42;
+}
+const DOM_EVENTS = {
+  onClick: ["click", false],
+  onContextMenu: ["contextmenu", false],
+  onDoubleClick: ["dblclick", false],
+  onWheel: ["wheel", true],
+  onPointerDown: ["pointerdown", true],
+  onPointerUp: ["pointerup", true],
+  onPointerLeave: ["pointerleave", true],
+  onPointerMove: ["pointermove", true],
+  onPointerCancel: ["pointercancel", true],
+  onLostPointerCapture: ["lostpointercapture", true]
+};
+const identity = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
+function createEvents() {
+  return (store) => {
+    const { handlePointer } = fiber.createEvents(store);
+    const rayCamera = new THREE.PerspectiveCamera();
+    rayCamera.position.z = 5;
+    rayCamera.matrixAutoUpdate = false;
+    rayCamera.matrixWorldAutoUpdate = false;
+    rayCamera.lookAt(0, 0, 0);
+    return {
+      priority: 1,
+      enabled: true,
+      compute(event, state) {
+        state.size.width = state.gl.domElement.width / window.devicePixelRatio;
+        state.size.height = state.gl.domElement.height / window.devicePixelRatio;
+        state.pointer.x = event.offsetX / state.size.width * 2 - 1;
+        state.pointer.y = 1 - event.offsetY / state.size.height * 2;
+        rayCamera.copy(state.camera);
+        const projByViewInv2 = rayCamera.userData.projByViewInv || identity;
+        rayCamera.matrix.identity();
+        rayCamera.matrixWorld.identity();
+        rayCamera.matrixWorldInverse.copy(rayCamera.matrixWorld).invert();
+        rayCamera.projectionMatrixInverse.fromArray(projByViewInv2);
+        rayCamera.projectionMatrix.fromArray(rayCamera.userData.projByView);
+        state.raycaster.camera = state.camera;
+        state.raycaster.ray.origin.setScalar(0).applyMatrix4(rayCamera.projectionMatrixInverse);
+        state.raycaster.ray.direction.set(state.pointer.x, state.pointer.y, 1).applyMatrix4(rayCamera.projectionMatrixInverse).sub(state.raycaster.ray.origin).normalize();
+      },
+      connected: void 0,
+      handlers: Object.keys(DOM_EVENTS).reduce(
+        (acc, key) => ({ ...acc, [key]: handlePointer(key) }),
+        {}
+      ),
+      update: () => {
+        var _a;
+        const { events, internal } = store.getState();
+        if (((_a = internal.lastEvent) == null ? void 0 : _a.current) && events.handlers) {
+          events.handlers.onPointerMove(internal.lastEvent.current);
+        }
+      },
+      connect: (target) => {
+        var _a;
+        const { set, events } = store.getState();
+        (_a = events.disconnect) == null ? void 0 : _a.call(events);
+        set((state) => ({ events: { ...state.events, connected: target.parentNode } }));
+        Object.entries(events.handlers ?? []).forEach(([name, event]) => {
+          const [eventName, passive] = DOM_EVENTS[name];
+          target.addEventListener(eventName, event, { passive });
+        });
+      },
+      disconnect: () => {
+        const { set, events } = store.getState();
+        if (events.connected) {
+          Object.entries(events.handlers ?? []).forEach(([name, event]) => {
+            if (events && events.connected instanceof HTMLElement) {
+              const [eventName] = DOM_EVENTS[name];
+              events.connected.removeEventListener(eventName, event);
+            }
+          });
+          set((state) => ({ events: { ...state.events, connected: void 0 } }));
+        }
+      }
+    };
+  };
+}
+const useFunction = (callback) => {
+  const callbackRef = react.useRef(callback);
+  callbackRef.current = callback;
+  return react.useCallback((...args) => {
+    return callbackRef.current(...args);
+  }, []);
+};
+function useOnAdd(fromLngLat2, { frameloop, ...renderProps }) {
+  const [mounted, setMounted] = react.useState(false);
+  const r3mRef = react.useRef({ fromLngLat: fromLngLat2 });
+  const onAdd = useFunction((map, gl) => {
+    const canvas = map.getCanvas();
+    const root = fiber.createRoot(canvas);
+    root.configure({
+      dpr: window.devicePixelRatio,
+      events: createEvents(),
+      ...renderProps,
+      frameloop: "never",
+      gl: {
+        context: gl,
+        depth: true,
+        autoClear: false,
+        antialias: true,
+        ...renderProps == null ? void 0 : renderProps.gl
+      },
+      onCreated: (state) => {
+        state.gl.forceContextLoss = () => {
+        };
+      },
+      camera: {
+        matrixAutoUpdate: false,
+        near: 0
+      },
+      size: {
+        width: canvas.clientWidth,
+        height: canvas.clientHeight,
+        top: 0,
+        left: 0,
+        ...renderProps == null ? void 0 : renderProps.size
+      }
+    });
+    const store = fiber._roots.get(canvas).store;
+    r3mRef.current.map = map;
+    r3mRef.current.root = root;
+    r3mRef.current.state = store.getState();
+    store.setState({ r3m: r3mRef.current });
+    if (frameloop === "demand") {
+      store.setState({
+        frameloop,
+        invalidate: () => {
+          map.triggerRepaint();
+        }
+      });
+    }
+    setTimeout(() => setMounted(true));
+  });
+  const onRemove = useFunction(() => {
+    if (!r3mRef.current.root)
+      return;
+    r3mRef.current.root.unmount();
+    r3mRef.current.root = void 0;
+  });
+  react.useEffect(() => () => onRemove(), [onRemove]);
+  return { onAdd, onRemove, mounted, r3mRef };
+}
+const useCreateRoot = ({
+  children,
+  frameloop,
+  fromLngLat: fromLngLat2,
+  ...renderProps
+}) => {
+  const id = react.useId();
+  const { onAdd, onRemove, mounted, r3mRef } = useOnAdd(fromLngLat2, { frameloop, ...renderProps });
+  react.useEffect(() => {
+    if (!mounted)
+      return;
+    if (!r3mRef.current.root)
+      return;
+    r3mRef.current.root.render(/* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children }));
+  }, [r3mRef, mounted, children]);
+  return { id, onAdd, onRemove, r3mRef };
+};
+const originMx = new THREE.Matrix4();
+const projByView = new THREE.Matrix4();
+const projByViewInv = new THREE.Matrix4();
+const fwd = new THREE.Vector3();
+function syncCamera(camera, origin, mapCamMx) {
+  projByView.fromArray(mapCamMx).multiply(originMx.fromArray(origin));
+  projByViewInv.copy(projByView).invert();
+  updateCamera(camera, projByViewInv);
+  camera.updateMatrix();
+  camera.updateMatrixWorld(true);
+  camera.projectionMatrix.copy(camera.matrix).premultiply(projByView);
+  camera.projectionMatrixInverse.copy(camera.projectionMatrix).invert();
+  camera.far = calculateFar(
+    camera.matrix.elements[10],
+    camera.matrix.elements[14],
+    camera.near
+  );
+  camera.userData.projByView = projByView.toArray();
+  camera.userData.projByViewInv = projByViewInv.toArray();
+}
+const updateCamera = (target, projByViewInv2) => {
+  target.position.setScalar(0).applyMatrix4(projByViewInv2);
+  target.up.set(0, -1, 0).applyMatrix4(projByViewInv2).negate().add(target.position).normalize();
+  fwd.set(0, 0, 1).applyMatrix4(projByViewInv2);
+  target.lookAt(fwd);
+};
+function calculateFar(c, d, near) {
+  const numerator = d * (c - 1);
+  const denominator = c * near + near;
+  const far = numerator / denominator;
+  return far;
+}
+function useRender(origin, r3mRef, frameloop) {
+  const render = useFunction((_gl, mapCamMx) => {
+    const r3m = r3mRef.current;
+    if (!r3m.state || !r3m.map)
+      return;
+    const camera = r3m.state.camera;
+    const gl = r3m.state.gl;
+    const advance = r3m.state.advance;
+    r3m.mapCamMx = mapCamMx;
+    syncCamera(camera, origin, mapCamMx);
+    gl.resetState();
+    advance(Date.now() * 1e-3, true);
+    if (frameloop === "always")
+      r3m.map.triggerRepaint();
+  });
+  return render;
+}
+function useCanvas({
+  longitude,
+  latitude,
+  altitude = 0,
+  frameloop = "always",
+  fromLngLat: fromLngLat2,
+  ...renderProps
+}) {
+  const m42 = useCoords({
+    latitude,
+    longitude,
+    altitude,
+    fromLngLat: fromLngLat2
+  });
+  const { id, onAdd, onRemove, r3mRef } = useCreateRoot({ frameloop, fromLngLat: fromLngLat2, ...renderProps });
+  const render = useRender(m42, r3mRef, frameloop);
+  return { id, onAdd, onRemove, render };
+}
+fiber.extend(THREE__namespace);
+const fromLngLat = mapboxGl.MercatorCoordinate.fromLngLat;
+const Canvas = react.memo((props) => {
+  const { id, onAdd, onRemove, render } = useCanvas({ ...props, fromLngLat });
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    reactMapGl.Layer,
+    {
+      id,
+      type: "custom",
+      renderingMode: "3d",
+      onAdd,
+      onRemove,
+      render
+    }
+  );
+});
+const useR3M = () => fiber.useThree((s) => s.r3m);
+const Coordinates = react.memo(({
+  latitude,
+  longitude,
+  altitude = 0,
+  children
+}) => {
+  const [scene] = react.useState(() => new THREE.Scene());
+  const r3m = useR3M();
+  const origin = useCoords({
+    latitude,
+    longitude,
+    altitude,
+    fromLngLat: r3m.fromLngLat
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: fiber.createPortal(/* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RenderAtCoords, { r3m, origin }),
+    children
+  ] }), scene, { events: { priority: 2 } }) });
+});
+Coordinates.displayName = "Coordinates";
+function RenderAtCoords({ r3m, origin }) {
+  const { gl, scene, set } = fiber.useThree();
+  const cameraRef = react.useRef(null);
+  fiber.useFrame(() => {
+    if (!r3m.mapCamMx)
+      return;
+    if (!cameraRef.current)
+      return;
+    syncCamera(cameraRef.current, origin, r3m.mapCamMx);
+    gl.render(scene, cameraRef.current);
+  });
+  react.useLayoutEffect(() => {
+    if (!cameraRef.current)
+      return;
+    set({
+      invalidate: () => {
+        if (!r3m.map)
+          return;
+        r3m.map.triggerRepaint();
+      },
+      camera: cameraRef.current
+    });
+  }, [set, r3m]);
+  return /* @__PURE__ */ jsxRuntime.jsx("perspectiveCamera", { ref: cameraRef });
+}
+exports.Canvas = Canvas;
+exports.Coordinates = Coordinates;

package/dist/es/main.mjs

@@ -1,7 +1,7 @@
-import { Canvas as a } from "./main2.mjs";
-import { Coordinates as t } from "./main3.mjs";
+import { Canvas } from "./main2.mjs";
+import { Coordinates } from "./main3.mjs";
 export {
-  a as Canvas,
-  t as Coordinates
+  Canvas,
+  Coordinates
 };
 //# sourceMappingURL=main.mjs.map

package/dist/es/main10.mjs

@@ -1,10 +1,18 @@
-import { Quaternion as m, Euler as l, Vector3 as s, Matrix4 as w } from "three";
-const o = new m(), p = new l(), n = new s(), r = new s(), x = new w();
-function d({ longitude: c, latitude: a, altitude: i, fromLngLat: u }) {
-  const t = u([c, a], i), e = t.meterInMercatorCoordinateUnits();
-  return n.set(t.x, t.y, t.z || 0), r.set(e, -e, e), o.setFromEuler(p.set(-Math.PI * 0.5, 0, 0)), x.compose(n, o, r).toArray();
+import { Quaternion, Euler, Vector3, Matrix4 } from "three";
+const quat = new Quaternion();
+const euler = new Euler();
+const pos = new Vector3();
+const scale = new Vector3();
+const m4 = new Matrix4();
+function coordsToMatrix({ longitude, latitude, altitude, fromLngLat }) {
+  const center = fromLngLat([longitude, latitude], altitude);
+  const scaleUnit = center.meterInMercatorCoordinateUnits();
+  pos.set(center.x, center.y, center.z || 0);
+  scale.set(scaleUnit, -scaleUnit, scaleUnit);
+  quat.setFromEuler(euler.set(-Math.PI * 0.5, 0, 0));
+  return m4.compose(pos, quat, scale).toArray();
 }
 export {
-  d as coordsToMatrix
+  coordsToMatrix
 };
 //# sourceMappingURL=main10.mjs.map

package/dist/es/main10.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"main10.mjs","sources":["../../src/core/coords-to-matrix.ts"],"sourcesContent":["import { Euler, Matrix4, Quaternion, Vector3 } from \"three\";\nimport { FromLngLat } from \"./generic-map\";\n\nconst quat = new Quaternion();\nconst euler = new Euler();\nconst pos = new Vector3();\nconst scale = new Vector3();\nconst m4 = new Matrix4();\n\n/** calculate Matrix4 from coordinates */\nexport function coordsToMatrix({ longitude, latitude, altitude, fromLngLat }: {\n  longitude: number, latitude: number, altitude: number, fromLngLat: FromLngLat\n}) {\n  const center = fromLngLat([longitude, latitude], altitude);\n  const scaleUnit = center.meterInMercatorCoordinateUnits();\n  pos.set(center.x, center.y, center.z || 0);\n  scale.set(scaleUnit, -scaleUnit, scaleUnit);\n  quat.setFromEuler(euler.set(-Math.PI * .5, 0, 0));\n  return m4.compose(pos, quat, scale).toArray();\n}\n"],"names":["quat","Quaternion","euler","Euler","pos","Vector3","scale","m4","Matrix4","coordsToMatrix","longitude","latitude","altitude","fromLngLat","center","scaleUnit"],"mappings":";AAGA,MAAMA,IAAO,IAAIC,KACXC,IAAQ,IAAIC,KACZC,IAAM,IAAIC,KACVC,IAAQ,IAAID,KACZE,IAAK,IAAIC;AAGR,SAASC,EAAe,EAAE,WAAAC,GAAW,UAAAC,GAAU,UAAAC,GAAU,YAAAC,KAE7D;AACD,QAAMC,IAASD,EAAW,CAACH,GAAWC,CAAQ,GAAGC,CAAQ,GACnDG,IAAYD,EAAO;AACzB,SAAAV,EAAI,IAAIU,EAAO,GAAGA,EAAO,GAAGA,EAAO,KAAK,CAAC,GACzCR,EAAM,IAAIS,GAAW,CAACA,GAAWA,CAAS,GACrCf,EAAA,aAAaE,EAAM,IAAI,CAAC,KAAK,KAAK,KAAI,GAAG,CAAC,CAAC,GACzCK,EAAG,QAAQH,GAAKJ,GAAMM,CAAK,EAAE;AACtC;"}
+{"version":3,"file":"main10.mjs","sources":["../../src/core/coords-to-matrix.ts"],"sourcesContent":["import { Euler, Matrix4, Quaternion, Vector3 } from \"three\";\nimport { FromLngLat } from \"./generic-map\";\n\nconst quat = new Quaternion();\nconst euler = new Euler();\nconst pos = new Vector3();\nconst scale = new Vector3();\nconst m4 = new Matrix4();\n\n/** calculate Matrix4 from coordinates */\nexport function coordsToMatrix({ longitude, latitude, altitude, fromLngLat }: {\n  longitude: number, latitude: number, altitude: number, fromLngLat: FromLngLat\n}) {\n  const center = fromLngLat([longitude, latitude], altitude);\n  const scaleUnit = center.meterInMercatorCoordinateUnits();\n  pos.set(center.x, center.y, center.z || 0);\n  scale.set(scaleUnit, -scaleUnit, scaleUnit);\n  quat.setFromEuler(euler.set(-Math.PI * .5, 0, 0));\n  return m4.compose(pos, quat, scale).toArray();\n}\n"],"names":[],"mappings":";AAGA,MAAM,OAAO,IAAI;AACjB,MAAM,QAAQ,IAAI;AAClB,MAAM,MAAM,IAAI;AAChB,MAAM,QAAQ,IAAI;AAClB,MAAM,KAAK,IAAI;AAGR,SAAS,eAAe,EAAE,WAAW,UAAU,UAAU,cAE7D;AACD,QAAM,SAAS,WAAW,CAAC,WAAW,QAAQ,GAAG,QAAQ;AACnD,QAAA,YAAY,OAAO;AACzB,MAAI,IAAI,OAAO,GAAG,OAAO,GAAG,OAAO,KAAK,CAAC;AACzC,QAAM,IAAI,WAAW,CAAC,WAAW,SAAS;AACrC,OAAA,aAAa,MAAM,IAAI,CAAC,KAAK,KAAK,KAAI,GAAG,CAAC,CAAC;AAChD,SAAO,GAAG,QAAQ,KAAK,MAAM,KAAK,EAAE;AACtC;"}

package/dist/es/main11.mjs

@@ -1,52 +1,66 @@
-import { createRoot as d, _roots as h } from "@react-three/fiber";
-import { useState as R, useRef as x } from "react";
-import { createEvents as C } from "./main13.mjs";
-import { useFunction as c } from "./main12.mjs";
-function T(s, { frameloop: a, ...t }) {
-  const [r, m] = R(!1), e = x({ fromLngLat: s }), f = c((n, g) => {
-    const o = n.getCanvas(), u = d(o);
-    u.configure({
+import { createRoot, _roots } from "@react-three/fiber";
+import { useState, useRef, useEffect } from "react";
+import { createEvents } from "./main13.mjs";
+import { useFunction } from "./main12.mjs";
+function useOnAdd(fromLngLat, { frameloop, ...renderProps }) {
+  const [mounted, setMounted] = useState(false);
+  const r3mRef = useRef({ fromLngLat });
+  const onAdd = useFunction((map, gl) => {
+    const canvas = map.getCanvas();
+    const root = createRoot(canvas);
+    root.configure({
       dpr: window.devicePixelRatio,
-      events: C(),
-      ...t,
+      events: createEvents(),
+      ...renderProps,
       frameloop: "never",
       gl: {
-        context: g,
-        depth: !0,
-        autoClear: !1,
-        antialias: !0,
-        ...t == null ? void 0 : t.gl
+        context: gl,
+        depth: true,
+        autoClear: false,
+        antialias: true,
+        ...renderProps == null ? void 0 : renderProps.gl
       },
-      onCreated: (v) => {
-        v.gl.forceContextLoss = () => {
+      onCreated: (state) => {
+        state.gl.forceContextLoss = () => {
         };
       },
       camera: {
-        matrixAutoUpdate: !1
+        matrixAutoUpdate: false,
+        near: 0
       },
       size: {
-        width: o.clientWidth,
-        height: o.clientHeight,
+        width: canvas.clientWidth,
+        height: canvas.clientHeight,
         top: 0,
         left: 0,
-        ...t == null ? void 0 : t.size
+        ...renderProps == null ? void 0 : renderProps.size
       }
     });
-    const i = h.get(o).store;
-    e.current.map = n, e.current.root = u, e.current.state = i.getState(), i.setState({ r3m: e.current }), a === "demand" && i.setState({
-      frameloop: a,
-      invalidate: () => {
-        n.triggerRepaint();
-      }
-    }), setTimeout(() => m(!0));
-  }), l = c(() => {
-    setTimeout(() => {
-      e.current.root && e.current.root.unmount();
-    });
+    const store = _roots.get(canvas).store;
+    r3mRef.current.map = map;
+    r3mRef.current.root = root;
+    r3mRef.current.state = store.getState();
+    store.setState({ r3m: r3mRef.current });
+    if (frameloop === "demand") {
+      store.setState({
+        frameloop,
+        invalidate: () => {
+          map.triggerRepaint();
+        }
+      });
+    }
+    setTimeout(() => setMounted(true));
+  });
+  const onRemove = useFunction(() => {
+    if (!r3mRef.current.root)
+      return;
+    r3mRef.current.root.unmount();
+    r3mRef.current.root = void 0;
   });
-  return { onAdd: f, onRemove: l, mounted: r, r3mRef: e };
+  useEffect(() => () => onRemove(), [onRemove]);
+  return { onAdd, onRemove, mounted, r3mRef };
 }
 export {
-  T as useOnAdd
+  useOnAdd
 };
 //# sourceMappingURL=main11.mjs.map

package/dist/es/main11.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"main11.mjs","sources":["../../src/core/use-on-add.ts"],"sourcesContent":["import { RenderProps, _roots, createRoot } from \"@react-three/fiber\";\nimport { useRef, useState } from \"react\";\nimport { createEvents } from \"./create-events\";\nimport { FromLngLat, MapInstance } from \"./generic-map\";\nimport { R3mStore } from \"./store\";\nimport { useFunction } from \"./use-function\";\n\nexport function useOnAdd(\n  fromLngLat: FromLngLat,\n  { frameloop, ...renderProps }: RenderProps<HTMLCanvasElement>\n) {\n\n  const [mounted, setMounted] = useState(false);\n\n  const r3mRef = useRef<R3mStore>({ fromLngLat });\n\n  const onAdd = useFunction((map: MapInstance, gl: WebGLRenderingContext) => {\n\n    const canvas = map.getCanvas();\n    const root = createRoot(canvas);\n    root.configure({\n      dpr: window.devicePixelRatio,\n      events: createEvents(),\n      ...renderProps,\n      frameloop: 'never',\n      gl: {\n        context: gl,\n        depth: true,\n        autoClear: false,\n        antialias: true,\n        ...renderProps?.gl,\n      },\n      onCreated: (state) => {\n        // eslint-disable-next-line @typescript-eslint/no-empty-function\n        state.gl.forceContextLoss = () => { };\n      },\n      camera: {\n        matrixAutoUpdate: false,\n      },\n      size: {\n        width: canvas.clientWidth,\n        height: canvas.clientHeight,\n        top: 0,\n        left: 0,\n        ...renderProps?.size,\n      },\n    });\n\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    const store = _roots.get(canvas)!.store;\n\n    r3mRef.current.map = map;\n    r3mRef.current.root = root;\n    r3mRef.current.state = store.getState();\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    store.setState({ r3m: r3mRef.current } as any);\n\n    if (frameloop === 'demand') {\n      store.setState({\n        frameloop,\n        invalidate: () => {\n          map.triggerRepaint();\n        },\n      })\n    }\n\n    setTimeout(() => setMounted(true));\n\n  })\n\n  const onRemove = useFunction(() => {\n    setTimeout(() => {\n      if (!r3mRef.current.root) return;\n      r3mRef.current.root.unmount();\n    })\n  })\n\n  return { onAdd, onRemove, mounted, r3mRef };\n}"],"names":["useOnAdd","fromLngLat","frameloop","renderProps","mounted","setMounted","useState","r3mRef","useRef","onAdd","useFunction","map","gl","canvas","root","createRoot","createEvents","state","store","_roots","onRemove"],"mappings":";;;;AAOO,SAASA,EACdC,GACA,EAAE,WAAAC,GAAW,GAAGC,KAChB;AAEA,QAAM,CAACC,GAASC,CAAU,IAAIC,EAAS,EAAK,GAEtCC,IAASC,EAAiB,EAAE,YAAAP,EAAY,CAAA,GAExCQ,IAAQC,EAAY,CAACC,GAAkBC,MAA8B;AAEnE,UAAAC,IAASF,EAAI,aACbG,IAAOC,EAAWF,CAAM;AAC9B,IAAAC,EAAK,UAAU;AAAA,MACb,KAAK,OAAO;AAAA,MACZ,QAAQE,EAAa;AAAA,MACrB,GAAGb;AAAA,MACH,WAAW;AAAA,MACX,IAAI;AAAA,QACF,SAASS;AAAA,QACT,OAAO;AAAA,QACP,WAAW;AAAA,QACX,WAAW;AAAA,QACX,GAAGT,KAAA,gBAAAA,EAAa;AAAA,MAClB;AAAA,MACA,WAAW,CAACc,MAAU;AAEd,QAAAA,EAAA,GAAG,mBAAmB,MAAM;AAAA,QAAA;AAAA,MACpC;AAAA,MACA,QAAQ;AAAA,QACN,kBAAkB;AAAA,MACpB;AAAA,MACA,MAAM;AAAA,QACJ,OAAOJ,EAAO;AAAA,QACd,QAAQA,EAAO;AAAA,QACf,KAAK;AAAA,QACL,MAAM;AAAA,QACN,GAAGV,KAAA,gBAAAA,EAAa;AAAA,MAClB;AAAA,IAAA,CACD;AAGD,UAAMe,IAAQC,EAAO,IAAIN,CAAM,EAAG;AAElC,IAAAN,EAAO,QAAQ,MAAMI,GACrBJ,EAAO,QAAQ,OAAOO,GACfP,EAAA,QAAQ,QAAQW,EAAM,SAAS,GAGtCA,EAAM,SAAS,EAAE,KAAKX,EAAO,QAAgB,CAAA,GAEzCL,MAAc,YAChBgB,EAAM,SAAS;AAAA,MACb,WAAAhB;AAAA,MACA,YAAY,MAAM;AAChB,QAAAS,EAAI,eAAe;AAAA,MACrB;AAAA,IAAA,CACD,GAGQ,WAAA,MAAMN,EAAW,EAAI,CAAC;AAAA,EAAA,CAElC,GAEKe,IAAWV,EAAY,MAAM;AACjC,eAAW,MAAM;AACX,MAACH,EAAO,QAAQ,QACbA,EAAA,QAAQ,KAAK;IAAQ,CAC7B;AAAA,EAAA,CACF;AAED,SAAO,EAAE,OAAAE,GAAO,UAAAW,GAAU,SAAAhB,GAAS,QAAAG,EAAO;AAC5C;"}
+{"version":3,"file":"main11.mjs","sources":["../../src/core/use-on-add.ts"],"sourcesContent":["import { RenderProps, _roots, createRoot } from \"@react-three/fiber\";\nimport { useEffect, useRef, useState } from \"react\";\nimport { createEvents } from \"./create-events\";\nimport { FromLngLat, MapInstance } from \"./generic-map\";\nimport { R3mStore } from \"./store\";\nimport { useFunction } from \"./use-function\";\n\nexport function useOnAdd(\n  fromLngLat: FromLngLat,\n  { frameloop, ...renderProps }: RenderProps<HTMLCanvasElement>\n) {\n\n  const [mounted, setMounted] = useState(false);\n\n  const r3mRef = useRef<R3mStore>({ fromLngLat });\n\n  const onAdd = useFunction((map: MapInstance, gl: WebGLRenderingContext) => {\n\n    const canvas = map.getCanvas();\n    const root = createRoot(canvas);\n    root.configure({\n      dpr: window.devicePixelRatio,\n      events: createEvents(),\n      ...renderProps,\n      frameloop: 'never',\n      gl: {\n        context: gl,\n        depth: true,\n        autoClear: false,\n        antialias: true,\n        ...renderProps?.gl,\n      },\n      onCreated: (state) => {\n        // eslint-disable-next-line @typescript-eslint/no-empty-function\n        state.gl.forceContextLoss = () => { };\n      },\n      camera: {\n        matrixAutoUpdate: false,\n        near: 0,\n      },\n      size: {\n        width: canvas.clientWidth,\n        height: canvas.clientHeight,\n        top: 0,\n        left: 0,\n        ...renderProps?.size,\n      },\n    });\n\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    const store = _roots.get(canvas)!.store;\n\n    r3mRef.current.map = map;\n    r3mRef.current.root = root;\n    r3mRef.current.state = store.getState();\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    store.setState({ r3m: r3mRef.current } as any);\n\n    if (frameloop === 'demand') {\n      store.setState({\n        frameloop,\n        invalidate: () => {\n          map.triggerRepaint();\n        },\n      })\n    }\n\n    setTimeout(() => setMounted(true));\n\n  })\n\n  const onRemove = useFunction(() => {\n    if (!r3mRef.current.root) return;\n    r3mRef.current.root.unmount();\n    r3mRef.current.root = undefined;\n  })\n\n  // on unmount\n  useEffect(() => () => onRemove(), [onRemove])\n\n  return { onAdd, onRemove, mounted, r3mRef };\n}"],"names":[],"mappings":";;;;AAOO,SAAS,SACd,YACA,EAAE,WAAW,GAAG,eAChB;AAEA,QAAM,CAAC,SAAS,UAAU,IAAI,SAAS,KAAK;AAE5C,QAAM,SAAS,OAAiB,EAAE,WAAY,CAAA;AAE9C,QAAM,QAAQ,YAAY,CAAC,KAAkB,OAA8B;AAEnE,UAAA,SAAS,IAAI;AACb,UAAA,OAAO,WAAW,MAAM;AAC9B,SAAK,UAAU;AAAA,MACb,KAAK,OAAO;AAAA,MACZ,QAAQ,aAAa;AAAA,MACrB,GAAG;AAAA,MACH,WAAW;AAAA,MACX,IAAI;AAAA,QACF,SAAS;AAAA,QACT,OAAO;AAAA,QACP,WAAW;AAAA,QACX,WAAW;AAAA,QACX,GAAG,2CAAa;AAAA,MAClB;AAAA,MACA,WAAW,CAAC,UAAU;AAEd,cAAA,GAAG,mBAAmB,MAAM;AAAA,QAAA;AAAA,MACpC;AAAA,MACA,QAAQ;AAAA,QACN,kBAAkB;AAAA,QAClB,MAAM;AAAA,MACR;AAAA,MACA,MAAM;AAAA,QACJ,OAAO,OAAO;AAAA,QACd,QAAQ,OAAO;AAAA,QACf,KAAK;AAAA,QACL,MAAM;AAAA,QACN,GAAG,2CAAa;AAAA,MAClB;AAAA,IAAA,CACD;AAGD,UAAM,QAAQ,OAAO,IAAI,MAAM,EAAG;AAElC,WAAO,QAAQ,MAAM;AACrB,WAAO,QAAQ,OAAO;AACf,WAAA,QAAQ,QAAQ,MAAM,SAAS;AAGtC,UAAM,SAAS,EAAE,KAAK,OAAO,QAAgB,CAAA;AAE7C,QAAI,cAAc,UAAU;AAC1B,YAAM,SAAS;AAAA,QACb;AAAA,QACA,YAAY,MAAM;AAChB,cAAI,eAAe;AAAA,QACrB;AAAA,MAAA,CACD;AAAA,IACH;AAEW,eAAA,MAAM,WAAW,IAAI,CAAC;AAAA,EAAA,CAElC;AAEK,QAAA,WAAW,YAAY,MAAM;AAC7B,QAAA,CAAC,OAAO,QAAQ;AAAM;AACnB,WAAA,QAAQ,KAAK;AACpB,WAAO,QAAQ,OAAO;AAAA,EAAA,CACvB;AAGD,YAAU,MAAM,MAAM,SAAY,GAAA,CAAC,QAAQ,CAAC;AAE5C,SAAO,EAAE,OAAO,UAAU,SAAS,OAAO;AAC5C;"}

package/dist/es/main12.mjs

@@ -1,9 +1,12 @@
-import { useRef as n, useCallback as u } from "react";
-const o = (r) => {
-  const e = n(r);
-  return e.current = r, u((...t) => e.current(...t), []);
+import { useRef, useCallback } from "react";
+const useFunction = (callback) => {
+  const callbackRef = useRef(callback);
+  callbackRef.current = callback;
+  return useCallback((...args) => {
+    return callbackRef.current(...args);
+  }, []);
 };
 export {
-  o as useFunction
+  useFunction
 };
 //# sourceMappingURL=main12.mjs.map

package/dist/es/main12.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"main12.mjs","sources":["../../src/core/use-function.ts"],"sourcesContent":["import { useCallback, useRef } from 'react';\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\nexport const useFunction = <T extends (...args: any[]) => any>(callback: T): T => {\n  const callbackRef = useRef(callback);\n  callbackRef.current = callback;\n  return useCallback((...args: any[]) => {\n    return callbackRef.current(...args);\n  }, []) as T;\n};\n"],"names":["useFunction","callback","callbackRef","useRef","useCallback","args"],"mappings":";AAGa,MAAAA,IAAc,CAAoCC,MAAmB;AAC1E,QAAAC,IAAcC,EAAOF,CAAQ;AACnC,SAAAC,EAAY,UAAUD,GACfG,EAAY,IAAIC,MACdH,EAAY,QAAQ,GAAGG,CAAI,GACjC,CAAE,CAAA;AACP;"}
+{"version":3,"file":"main12.mjs","sources":["../../src/core/use-function.ts"],"sourcesContent":["import { useCallback, useRef } from 'react';\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\nexport const useFunction = <T extends (...args: any[]) => any>(callback: T): T => {\n  const callbackRef = useRef(callback);\n  callbackRef.current = callback;\n  return useCallback((...args: any[]) => {\n    return callbackRef.current(...args);\n  }, []) as T;\n};\n"],"names":[],"mappings":";AAGa,MAAA,cAAc,CAAoC,aAAmB;AAC1E,QAAA,cAAc,OAAO,QAAQ;AACnC,cAAY,UAAU;AACf,SAAA,YAAY,IAAI,SAAgB;AAC9B,WAAA,YAAY,QAAQ,GAAG,IAAI;AAAA,EACpC,GAAG,CAAE,CAAA;AACP;"}