locar 0.0.8 → 0.0.10

package/README.md

@@ -4,7 +4,7 @@ Location-based AR from AR.js.
 
 ## What is this?
 
-LocAR.js is an AR.js project to develop a library focused specifically on location-based augmented reality in the browser. Currently it consists of the location-based three.js code from [the main AR.js repository](https://github.com/AR-js-org/AR.js), with some minor changes to make it compatible with latest versions (0.169.0 at time of writing) of three.js.
+LocAR.js is an AR.js project to develop a library focused specifically on location-based augmented reality in the browser. Currently it consists of the location-based three.js code from [the main AR.js repository](https://github.com/AR-js-org/AR.js), with some minor changes to make it compatible with latest versions (0.175.0 at time of writing) of three.js.
 
 ## Why?
 
@@ -20,8 +20,6 @@ For a while there have been some bugs and issues with location-based AR.js which
 
 Some of these issues, such as incorrect North on some devices, may well be to do with incorrect or mis-calibrated sensors but the hope is that the standalone library will help to verify this and, if certain devices have North wrong by a consistent bearing, to develop a calibration tool.
 
-For this reason, the focus at present will be on developing a **pure three.js version only**. When we believe that the key bugs and issues have been resolved, the plan is to then provide an A-Frame wrapper.
-
 ## Cross-platform Compatibility
 
 Chrome on Android is recommended. It may also work on Chrome in iOS; please file an issue if not. It will not work on Safari on iOS, due to permissions issues - **though pull requests are welcome to fix this**. Firefox unfortunately does not appear to fully implement the Device Orientation API so is unlikely to work
@@ -42,8 +40,8 @@ import * as LocAR from 'locar';
 as long as you include `locar` as a dependency, e.g. in your `package.json`:
 ```
 "dependencies": {
-   "locar" : "^0.0.7",
-   "three" : "^0.169.0"
+   "locar" : "^0.0.10",
+   "three" : "^0.175.0"
 }
 ```
 

package/dist/locar.es.js

@@ -1,25 +1,25 @@
-var j = (r) => {
-  throw TypeError(r);
+var W = (i) => {
+  throw TypeError(i);
 };
-var F = (r, t, e) => t.has(r) || j("Cannot " + e);
-var n = (r, t, e) => (F(r, t, "read from private field"), e ? e.call(r) : t.get(r)), m = (r, t, e) => t.has(r) ? j("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(r) : t.set(r, e), d = (r, t, e, i) => (F(r, t, "write to private field"), i ? i.call(r, e) : t.set(r, e), e), v = (r, t, e) => (F(r, t, "access private method"), e);
-var q = (r, t, e, i) => ({
-  set _(o) {
-    d(r, t, o, e);
+var S = (i, t, e) => t.has(i) || W("Cannot " + e);
+var s = (i, t, e) => (S(i, t, "read from private field"), e ? e.call(i) : t.get(i)), m = (i, t, e) => t.has(i) ? W("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(i) : t.set(i, e), u = (i, t, e, n) => (S(i, t, "write to private field"), n ? n.call(i, e) : t.set(i, e), e), f = (i, t, e) => (S(i, t, "access private method"), e);
+var k = (i, t, e, n) => ({
+  set _(r) {
+    u(i, t, r, e);
   },
   get _() {
-    return n(r, t, i);
+    return s(i, t, n);
   }
 });
-import * as f from "three";
-import { Vector3 as Z, Euler as N, Quaternion as _, EventDispatcher as B, MathUtils as D } from "three";
-var P, U, G, X, Q;
-class K {
+import * as L from "three";
+import { Vector3 as Y, Euler as U, Quaternion as _, EventDispatcher as Z, MathUtils as C } from "three";
+var E, N, z, V, X;
+class $ {
   /**
    * Create a SphMercProjection.
    */
   constructor() {
-    m(this, P);
+    m(this, E);
     this.EARTH = 4007501668e-2, this.HALF_EARTH = 2003750834e-2;
   }
   /**
@@ -29,7 +29,7 @@ class K {
    * @return {Array} Two-member array containing easting and northing.
    */
   project(t, e) {
-    return [v(this, P, U).call(this, t), v(this, P, G).call(this, e)];
+    return [f(this, E, N).call(this, t), f(this, E, z).call(this, e)];
   }
   /**
    * Unproject a Spherical Mercator easting and northing.
@@ -37,7 +37,7 @@ class K {
    * @return {Array} Two-member array containing longitude and latitude 
    */
   unproject(t) {
-    return [v(this, P, X).call(this, t[0]), v(this, P, Q).call(this, t[1])];
+    return [f(this, E, V).call(this, t[0]), f(this, E, X).call(this, t[1])];
   }
   /**
    * Return the projection's ID.
@@ -47,19 +47,19 @@ class K {
     return "epsg:3857";
   }
 }
-P = new WeakSet(), U = function(t) {
+E = new WeakSet(), N = function(t) {
   return t / 180 * this.HALF_EARTH;
-}, G = function(t) {
+}, z = function(t) {
   var e = Math.log(Math.tan((90 + t) * Math.PI / 360)) / (Math.PI / 180);
   return e * this.HALF_EARTH / 180;
-}, X = function(t) {
+}, V = function(t) {
   return t / this.HALF_EARTH * 180;
-}, Q = function(t) {
+}, X = function(t) {
   var e = t / this.HALF_EARTH * 180;
   return e = 180 / Math.PI * (2 * Math.atan(Math.exp(e * Math.PI / 180)) - Math.PI / 2), e;
 };
-var R, A, T, x, L, C, E, I, b, O, p, S, V, W, Y;
-class st {
+var D, A, b, H, R, P, M, T, O, w, p, j, Q, F, B;
+class K {
   /**
    * @param {THREE.Scene} scene - The Three.js scene to use.
    * @param {THREE.Camera} camera - The Three.js camera to use. Should usually 
@@ -68,19 +68,19 @@ class st {
    * setGpsOptions() below.
    * @param {Object} serverLogger - an object which can optionally log GPS position to a server for debugging. null by default, so no logging will be done. This object should implement a sendData() method to send data (2nd arg) to a given endpoint (1st arg). Please see source code for details. Ensure you comply with privacy laws (GDPR or equivalent) if implementing this.
    */
-  constructor(t, e, i = {}, o = null) {
+  constructor(t, e, n = {}, r = null) {
     m(this, p);
-    m(this, R);
+    m(this, D);
     m(this, A);
-    m(this, T);
-    m(this, x);
-    m(this, L);
-    m(this, C);
-    m(this, E);
-    m(this, I);
     m(this, b);
+    m(this, H);
+    m(this, R);
+    m(this, P);
+    m(this, M);
+    m(this, T);
     m(this, O);
-    this.scene = t, this.camera = e, d(this, R, new K()), d(this, A, {}), d(this, T, null), d(this, x, 0), d(this, L, 100), d(this, C, null), this.setGpsOptions(i), d(this, E, null), d(this, I, 0), d(this, b, 0), d(this, O, o);
+    m(this, w);
+    this.scene = t, this.camera = e, u(this, D, new $()), u(this, A, {}), u(this, b, null), u(this, H, 0), u(this, R, 100), u(this, P, null), this.setGpsOptions(n), u(this, M, null), u(this, T, 0), u(this, O, 0), u(this, w, r);
   }
   /**
    * Set the projection to use.
@@ -89,7 +89,7 @@ class st {
    * containing easting and northing.
    */
   setProjection(t) {
-    d(this, R, t);
+    u(this, D, t);
   }
   /**
    * Set the GPS options.
@@ -99,7 +99,7 @@ class st {
    * minimum accuracy, in metres, for a GPS reading to be counted.
    */
   setGpsOptions(t = {}) {
-    t.gpsMinDistance !== void 0 && d(this, x, t.gpsMinDistance), t.gpsMinAccuracy !== void 0 && d(this, L, t.gpsMinAccuracy);
+    t.gpsMinDistance !== void 0 && u(this, H, t.gpsMinDistance), t.gpsMinAccuracy !== void 0 && u(this, R, t.gpsMinAccuracy);
   }
   /**
    * Start the GPS on a real device
@@ -107,19 +107,19 @@ class st {
    * GPS errors can be handled by handling the gpserror event.
    */
   async startGps() {
-    if (n(this, O)) {
-      const e = await (await n(this, O).sendData("/gps/start", {
-        gpsMinDistance: n(this, x),
-        gpsMinAccuracy: n(this, L)
+    if (s(this, w)) {
+      const e = await (await s(this, w).sendData("/gps/start", {
+        gpsMinDistance: s(this, H),
+        gpsMinAccuracy: s(this, R)
       })).json();
-      d(this, b, e.session);
+      u(this, O, e.session);
     }
-    return n(this, C) === null ? (d(this, C, navigator.geolocation.watchPosition(
+    return s(this, P) === null ? (u(this, P, navigator.geolocation.watchPosition(
       (t) => {
-        v(this, p, W).call(this, t);
+        f(this, p, F).call(this, t);
       },
       (t) => {
-        n(this, A).gpserror ? n(this, A).gpserror(t.code) : alert(`GPS error: code ${t.code}`);
+        s(this, A).gpserror ? s(this, A).gpserror(t.code) : alert(`GPS error: code ${t.code}`);
       },
       {
         enableHighAccuracy: !0
@@ -132,7 +132,7 @@ class st {
    * stopped (i.e. it was never started).
    */
   stopGps() {
-    return n(this, C) !== null ? (navigator.geolocation.clearWatch(n(this, C)), d(this, C, null), !0) : !1;
+    return s(this, P) !== null ? (navigator.geolocation.clearWatch(s(this, P)), u(this, P, null), !0) : !1;
   }
   /**
    * Send a fake GPS signal. Useful for testing on a desktop or laptop.
@@ -143,12 +143,12 @@ class st {
    * @param {number} acc - The accuracy of the GPS reading in metres. May be
    * ignored if lower than the specified minimum accuracy.
    */
-  fakeGps(t, e, i = null, o = 0) {
-    i !== null && this.setElevation(i), v(this, p, W).call(this, {
+  fakeGps(t, e, n = null, r = 0) {
+    n !== null && this.setElevation(n), f(this, p, F).call(this, {
       coords: {
         longitude: t,
         latitude: e,
-        accuracy: o
+        accuracy: r
       }
     });
   }
@@ -163,12 +163,12 @@ class st {
    * @return {Array} a two member array containing the WebGL x and z coordinates
    */
   lonLatToWorldCoords(t, e) {
-    const i = n(this, R).project(t, e);
-    if (n(this, E))
-      i[0] -= n(this, E)[0], i[1] -= n(this, E)[1];
+    const n = s(this, D).project(t, e);
+    if (s(this, M))
+      n[0] -= s(this, M)[0], n[1] -= s(this, M)[1];
     else
       throw "No initial position determined";
-    return [i[0], -i[1]];
+    return [n[0], -n[1]];
   }
   /**
    * Add a new AR object at a given latitude, longitude and elevation.
@@ -180,14 +180,14 @@ class st {
    * @param {Object} properties - properties describing the object (for example,
    * the contents of the GeoJSON properties field).
    */
-  add(t, e, i, o, u = {}) {
+  add(t, e, n, r, d = {}) {
     var g;
-    t.properties = u, v(this, p, S).call(this, t, e, i, o), this.scene.add(t), (g = n(this, O)) == null || g.sendData("/object/new", {
+    t.properties = d, f(this, p, j).call(this, t, e, n, r), this.scene.add(t), (g = s(this, w)) == null || g.sendData("/object/new", {
       position: t.position,
       x: t.position.x,
       z: t.position.z,
-      session: n(this, b),
-      properties: u
+      session: s(this, O),
+      properties: d
     });
   }
   /**
@@ -211,86 +211,83 @@ class st {
    * @listens LocationBased#gpserror
    */
   on(t, e) {
-    n(this, A)[t] = e;
+    s(this, A)[t] = e;
   }
 }
-R = new WeakMap(), A = new WeakMap(), T = new WeakMap(), x = new WeakMap(), L = new WeakMap(), C = new WeakMap(), E = new WeakMap(), I = new WeakMap(), b = new WeakMap(), O = new WeakMap(), p = new WeakSet(), S = function(t, e, i, o) {
-  const u = this.lonLatToWorldCoords(e, i);
-  o !== void 0 && (t.position.y = o), [t.position.x, t.position.z] = u;
-}, V = function(t, e) {
-  d(this, E, n(this, R).project(t, e));
-}, W = function(t) {
-  var i, o, u;
+D = new WeakMap(), A = new WeakMap(), b = new WeakMap(), H = new WeakMap(), R = new WeakMap(), P = new WeakMap(), M = new WeakMap(), T = new WeakMap(), O = new WeakMap(), w = new WeakMap(), p = new WeakSet(), j = function(t, e, n, r) {
+  const d = this.lonLatToWorldCoords(e, n);
+  r !== void 0 && (t.position.y = r), [t.position.x, t.position.z] = d;
+}, Q = function(t, e) {
+  u(this, M, s(this, D).project(t, e));
+}, F = function(t) {
+  var n, r, d;
   let e = Number.MAX_VALUE;
-  q(this, I)._++, (i = n(this, O)) == null || i.sendData("/gps/new", {
-    gpsCount: n(this, I),
+  k(this, T)._++, (n = s(this, w)) == null || n.sendData("/gps/new", {
+    gpsCount: s(this, T),
     lat: t.coords.latitude,
     lon: t.coords.longitude,
     acc: t.coords.accuracy,
-    session: n(this, b)
-  }), t.coords.accuracy <= n(this, L) && (n(this, T) === null ? d(this, T, {
+    session: s(this, O)
+  }), t.coords.accuracy <= s(this, R) && (s(this, b) === null ? u(this, b, {
     latitude: t.coords.latitude,
     longitude: t.coords.longitude
-  }) : e = v(this, p, Y).call(this, n(this, T), t.coords), e >= n(this, x) && (n(this, T).longitude = t.coords.longitude, n(this, T).latitude = t.coords.latitude, n(this, E) || (v(this, p, V).call(this, t.coords.longitude, t.coords.latitude), (o = n(this, O)) == null || o.sendData("/worldorigin/new", {
-    gpsCount: n(this, I),
+  }) : e = f(this, p, B).call(this, s(this, b), t.coords), e >= s(this, H) && (s(this, b).longitude = t.coords.longitude, s(this, b).latitude = t.coords.latitude, s(this, M) || (f(this, p, Q).call(this, t.coords.longitude, t.coords.latitude), (r = s(this, w)) == null || r.sendData("/worldorigin/new", {
+    gpsCount: s(this, T),
     lat: t.coords.latitude,
     lon: t.coords.longitude,
-    session: n(this, b),
-    initialPosition: n(this, E)
-  })), v(this, p, S).call(this, this.camera, t.coords.longitude, t.coords.latitude), (u = n(this, O)) == null || u.sendData("/gps/accepted", {
-    gpsCount: n(this, I),
+    session: s(this, O),
+    initialPosition: s(this, M)
+  })), f(this, p, j).call(this, this.camera, t.coords.longitude, t.coords.latitude), (d = s(this, w)) == null || d.sendData("/gps/accepted", {
+    gpsCount: s(this, T),
     cameraX: this.camera.position.x,
     cameraZ: this.camera.position.z,
-    session: n(this, b),
+    session: s(this, O),
     distMoved: e
-  }), n(this, A).gpsupdate && n(this, A).gpsupdate(t, e)));
+  }), s(this, A).gpsupdate && s(this, A).gpsupdate(t, e)));
 }, /**
  * Calculate haversine distance between two lat/lon pairs.
  *
  * Taken from original A-Frame AR.js location-based components
  */
-Y = function(t, e) {
-  const i = f.MathUtils.degToRad(e.longitude - t.longitude), o = f.MathUtils.degToRad(e.latitude - t.latitude), u = Math.sin(o / 2) * Math.sin(o / 2) + Math.cos(f.MathUtils.degToRad(t.latitude)) * Math.cos(f.MathUtils.degToRad(e.latitude)) * (Math.sin(i / 2) * Math.sin(i / 2));
-  return 2 * Math.atan2(Math.sqrt(u), Math.sqrt(1 - u)) * 6371e3;
+B = function(t, e) {
+  const n = L.MathUtils.degToRad(e.longitude - t.longitude), r = L.MathUtils.degToRad(e.latitude - t.latitude), d = Math.sin(r / 2) * Math.sin(r / 2) + Math.cos(L.MathUtils.degToRad(t.latitude)) * Math.cos(L.MathUtils.degToRad(e.latitude)) * (Math.sin(n / 2) * Math.sin(n / 2));
+  return 2 * Math.atan2(Math.sqrt(d), Math.sqrt(1 - d)) * 6371e3;
 };
-class ot {
+class J {
   /**
-   * Create a WebcamRenderer.
-   * @param {THREE.WebGLRenderer} renderer - the Three.js renderer.
+   * Create a Webcam.
+   * @param options {Object} - options to use for initialising the camera. 
+   * Currently idealWidth and idealHeight properties are understood as well as 
+   * onVideoStarted(), a *required* callback which runs when the camera has
+   * been initialised. 
+   * This takes a THREE.VideoTexture as an argument which can be used to set 
+   * the background of your three.js scene within a callback.
    * @param {string} videoElementSelector - selector to obtain the HTML video 
    * element to render the webcam feed. If a falsy value (e.g. null or 
    * undefined), a video element will be created.
-   * @options {Object} - options to use for initialising the camera. Currently
-   * width and height properties are understood.
    */
-  constructor(t, e, i) {
-    this.renderer = t, this.renderer.autoClear = !1, this.sceneWebcam = new f.Scene();
-    let o;
-    e ? o = document.querySelector(e) : (o = document.createElement("video"), o.setAttribute("autoplay", !0), o.setAttribute("playsinline", !0), o.style.display = "none", document.body.appendChild(o)), this.geom = new f.PlaneGeometry(), this.texture = new f.VideoTexture(o), this.material = new f.MeshBasicMaterial({ map: this.texture });
-    const u = new f.Mesh(this.geom, this.material);
-    if (this.sceneWebcam.add(u), this.cameraWebcam = new f.OrthographicCamera(
-      -0.5,
-      0.5,
-      0.5,
-      -0.5,
-      0,
-      10
-    ), navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
-      const g = {
+  constructor(t = {}, e) {
+    this.sceneWebcam = new L.Scene();
+    let n;
+    if (e ? n = document.querySelector(e) : (n = document.createElement("video"), n.setAttribute("autoplay", !0), n.setAttribute("playsinline", !0), n.style.display = "none", document.body.appendChild(n)), this.texture = new L.VideoTexture(n), navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
+      const r = {
         video: {
-          width: (i == null ? void 0 : i.width) || 1280,
-          height: (i == null ? void 0 : i.height) || 720,
+          width: { ideal: t.idealWidth || 1280 },
+          height: { ideal: t.idealHeight || 720 },
           facingMode: "environment"
         }
       };
-      navigator.mediaDevices.getUserMedia(g).then((w) => {
-        console.log("using the webcam successfully..."), o.srcObject = w, o.play();
-      }).catch((w) => {
+      navigator.mediaDevices.getUserMedia(r).then((d) => {
+        n.addEventListener("loadedmetadata", () => {
+          var g;
+          n.setAttribute("width", n.videoWidth), n.setAttribute("height", n.videoHeight), n.play(), (g = t.onVideoStarted) == null || g.call(this, this.texture);
+        }), n.srcObject = d;
+      }).catch((d) => {
         setTimeout(() => {
           alert(
             `Webcam Error
-Name: ` + w.name + `
-Message: ` + w.message
+Name: ` + d.name + `
+Message: ` + d.message
           );
         }, 1e3);
       });
@@ -299,23 +296,16 @@ Message: ` + w.message
         alert("sorry - media devices API not supported");
       }, 1e3);
   }
-  /**
-   * Update the webcam.
-   * Should be called from your Three.js rendering (animation) function.
-   */
-  update() {
-    this.renderer.clear(), this.renderer.render(this.sceneWebcam, this.cameraWebcam), this.renderer.clearDepth();
-  }
   /**
    * Free up the memory associated with the webcam.
    * Should be called when your application closes.
    */
   dispose() {
-    this.material.dispose(), this.texture.dispose(), this.geom.dispose();
+    this.texture.dispose();
   }
 }
-const k = navigator.userAgent.match(/iPhone|iPad|iPod/i) || /Macintosh/i.test(navigator.userAgent) && navigator.maxTouchPoints != null && navigator.maxTouchPoints > 1, $ = new Z(0, 0, 1), z = new N(), J = new _(), tt = new _(-Math.sqrt(0.5), 0, 0, Math.sqrt(0.5)), et = { type: "change" };
-class at extends B {
+const q = navigator.userAgent.match(/iPhone|iPad|iPod/i) || /Macintosh/i.test(navigator.userAgent) && navigator.maxTouchPoints != null && navigator.maxTouchPoints > 1, tt = new Y(0, 0, 1), G = new U(), et = new _(), it = new _(-Math.sqrt(0.5), 0, 0, Math.sqrt(0.5)), nt = { type: "change" };
+class st extends Z {
   /**
    * Create an instance of DeviceOrientationControls.
    * @param {Object} object - the object to attach the controls to
@@ -325,19 +315,19 @@ class at extends B {
     super(), window.isSecureContext === !1 && console.error(
       "THREE.DeviceOrientationControls: DeviceOrientationEvent is only available in secure contexts (https)"
     );
-    const e = this, i = 1e-6, o = new _();
+    const e = this, n = 1e-6, r = new _();
     this.object = t, this.object.rotation.reorder("YXZ"), this.enabled = !0, this.deviceOrientation = null, this.screenOrientation = 0, this.alphaOffset = 0, this.initialOffset = null, this.TWO_PI = 2 * Math.PI, this.HALF_PI = 0.5 * Math.PI, this.orientationChangeEventName = "ondeviceorientationabsolute" in window ? "deviceorientationabsolute" : "deviceorientation", this.smoothingFactor = 1;
-    const u = function({
-      alpha: s,
+    const d = function({
+      alpha: o,
       beta: c,
-      gamma: h,
+      gamma: l,
       webkitCompassHeading: a
     }) {
-      if (k) {
-        const l = 360 - a;
-        e.alphaOffset = D.degToRad(l - s), e.deviceOrientation = { alpha: s, beta: c, gamma: h, webkitCompassHeading: a };
+      if (q) {
+        const h = 360 - a;
+        e.alphaOffset = C.degToRad(h - o), e.deviceOrientation = { alpha: o, beta: c, gamma: l, webkitCompassHeading: a };
       } else
-        s < 0 && (s += 360), e.deviceOrientation = { alpha: s, beta: c, gamma: h };
+        o < 0 && (o += 360), e.deviceOrientation = { alpha: o, beta: c, gamma: l };
       window.dispatchEvent(
         new CustomEvent("camera-rotation-change", {
           detail: { cameraRotation: t.rotation }
@@ -345,29 +335,29 @@ class at extends B {
       );
     }, g = function() {
       e.screenOrientation = window.orientation || 0;
-    }, w = function(s, c, h, a, l) {
-      z.set(h, c, -a, "YXZ"), s.setFromEuler(z), s.multiply(tt), s.multiply(J.setFromAxisAngle($, -l));
+    }, x = function(o, c, l, a, h) {
+      G.set(l, c, -a, "YXZ"), o.setFromEuler(G), o.multiply(it), o.multiply(et.setFromAxisAngle(tt, -h));
     };
     this.connect = function() {
-      g(), window.DeviceOrientationEvent !== void 0 && typeof window.DeviceOrientationEvent.requestPermission == "function" ? window.DeviceOrientationEvent.requestPermission().then((s) => {
-        s === "granted" && (window.addEventListener(
+      g(), window.DeviceOrientationEvent !== void 0 && typeof window.DeviceOrientationEvent.requestPermission == "function" ? window.DeviceOrientationEvent.requestPermission().then((o) => {
+        o === "granted" && (window.addEventListener(
           "orientationchange",
           g
         ), window.addEventListener(
           e.orientationChangeEventName,
-          u
+          d
         ));
-      }).catch(function(s) {
+      }).catch(function(o) {
         console.error(
           "THREE.DeviceOrientationControls: Unable to use DeviceOrientation API:",
-          s
+          o
         );
       }) : (window.addEventListener(
         "orientationchange",
         g
       ), window.addEventListener(
         e.orientationChangeEventName,
-        u
+        d
       )), e.enabled = !0;
     }, this.disconnect = function() {
       window.removeEventListener(
@@ -375,86 +365,86 @@ class at extends B {
         g
       ), window.removeEventListener(
         e.orientationChangeEventName,
-        u
+        d
       ), e.enabled = !1, e.initialOffset = !1, e.deviceOrientation = null;
-    }, this.update = function({ theta: s = 0 } = { theta: 0 }) {
+    }, this.update = function({ theta: o = 0 } = { theta: 0 }) {
       if (e.enabled === !1) return;
       const c = e.deviceOrientation;
       if (c) {
-        let h = c.alpha ? D.degToRad(c.alpha) + e.alphaOffset : 0, a = c.beta ? D.degToRad(c.beta) : 0, l = c.gamma ? D.degToRad(c.gamma) : 0;
-        const H = e.screenOrientation ? D.degToRad(e.screenOrientation) : 0;
-        if (k) {
-          const y = new _();
-          w(y, h, a, l, H);
-          const M = new N().setFromQuaternion(
-            y,
+        let l = c.alpha ? C.degToRad(c.alpha) + e.alphaOffset : 0, a = c.beta ? C.degToRad(c.beta) : 0, h = c.gamma ? C.degToRad(c.gamma) : 0;
+        const I = e.screenOrientation ? C.degToRad(e.screenOrientation) : 0;
+        if (q) {
+          const v = new _();
+          x(v, l, a, h, I);
+          const y = new U().setFromQuaternion(
+            v,
             "YXZ"
           );
-          console.log(M.x, M.y, M.z), M.y = D.degToRad(
+          console.log(y.x, y.y, y.z), y.y = C.degToRad(
             360 - c.webkitCompassHeading
-          ), y.setFromEuler(M), e.object.quaternion.copy(y);
+          ), v.setFromEuler(y), e.object.quaternion.copy(v);
         } else {
           if (this.smoothingFactor < 1) {
             if (this.lastOrientation) {
-              const y = this.smoothingFactor;
-              h = this._getSmoothedAngle(
-                h,
+              const v = this.smoothingFactor;
+              l = this._getSmoothedAngle(
+                l,
                 this.lastOrientation.alpha,
-                y
+                v
               ), a = this._getSmoothedAngle(
                 a + Math.PI,
                 this.lastOrientation.beta,
-                y
-              ), l = this._getSmoothedAngle(
-                l + this.HALF_PI,
+                v
+              ), h = this._getSmoothedAngle(
+                h + this.HALF_PI,
                 this.lastOrientation.gamma,
-                y,
+                v,
                 Math.PI
               );
             } else
-              a += Math.PI, l += this.HALF_PI;
+              a += Math.PI, h += this.HALF_PI;
             this.lastOrientation = {
-              alpha: h,
+              alpha: l,
               beta: a,
-              gamma: l
+              gamma: h
             };
           }
-          w(
+          x(
             e.object.quaternion,
-            h + s,
+            l + o,
             this.smoothingFactor < 1 ? a - Math.PI : a,
-            this.smoothingFactor < 1 ? l - this.HALF_PI : l,
-            H
+            this.smoothingFactor < 1 ? h - this.HALF_PI : h,
+            I
           );
         }
-        8 * (1 - o.dot(e.object.quaternion)) > i && (o.copy(e.object.quaternion), e.dispatchEvent(et));
+        8 * (1 - r.dot(e.object.quaternion)) > n && (r.copy(e.object.quaternion), e.dispatchEvent(nt));
       }
-    }, this._orderAngle = function(s, c, h = this.TWO_PI) {
-      return c > s && Math.abs(c - s) < h / 2 || s > c && Math.abs(c - s) > h / 2 ? { left: s, right: c } : { left: c, right: s };
-    }, this._getSmoothedAngle = function(s, c, h, a = this.TWO_PI) {
-      const l = this._orderAngle(s, c, a), H = l.left, y = l.right;
-      l.left = 0, l.right -= H, l.right < 0 && (l.right += a);
-      let M = y == c ? (1 - h) * l.right + h * l.left : h * l.right + (1 - h) * l.left;
-      return M += H, M >= a && (M -= a), M;
+    }, this._orderAngle = function(o, c, l = this.TWO_PI) {
+      return c > o && Math.abs(c - o) < l / 2 || o > c && Math.abs(c - o) > l / 2 ? { left: o, right: c } : { left: c, right: o };
+    }, this._getSmoothedAngle = function(o, c, l, a = this.TWO_PI) {
+      const h = this._orderAngle(o, c, a), I = h.left, v = h.right;
+      h.left = 0, h.right -= I, h.right < 0 && (h.right += a);
+      let y = v == c ? (1 - l) * h.right + l * h.left : l * h.right + (1 - l) * h.left;
+      return y += I, y >= a && (y -= a), y;
     }, this.updateAlphaOffset = function() {
       e.initialOffset = !1;
     }, this.dispose = function() {
       e.disconnect();
     }, this.getAlpha = function() {
-      const { deviceOrientation: s } = e;
-      return s && s.alpha ? D.degToRad(s.alpha) + e.alphaOffset : 0;
+      const { deviceOrientation: o } = e;
+      return o && o.alpha ? C.degToRad(o.alpha) + e.alphaOffset : 0;
     }, this.getBeta = function() {
-      const { deviceOrientation: s } = e;
-      return s && s.beta ? D.degToRad(s.beta) : 0;
+      const { deviceOrientation: o } = e;
+      return o && o.beta ? C.degToRad(o.beta) : 0;
     }, window.DeviceOrientationEvent !== void 0 && typeof window.DeviceOrientationEvent.requestPermission == "function" ? this.initPermissionDialog() : this.connect();
   }
   // Provide gesture before initialising device orientation controls
   // From PR #659 on the main AR.js repo
   // Thanks to @ma2yama
   initPermissionDialog() {
-    const t = document.createElement("div"), e = document.createElement("div"), i = document.createElement("div"), o = document.createElement("div");
+    const t = document.createElement("div"), e = document.createElement("div"), n = document.createElement("div"), r = document.createElement("div");
     document.body.appendChild(t);
-    const u = {
+    const d = {
       display: "flex",
       position: "fixed",
       top: 0,
@@ -471,32 +461,32 @@ class at extends B {
       borderRadius: "3px",
       width: "36rem",
       height: "24rem"
-    }, w = {
+    }, x = {
       width: "100%",
       height: "70%",
       display: "flex",
       justifyContent: "center",
       alignItems: "center"
-    }, s = {
+    }, o = {
       display: "inline-flex",
       width: "100%",
       height: "30%",
       justifyContent: "center",
       alignItems: "center"
     };
-    for (let a in u)
-      t.style[a] = u[a];
+    for (let a in d)
+      t.style[a] = d[a];
     for (let a in g)
       e.style[a] = g[a];
-    for (let a in w)
-      i.style[a] = w[a];
-    for (let a in s)
-      o.style[a] = s[a];
-    t.appendChild(e), e.appendChild(i), e.appendChild(o), i.innerHTML = '<div style="font-size: 24pt; margin: 1rem;">This immersive website requires access to your device motion sensors.</div>';
+    for (let a in x)
+      n.style[a] = x[a];
+    for (let a in o)
+      r.style[a] = o[a];
+    t.appendChild(e), e.appendChild(n), e.appendChild(r), n.innerHTML = '<div style="font-size: 24pt; margin: 1rem;">This immersive website requires access to your device motion sensors.</div>';
     const c = () => {
       this.connect(), t.style.display = "none";
-    }, h = document.createElement("button");
-    h.addEventListener("click", c), h.style.width = "50%", h.style.height = "80%", h.style.fontSize = "20pt", h.appendChild(document.createTextNode("OK")), o.appendChild(h), document.body.appendChild(t);
+    }, l = document.createElement("button");
+    l.addEventListener("click", c), l.style.width = "50%", l.style.height = "80%", l.style.fontSize = "20pt", l.appendChild(document.createTextNode("OK")), r.appendChild(l), document.body.appendChild(t);
   }
 }
 class rt {
@@ -506,7 +496,7 @@ class rt {
    * events will be handled.
    */
   constructor(t) {
-    this.raycaster = new f.Raycaster(), this.normalisedMousePosition = new f.Vector2(null, null), t.domElement.addEventListener("click", (e) => {
+    this.raycaster = new L.Raycaster(), this.normalisedMousePosition = new L.Vector2(null, null), t.domElement.addEventListener("click", (e) => {
       this.normalisedMousePosition.set(
         e.clientX / t.domElement.clientWidth * 2 - 1,
         -(e.clientY / t.domElement.clientHeight * 2) + 1
@@ -524,16 +514,146 @@ class rt {
   raycast(t, e) {
     if (this.normalisedMousePosition.x !== null && this.normalisedMousePosition.y !== null) {
       this.raycaster.setFromCamera(this.normalisedMousePosition, t);
-      const i = this.raycaster.intersectObjects(e.children, !1);
-      return this.normalisedMousePosition.set(null, null), i;
+      const n = this.raycaster.intersectObjects(e.children, !1);
+      return this.normalisedMousePosition.set(null, null), n;
     }
     return [];
   }
 }
+AFRAME.registerComponent("locar-webcam", {
+  schema: {
+    idealWidth: {
+      type: "number",
+      default: 1024
+    },
+    idealHeight: {
+      type: "number",
+      default: 768
+    },
+    videoElement: {
+      type: "string",
+      default: ""
+    }
+  },
+  init: function() {
+    new J({
+      idealWidth: this.data.idealWidth,
+      idealHeight: this.data.idealHeight,
+      onVideoStarted: (i) => {
+        this.el.object3D.background = i;
+      }
+    }, this.data.videoElement || null);
+  }
+});
+AFRAME.registerComponent("locar-camera", {
+  schema: {
+    simulateLatitude: {
+      type: "number",
+      default: 0
+    },
+    simulateLongitude: {
+      type: "number",
+      default: 0
+    },
+    simulateAltitude: {
+      type: "number",
+      default: -Number.MAX_VALUE
+    },
+    positionMinAccuracy: {
+      type: "number",
+      default: 100
+    }
+  },
+  init: function() {
+    this.locar = new K(
+      this.el.sceneEl.object3D,
+      this.el.object3D
+    ), this.locar.on("gpsupdate", (i, t) => {
+      this.el.emit("gpsupdate", {
+        position: i,
+        distMoved: t
+      });
+    }), this.locar.on("gpserror", (i) => {
+      const t = [
+        "User denied access to GPS.",
+        "GPS satellites not available.",
+        "Timeout communicating with GPS satellites - try moving to a more open area."
+      ];
+      i >= 1 && i <= 3 ? alert(t[i - 1]) : alert(`Unknown geolocation error code ${i}.`);
+    }), this._isMobile() && (this.deviceOrientationControls = new st(this.el.object3D));
+  },
+  update: function(i) {
+    this.locar.setGpsOptions({
+      gpsMinAccuracy: this.data.positionMinAccuracy,
+      gpsMinDistance: this.data.gpsMinDistance
+    }), (this.data.simulateLatitude !== 0 || this.data.simulateLongitude !== 0) && (this.data.simulateLatitude != (i == null ? void 0 : i.simulateLatitude) || this.data.simulateLongitude != (i == null ? void 0 : i.simulateLongitude)) && (this.locar.stopGps(), this.locar.fakeGps(
+      this.data.simulateLongitude,
+      this.data.simulateLatitude
+    ), this.data.simulateLongitude = 0, this.data.simulateLatitude = 0), this.data.simulateAltitude > -Number.MAX_VALUE && this.locar.setElevation(this.data.simulateAltitude + 1.6);
+  },
+  play: function() {
+    this.locar.startGps();
+  },
+  pause: function() {
+    this.locar.stopGps();
+  },
+  /**
+   * Convert longitude and latitude to three.js/WebGL world coordinates.
+   * Uses the specified projection, and negates the northing (in typical
+   * projections, northings increase northwards, but in the WebGL coordinate
+   * system, we face negative z if the camera is at the origin with default
+   * rotation).
+   * @param {number} lon - The longitude.
+   * @param {number} lat - The latitude.
+   * @return {Array} a two member array containing the WebGL x and z coordinates
+   */
+  lonLatToWorldCoords: function(i, t) {
+    return this.locar.lonLatToWorldCoords(i, t);
+  },
+  tick: function() {
+    var i;
+    (i = this.deviceOrientationControls) == null || i.update();
+  },
+  _isMobile: function() {
+    return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(
+      navigator.userAgent
+    ) || /Macintosh/i.test(navigator.userAgent) && navigator.maxTouchPoints != null && navigator.maxTouchPoints > 1;
+  }
+});
+AFRAME.registerComponent("locar-entity-place", {
+  schema: {
+    latitude: {
+      type: "number",
+      default: 0
+    },
+    longitude: {
+      type: "number",
+      default: 0
+    }
+  },
+  init: function() {
+    const i = this.el.sceneEl.querySelector("[locar-camera]");
+    this.locarCamera = i.components["locar-camera"];
+  },
+  update: function(i) {
+    this.locarCamera || console.error("Cannot update locar-entity-place without a locar-camera component on the scene camera.");
+    const t = this.locarCamera.lonLatToWorldCoords(
+      this.data.longitude,
+      this.data.latitude
+    );
+    this.el.object3D.position.set(
+      t[0],
+      this.el.object3D.position.y,
+      t[1]
+    );
+  }
+});
+const ct = "0.0.10";
 export {
   rt as ClickHandler,
-  at as DeviceOrientationControls,
-  st as LocationBased,
-  K as SphMercProjection,
-  ot as WebcamRenderer
+  st as DeviceOrientationControls,
+  K as LocationBased,
+  $ as SphMercProjection,
+  J as Webcam,
+  ct as version
 };

package/dist/locar.umd.js

@@ -1,3 +1,3 @@
-(function(a,i){typeof exports=="object"&&typeof module<"u"?i(exports,require("three")):typeof define=="function"&&define.amd?define(["exports","three"],i):(a=typeof globalThis<"u"?globalThis:a||self,i(a.locar={},a.THREE))})(this,function(a,i){"use strict";var H=a=>{throw TypeError(a)};var U=(a,i,f)=>i.has(a)||H("Cannot "+f);var n=(a,i,f)=>(U(a,i,"read from private field"),f?f.call(a):i.get(a)),v=(a,i,f)=>i.has(a)?H("Cannot add the same private member more than once"):i instanceof WeakSet?i.add(a):i.set(a,f),u=(a,i,f,m)=>(U(a,i,"write to private field"),m?m.call(a,f):i.set(a,f),f),y=(a,i,f)=>(U(a,i,"access private method"),f);var N=(a,i,f,m)=>({set _(W){u(a,i,W,f)},get _(){return n(a,i,m)}});var w,Q,G,X,B,S,I,T,x,j,_,O,E,L,P,M,q,V,R,Y;function f(b){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(b){for(const e in b)if(e!=="default"){const s=Object.getOwnPropertyDescriptor(b,e);Object.defineProperty(t,e,s.get?s:{enumerable:!0,get:()=>b[e]})}}return t.default=b,Object.freeze(t)}const m=f(i);class W{constructor(){v(this,w);this.EARTH=4007501668e-2,this.HALF_EARTH=2003750834e-2}project(t,e){return[y(this,w,Q).call(this,t),y(this,w,G).call(this,e)]}unproject(t){return[y(this,w,X).call(this,t[0]),y(this,w,B).call(this,t[1])]}getID(){return"epsg:3857"}}w=new WeakSet,Q=function(t){return t/180*this.HALF_EARTH},G=function(t){var e=Math.log(Math.tan((90+t)*Math.PI/360))/(Math.PI/180);return e*this.HALF_EARTH/180},X=function(t){return t/this.HALF_EARTH*180},B=function(t){var e=t/this.HALF_EARTH*180;return e=180/Math.PI*(2*Math.atan(Math.exp(e*Math.PI/180))-Math.PI/2),e};class Z{constructor(t,e,s={},r=null){v(this,M);v(this,S);v(this,I);v(this,T);v(this,x);v(this,j);v(this,_);v(this,O);v(this,E);v(this,L);v(this,P);this.scene=t,this.camera=e,u(this,S,new W),u(this,I,{}),u(this,T,null),u(this,x,0),u(this,j,100),u(this,_,null),this.setGpsOptions(s),u(this,O,null),u(this,E,0),u(this,L,0),u(this,P,r)}setProjection(t){u(this,S,t)}setGpsOptions(t={}){t.gpsMinDistance!==void 0&&u(this,x,t.gpsMinDistance),t.gpsMinAccuracy!==void 0&&u(this,j,t.gpsMinAccuracy)}async startGps(){if(n(this,P)){const e=await(await n(this,P).sendData("/gps/start",{gpsMinDistance:n(this,x),gpsMinAccuracy:n(this,j)})).json();u(this,L,e.session)}return n(this,_)===null?(u(this,_,navigator.geolocation.watchPosition(t=>{y(this,M,R).call(this,t)},t=>{n(this,I).gpserror?n(this,I).gpserror(t.code):alert(`GPS error: code ${t.code}`)},{enableHighAccuracy:!0})),!0):!1}stopGps(){return n(this,_)!==null?(navigator.geolocation.clearWatch(n(this,_)),u(this,_,null),!0):!1}fakeGps(t,e,s=null,r=0){s!==null&&this.setElevation(s),y(this,M,R).call(this,{coords:{longitude:t,latitude:e,accuracy:r}})}lonLatToWorldCoords(t,e){const s=n(this,S).project(t,e);if(n(this,O))s[0]-=n(this,O)[0],s[1]-=n(this,O)[1];else throw"No initial position determined";return[s[0],-s[1]]}add(t,e,s,r,g={}){var p;t.properties=g,y(this,M,q).call(this,t,e,s,r),this.scene.add(t),(p=n(this,P))==null||p.sendData("/object/new",{position:t.position,x:t.position.x,z:t.position.z,session:n(this,L),properties:g})}setElevation(t){this.camera.position.y=t}on(t,e){n(this,I)[t]=e}}S=new WeakMap,I=new WeakMap,T=new WeakMap,x=new WeakMap,j=new WeakMap,_=new WeakMap,O=new WeakMap,E=new WeakMap,L=new WeakMap,P=new WeakMap,M=new WeakSet,q=function(t,e,s,r){const g=this.lonLatToWorldCoords(e,s);r!==void 0&&(t.position.y=r),[t.position.x,t.position.z]=g},V=function(t,e){u(this,O,n(this,S).project(t,e))},R=function(t){var s,r,g;let e=Number.MAX_VALUE;N(this,E)._++,(s=n(this,P))==null||s.sendData("/gps/new",{gpsCount:n(this,E),lat:t.coords.latitude,lon:t.coords.longitude,acc:t.coords.accuracy,session:n(this,L)}),t.coords.accuracy<=n(this,j)&&(n(this,T)===null?u(this,T,{latitude:t.coords.latitude,longitude:t.coords.longitude}):e=y(this,M,Y).call(this,n(this,T),t.coords),e>=n(this,x)&&(n(this,T).longitude=t.coords.longitude,n(this,T).latitude=t.coords.latitude,n(this,O)||(y(this,M,V).call(this,t.coords.longitude,t.coords.latitude),(r=n(this,P))==null||r.sendData("/worldorigin/new",{gpsCount:n(this,E),lat:t.coords.latitude,lon:t.coords.longitude,session:n(this,L),initialPosition:n(this,O)})),y(this,M,q).call(this,this.camera,t.coords.longitude,t.coords.latitude),(g=n(this,P))==null||g.sendData("/gps/accepted",{gpsCount:n(this,E),cameraX:this.camera.position.x,cameraZ:this.camera.position.z,session:n(this,L),distMoved:e}),n(this,I).gpsupdate&&n(this,I).gpsupdate(t,e)))},Y=function(t,e){const s=m.MathUtils.degToRad(e.longitude-t.longitude),r=m.MathUtils.degToRad(e.latitude-t.latitude),g=Math.sin(r/2)*Math.sin(r/2)+Math.cos(m.MathUtils.degToRad(t.latitude))*Math.cos(m.MathUtils.degToRad(e.latitude))*(Math.sin(s/2)*Math.sin(s/2));return 2*Math.atan2(Math.sqrt(g),Math.sqrt(1-g))*6371e3};class K{constructor(t,e,s){this.renderer=t,this.renderer.autoClear=!1,this.sceneWebcam=new m.Scene;let r;e?r=document.querySelector(e):(r=document.createElement("video"),r.setAttribute("autoplay",!0),r.setAttribute("playsinline",!0),r.style.display="none",document.body.appendChild(r)),this.geom=new m.PlaneGeometry,this.texture=new m.VideoTexture(r),this.material=new m.MeshBasicMaterial({map:this.texture});const g=new m.Mesh(this.geom,this.material);if(this.sceneWebcam.add(g),this.cameraWebcam=new m.OrthographicCamera(-.5,.5,.5,-.5,0,10),navigator.mediaDevices&&navigator.mediaDevices.getUserMedia){const p={video:{width:(s==null?void 0:s.width)||1280,height:(s==null?void 0:s.height)||720,facingMode:"environment"}};navigator.mediaDevices.getUserMedia(p).then(A=>{console.log("using the webcam successfully..."),r.srcObject=A,r.play()}).catch(A=>{setTimeout(()=>{alert(`Webcam Error
-Name: `+A.name+`
-Message: `+A.message)},1e3)})}else setTimeout(()=>{alert("sorry - media devices API not supported")},1e3)}update(){this.renderer.clear(),this.renderer.render(this.sceneWebcam,this.cameraWebcam),this.renderer.clearDepth()}dispose(){this.material.dispose(),this.texture.dispose(),this.geom.dispose()}}const k=navigator.userAgent.match(/iPhone|iPad|iPod/i)||/Macintosh/i.test(navigator.userAgent)&&navigator.maxTouchPoints!=null&&navigator.maxTouchPoints>1,$=new i.Vector3(0,0,1),z=new i.Euler,J=new i.Quaternion,tt=new i.Quaternion(-Math.sqrt(.5),0,0,Math.sqrt(.5)),et={type:"change"};class it extends i.EventDispatcher{constructor(t){super(),window.isSecureContext===!1&&console.error("THREE.DeviceOrientationControls: DeviceOrientationEvent is only available in secure contexts (https)");const e=this,s=1e-6,r=new i.Quaternion;this.object=t,this.object.rotation.reorder("YXZ"),this.enabled=!0,this.deviceOrientation=null,this.screenOrientation=0,this.alphaOffset=0,this.initialOffset=null,this.TWO_PI=2*Math.PI,this.HALF_PI=.5*Math.PI,this.orientationChangeEventName="ondeviceorientationabsolute"in window?"deviceorientationabsolute":"deviceorientation",this.smoothingFactor=1;const g=function({alpha:o,beta:h,gamma:l,webkitCompassHeading:c}){if(k){const d=360-c;e.alphaOffset=i.MathUtils.degToRad(d-o),e.deviceOrientation={alpha:o,beta:h,gamma:l,webkitCompassHeading:c}}else o<0&&(o+=360),e.deviceOrientation={alpha:o,beta:h,gamma:l};window.dispatchEvent(new CustomEvent("camera-rotation-change",{detail:{cameraRotation:t.rotation}}))},p=function(){e.screenOrientation=window.orientation||0},A=function(o,h,l,c,d){z.set(l,h,-c,"YXZ"),o.setFromEuler(z),o.multiply(tt),o.multiply(J.setFromAxisAngle($,-d))};this.connect=function(){p(),window.DeviceOrientationEvent!==void 0&&typeof window.DeviceOrientationEvent.requestPermission=="function"?window.DeviceOrientationEvent.requestPermission().then(o=>{o==="granted"&&(window.addEventListener("orientationchange",p),window.addEventListener(e.orientationChangeEventName,g))}).catch(function(o){console.error("THREE.DeviceOrientationControls: Unable to use DeviceOrientation API:",o)}):(window.addEventListener("orientationchange",p),window.addEventListener(e.orientationChangeEventName,g)),e.enabled=!0},this.disconnect=function(){window.removeEventListener("orientationchange",p),window.removeEventListener(e.orientationChangeEventName,g),e.enabled=!1,e.initialOffset=!1,e.deviceOrientation=null},this.update=function({theta:o=0}={theta:0}){if(e.enabled===!1)return;const h=e.deviceOrientation;if(h){let l=h.alpha?i.MathUtils.degToRad(h.alpha)+e.alphaOffset:0,c=h.beta?i.MathUtils.degToRad(h.beta):0,d=h.gamma?i.MathUtils.degToRad(h.gamma):0;const F=e.screenOrientation?i.MathUtils.degToRad(e.screenOrientation):0;if(k){const C=new i.Quaternion;A(C,l,c,d,F);const D=new i.Euler().setFromQuaternion(C,"YXZ");console.log(D.x,D.y,D.z),D.y=i.MathUtils.degToRad(360-h.webkitCompassHeading),C.setFromEuler(D),e.object.quaternion.copy(C)}else{if(this.smoothingFactor<1){if(this.lastOrientation){const C=this.smoothingFactor;l=this._getSmoothedAngle(l,this.lastOrientation.alpha,C),c=this._getSmoothedAngle(c+Math.PI,this.lastOrientation.beta,C),d=this._getSmoothedAngle(d+this.HALF_PI,this.lastOrientation.gamma,C,Math.PI)}else c+=Math.PI,d+=this.HALF_PI;this.lastOrientation={alpha:l,beta:c,gamma:d}}A(e.object.quaternion,l+o,this.smoothingFactor<1?c-Math.PI:c,this.smoothingFactor<1?d-this.HALF_PI:d,F)}8*(1-r.dot(e.object.quaternion))>s&&(r.copy(e.object.quaternion),e.dispatchEvent(et))}},this._orderAngle=function(o,h,l=this.TWO_PI){return h>o&&Math.abs(h-o)<l/2||o>h&&Math.abs(h-o)>l/2?{left:o,right:h}:{left:h,right:o}},this._getSmoothedAngle=function(o,h,l,c=this.TWO_PI){const d=this._orderAngle(o,h,c),F=d.left,C=d.right;d.left=0,d.right-=F,d.right<0&&(d.right+=c);let D=C==h?(1-l)*d.right+l*d.left:l*d.right+(1-l)*d.left;return D+=F,D>=c&&(D-=c),D},this.updateAlphaOffset=function(){e.initialOffset=!1},this.dispose=function(){e.disconnect()},this.getAlpha=function(){const{deviceOrientation:o}=e;return o&&o.alpha?i.MathUtils.degToRad(o.alpha)+e.alphaOffset:0},this.getBeta=function(){const{deviceOrientation:o}=e;return o&&o.beta?i.MathUtils.degToRad(o.beta):0},window.DeviceOrientationEvent!==void 0&&typeof window.DeviceOrientationEvent.requestPermission=="function"?this.initPermissionDialog():this.connect()}initPermissionDialog(){const t=document.createElement("div"),e=document.createElement("div"),s=document.createElement("div"),r=document.createElement("div");document.body.appendChild(t);const g={display:"flex",position:"fixed",top:0,left:0,width:"100%",height:"100%",zIndex:1,backgroundColor:"rgba(0,0,0,0.6)",justifyContent:"center",alignItems:"center"},p={backgroundColor:"white",padding:"6px",borderRadius:"3px",width:"36rem",height:"24rem"},A={width:"100%",height:"70%",display:"flex",justifyContent:"center",alignItems:"center"},o={display:"inline-flex",width:"100%",height:"30%",justifyContent:"center",alignItems:"center"};for(let c in g)t.style[c]=g[c];for(let c in p)e.style[c]=p[c];for(let c in A)s.style[c]=A[c];for(let c in o)r.style[c]=o[c];t.appendChild(e),e.appendChild(s),e.appendChild(r),s.innerHTML='<div style="font-size: 24pt; margin: 1rem;">This immersive website requires access to your device motion sensors.</div>';const h=()=>{this.connect(),t.style.display="none"},l=document.createElement("button");l.addEventListener("click",h),l.style.width="50%",l.style.height="80%",l.style.fontSize="20pt",l.appendChild(document.createTextNode("OK")),r.appendChild(l),document.body.appendChild(t)}}class nt{constructor(t){this.raycaster=new m.Raycaster,this.normalisedMousePosition=new m.Vector2(null,null),t.domElement.addEventListener("click",e=>{this.normalisedMousePosition.set(e.clientX/t.domElement.clientWidth*2-1,-(e.clientY/t.domElement.clientHeight*2)+1)})}raycast(t,e){if(this.normalisedMousePosition.x!==null&&this.normalisedMousePosition.y!==null){this.raycaster.setFromCamera(this.normalisedMousePosition,t);const s=this.raycaster.intersectObjects(e.children,!1);return this.normalisedMousePosition.set(null,null),s}return[]}}a.ClickHandler=nt,a.DeviceOrientationControls=it,a.LocationBased=Z,a.SphMercProjection=W,a.WebcamRenderer=K,Object.defineProperty(a,Symbol.toStringTag,{value:"Module"})});
+(function(r,n){typeof exports=="object"&&typeof module<"u"?n(exports,require("three")):typeof define=="function"&&define.amd?define(["exports","three"],n):(r=typeof globalThis<"u"?globalThis:r||self,n(r.locar={},r.THREE))})(this,function(r,n){"use strict";var Q=r=>{throw TypeError(r)};var U=(r,n,p)=>n.has(r)||Q("Cannot "+p);var s=(r,n,p)=>(U(r,n,"read from private field"),p?p.call(r):n.get(r)),y=(r,n,p)=>n.has(r)?Q("Cannot add the same private member more than once"):n instanceof WeakSet?n.add(r):n.set(r,p),m=(r,n,p,v)=>(U(r,n,"write to private field"),v?v.call(r,p):n.set(r,p),p),w=(r,n,p)=>(U(r,n,"access private method"),p);var V=(r,n,p,v)=>({set _(W){m(r,n,W,p)},get _(){return s(r,n,v)}});var b,X,B,Y,Z,_,L,E,j,I,D,A,S,T,O,M,k,$,q,K;function p(a){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(a){for(const e in a)if(e!=="default"){const i=Object.getOwnPropertyDescriptor(a,e);Object.defineProperty(t,e,i.get?i:{enumerable:!0,get:()=>a[e]})}}return t.default=a,Object.freeze(t)}const v=p(n);class W{constructor(){y(this,b);this.EARTH=4007501668e-2,this.HALF_EARTH=2003750834e-2}project(t,e){return[w(this,b,X).call(this,t),w(this,b,B).call(this,e)]}unproject(t){return[w(this,b,Y).call(this,t[0]),w(this,b,Z).call(this,t[1])]}getID(){return"epsg:3857"}}b=new WeakSet,X=function(t){return t/180*this.HALF_EARTH},B=function(t){var e=Math.log(Math.tan((90+t)*Math.PI/360))/(Math.PI/180);return e*this.HALF_EARTH/180},Y=function(t){return t/this.HALF_EARTH*180},Z=function(t){var e=t/this.HALF_EARTH*180;return e=180/Math.PI*(2*Math.atan(Math.exp(e*Math.PI/180))-Math.PI/2),e};class H{constructor(t,e,i={},h=null){y(this,M);y(this,_);y(this,L);y(this,E);y(this,j);y(this,I);y(this,D);y(this,A);y(this,S);y(this,T);y(this,O);this.scene=t,this.camera=e,m(this,_,new W),m(this,L,{}),m(this,E,null),m(this,j,0),m(this,I,100),m(this,D,null),this.setGpsOptions(i),m(this,A,null),m(this,S,0),m(this,T,0),m(this,O,h)}setProjection(t){m(this,_,t)}setGpsOptions(t={}){t.gpsMinDistance!==void 0&&m(this,j,t.gpsMinDistance),t.gpsMinAccuracy!==void 0&&m(this,I,t.gpsMinAccuracy)}async startGps(){if(s(this,O)){const e=await(await s(this,O).sendData("/gps/start",{gpsMinDistance:s(this,j),gpsMinAccuracy:s(this,I)})).json();m(this,T,e.session)}return s(this,D)===null?(m(this,D,navigator.geolocation.watchPosition(t=>{w(this,M,q).call(this,t)},t=>{s(this,L).gpserror?s(this,L).gpserror(t.code):alert(`GPS error: code ${t.code}`)},{enableHighAccuracy:!0})),!0):!1}stopGps(){return s(this,D)!==null?(navigator.geolocation.clearWatch(s(this,D)),m(this,D,null),!0):!1}fakeGps(t,e,i=null,h=0){i!==null&&this.setElevation(i),w(this,M,q).call(this,{coords:{longitude:t,latitude:e,accuracy:h}})}lonLatToWorldCoords(t,e){const i=s(this,_).project(t,e);if(s(this,A))i[0]-=s(this,A)[0],i[1]-=s(this,A)[1];else throw"No initial position determined";return[i[0],-i[1]]}add(t,e,i,h,u={}){var f;t.properties=u,w(this,M,k).call(this,t,e,i,h),this.scene.add(t),(f=s(this,O))==null||f.sendData("/object/new",{position:t.position,x:t.position.x,z:t.position.z,session:s(this,T),properties:u})}setElevation(t){this.camera.position.y=t}on(t,e){s(this,L)[t]=e}}_=new WeakMap,L=new WeakMap,E=new WeakMap,j=new WeakMap,I=new WeakMap,D=new WeakMap,A=new WeakMap,S=new WeakMap,T=new WeakMap,O=new WeakMap,M=new WeakSet,k=function(t,e,i,h){const u=this.lonLatToWorldCoords(e,i);h!==void 0&&(t.position.y=h),[t.position.x,t.position.z]=u},$=function(t,e){m(this,A,s(this,_).project(t,e))},q=function(t){var i,h,u;let e=Number.MAX_VALUE;V(this,S)._++,(i=s(this,O))==null||i.sendData("/gps/new",{gpsCount:s(this,S),lat:t.coords.latitude,lon:t.coords.longitude,acc:t.coords.accuracy,session:s(this,T)}),t.coords.accuracy<=s(this,I)&&(s(this,E)===null?m(this,E,{latitude:t.coords.latitude,longitude:t.coords.longitude}):e=w(this,M,K).call(this,s(this,E),t.coords),e>=s(this,j)&&(s(this,E).longitude=t.coords.longitude,s(this,E).latitude=t.coords.latitude,s(this,A)||(w(this,M,$).call(this,t.coords.longitude,t.coords.latitude),(h=s(this,O))==null||h.sendData("/worldorigin/new",{gpsCount:s(this,S),lat:t.coords.latitude,lon:t.coords.longitude,session:s(this,T),initialPosition:s(this,A)})),w(this,M,k).call(this,this.camera,t.coords.longitude,t.coords.latitude),(u=s(this,O))==null||u.sendData("/gps/accepted",{gpsCount:s(this,S),cameraX:this.camera.position.x,cameraZ:this.camera.position.z,session:s(this,T),distMoved:e}),s(this,L).gpsupdate&&s(this,L).gpsupdate(t,e)))},K=function(t,e){const i=v.MathUtils.degToRad(e.longitude-t.longitude),h=v.MathUtils.degToRad(e.latitude-t.latitude),u=Math.sin(h/2)*Math.sin(h/2)+Math.cos(v.MathUtils.degToRad(t.latitude))*Math.cos(v.MathUtils.degToRad(e.latitude))*(Math.sin(i/2)*Math.sin(i/2));return 2*Math.atan2(Math.sqrt(u),Math.sqrt(1-u))*6371e3};class G{constructor(t={},e){this.sceneWebcam=new v.Scene;let i;if(e?i=document.querySelector(e):(i=document.createElement("video"),i.setAttribute("autoplay",!0),i.setAttribute("playsinline",!0),i.style.display="none",document.body.appendChild(i)),this.texture=new v.VideoTexture(i),navigator.mediaDevices&&navigator.mediaDevices.getUserMedia){const h={video:{width:{ideal:t.idealWidth||1280},height:{ideal:t.idealHeight||720},facingMode:"environment"}};navigator.mediaDevices.getUserMedia(h).then(u=>{i.addEventListener("loadedmetadata",()=>{var f;i.setAttribute("width",i.videoWidth),i.setAttribute("height",i.videoHeight),i.play(),(f=t.onVideoStarted)==null||f.call(this,this.texture)}),i.srcObject=u}).catch(u=>{setTimeout(()=>{alert(`Webcam Error
+Name: `+u.name+`
+Message: `+u.message)},1e3)})}else setTimeout(()=>{alert("sorry - media devices API not supported")},1e3)}dispose(){this.texture.dispose()}}const R=navigator.userAgent.match(/iPhone|iPad|iPod/i)||/Macintosh/i.test(navigator.userAgent)&&navigator.maxTouchPoints!=null&&navigator.maxTouchPoints>1,J=new n.Vector3(0,0,1),N=new n.Euler,tt=new n.Quaternion,et=new n.Quaternion(-Math.sqrt(.5),0,0,Math.sqrt(.5)),it={type:"change"};class z extends n.EventDispatcher{constructor(t){super(),window.isSecureContext===!1&&console.error("THREE.DeviceOrientationControls: DeviceOrientationEvent is only available in secure contexts (https)");const e=this,i=1e-6,h=new n.Quaternion;this.object=t,this.object.rotation.reorder("YXZ"),this.enabled=!0,this.deviceOrientation=null,this.screenOrientation=0,this.alphaOffset=0,this.initialOffset=null,this.TWO_PI=2*Math.PI,this.HALF_PI=.5*Math.PI,this.orientationChangeEventName="ondeviceorientationabsolute"in window?"deviceorientationabsolute":"deviceorientation",this.smoothingFactor=1;const u=function({alpha:o,beta:l,gamma:d,webkitCompassHeading:c}){if(R){const g=360-c;e.alphaOffset=n.MathUtils.degToRad(g-o),e.deviceOrientation={alpha:o,beta:l,gamma:d,webkitCompassHeading:c}}else o<0&&(o+=360),e.deviceOrientation={alpha:o,beta:l,gamma:d};window.dispatchEvent(new CustomEvent("camera-rotation-change",{detail:{cameraRotation:t.rotation}}))},f=function(){e.screenOrientation=window.orientation||0},x=function(o,l,d,c,g){N.set(d,l,-c,"YXZ"),o.setFromEuler(N),o.multiply(et),o.multiply(tt.setFromAxisAngle(J,-g))};this.connect=function(){f(),window.DeviceOrientationEvent!==void 0&&typeof window.DeviceOrientationEvent.requestPermission=="function"?window.DeviceOrientationEvent.requestPermission().then(o=>{o==="granted"&&(window.addEventListener("orientationchange",f),window.addEventListener(e.orientationChangeEventName,u))}).catch(function(o){console.error("THREE.DeviceOrientationControls: Unable to use DeviceOrientation API:",o)}):(window.addEventListener("orientationchange",f),window.addEventListener(e.orientationChangeEventName,u)),e.enabled=!0},this.disconnect=function(){window.removeEventListener("orientationchange",f),window.removeEventListener(e.orientationChangeEventName,u),e.enabled=!1,e.initialOffset=!1,e.deviceOrientation=null},this.update=function({theta:o=0}={theta:0}){if(e.enabled===!1)return;const l=e.deviceOrientation;if(l){let d=l.alpha?n.MathUtils.degToRad(l.alpha)+e.alphaOffset:0,c=l.beta?n.MathUtils.degToRad(l.beta):0,g=l.gamma?n.MathUtils.degToRad(l.gamma):0;const F=e.screenOrientation?n.MathUtils.degToRad(e.screenOrientation):0;if(R){const P=new n.Quaternion;x(P,d,c,g,F);const C=new n.Euler().setFromQuaternion(P,"YXZ");console.log(C.x,C.y,C.z),C.y=n.MathUtils.degToRad(360-l.webkitCompassHeading),P.setFromEuler(C),e.object.quaternion.copy(P)}else{if(this.smoothingFactor<1){if(this.lastOrientation){const P=this.smoothingFactor;d=this._getSmoothedAngle(d,this.lastOrientation.alpha,P),c=this._getSmoothedAngle(c+Math.PI,this.lastOrientation.beta,P),g=this._getSmoothedAngle(g+this.HALF_PI,this.lastOrientation.gamma,P,Math.PI)}else c+=Math.PI,g+=this.HALF_PI;this.lastOrientation={alpha:d,beta:c,gamma:g}}x(e.object.quaternion,d+o,this.smoothingFactor<1?c-Math.PI:c,this.smoothingFactor<1?g-this.HALF_PI:g,F)}8*(1-h.dot(e.object.quaternion))>i&&(h.copy(e.object.quaternion),e.dispatchEvent(it))}},this._orderAngle=function(o,l,d=this.TWO_PI){return l>o&&Math.abs(l-o)<d/2||o>l&&Math.abs(l-o)>d/2?{left:o,right:l}:{left:l,right:o}},this._getSmoothedAngle=function(o,l,d,c=this.TWO_PI){const g=this._orderAngle(o,l,c),F=g.left,P=g.right;g.left=0,g.right-=F,g.right<0&&(g.right+=c);let C=P==l?(1-d)*g.right+d*g.left:d*g.right+(1-d)*g.left;return C+=F,C>=c&&(C-=c),C},this.updateAlphaOffset=function(){e.initialOffset=!1},this.dispose=function(){e.disconnect()},this.getAlpha=function(){const{deviceOrientation:o}=e;return o&&o.alpha?n.MathUtils.degToRad(o.alpha)+e.alphaOffset:0},this.getBeta=function(){const{deviceOrientation:o}=e;return o&&o.beta?n.MathUtils.degToRad(o.beta):0},window.DeviceOrientationEvent!==void 0&&typeof window.DeviceOrientationEvent.requestPermission=="function"?this.initPermissionDialog():this.connect()}initPermissionDialog(){const t=document.createElement("div"),e=document.createElement("div"),i=document.createElement("div"),h=document.createElement("div");document.body.appendChild(t);const u={display:"flex",position:"fixed",top:0,left:0,width:"100%",height:"100%",zIndex:1,backgroundColor:"rgba(0,0,0,0.6)",justifyContent:"center",alignItems:"center"},f={backgroundColor:"white",padding:"6px",borderRadius:"3px",width:"36rem",height:"24rem"},x={width:"100%",height:"70%",display:"flex",justifyContent:"center",alignItems:"center"},o={display:"inline-flex",width:"100%",height:"30%",justifyContent:"center",alignItems:"center"};for(let c in u)t.style[c]=u[c];for(let c in f)e.style[c]=f[c];for(let c in x)i.style[c]=x[c];for(let c in o)h.style[c]=o[c];t.appendChild(e),e.appendChild(i),e.appendChild(h),i.innerHTML='<div style="font-size: 24pt; margin: 1rem;">This immersive website requires access to your device motion sensors.</div>';const l=()=>{this.connect(),t.style.display="none"},d=document.createElement("button");d.addEventListener("click",l),d.style.width="50%",d.style.height="80%",d.style.fontSize="20pt",d.appendChild(document.createTextNode("OK")),h.appendChild(d),document.body.appendChild(t)}}class nt{constructor(t){this.raycaster=new v.Raycaster,this.normalisedMousePosition=new v.Vector2(null,null),t.domElement.addEventListener("click",e=>{this.normalisedMousePosition.set(e.clientX/t.domElement.clientWidth*2-1,-(e.clientY/t.domElement.clientHeight*2)+1)})}raycast(t,e){if(this.normalisedMousePosition.x!==null&&this.normalisedMousePosition.y!==null){this.raycaster.setFromCamera(this.normalisedMousePosition,t);const i=this.raycaster.intersectObjects(e.children,!1);return this.normalisedMousePosition.set(null,null),i}return[]}}AFRAME.registerComponent("locar-webcam",{schema:{idealWidth:{type:"number",default:1024},idealHeight:{type:"number",default:768},videoElement:{type:"string",default:""}},init:function(){new G({idealWidth:this.data.idealWidth,idealHeight:this.data.idealHeight,onVideoStarted:a=>{this.el.object3D.background=a}},this.data.videoElement||null)}}),AFRAME.registerComponent("locar-camera",{schema:{simulateLatitude:{type:"number",default:0},simulateLongitude:{type:"number",default:0},simulateAltitude:{type:"number",default:-Number.MAX_VALUE},positionMinAccuracy:{type:"number",default:100}},init:function(){this.locar=new H(this.el.sceneEl.object3D,this.el.object3D),this.locar.on("gpsupdate",(a,t)=>{this.el.emit("gpsupdate",{position:a,distMoved:t})}),this.locar.on("gpserror",a=>{const t=["User denied access to GPS.","GPS satellites not available.","Timeout communicating with GPS satellites - try moving to a more open area."];a>=1&&a<=3?alert(t[a-1]):alert(`Unknown geolocation error code ${a}.`)}),this._isMobile()&&(this.deviceOrientationControls=new z(this.el.object3D))},update:function(a){this.locar.setGpsOptions({gpsMinAccuracy:this.data.positionMinAccuracy,gpsMinDistance:this.data.gpsMinDistance}),(this.data.simulateLatitude!==0||this.data.simulateLongitude!==0)&&(this.data.simulateLatitude!=(a==null?void 0:a.simulateLatitude)||this.data.simulateLongitude!=(a==null?void 0:a.simulateLongitude))&&(this.locar.stopGps(),this.locar.fakeGps(this.data.simulateLongitude,this.data.simulateLatitude),this.data.simulateLongitude=0,this.data.simulateLatitude=0),this.data.simulateAltitude>-Number.MAX_VALUE&&this.locar.setElevation(this.data.simulateAltitude+1.6)},play:function(){this.locar.startGps()},pause:function(){this.locar.stopGps()},lonLatToWorldCoords:function(a,t){return this.locar.lonLatToWorldCoords(a,t)},tick:function(){var a;(a=this.deviceOrientationControls)==null||a.update()},_isMobile:function(){return/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)||/Macintosh/i.test(navigator.userAgent)&&navigator.maxTouchPoints!=null&&navigator.maxTouchPoints>1}}),AFRAME.registerComponent("locar-entity-place",{schema:{latitude:{type:"number",default:0},longitude:{type:"number",default:0}},init:function(){const a=this.el.sceneEl.querySelector("[locar-camera]");this.locarCamera=a.components["locar-camera"]},update:function(a){this.locarCamera||console.error("Cannot update locar-entity-place without a locar-camera component on the scene camera.");const t=this.locarCamera.lonLatToWorldCoords(this.data.longitude,this.data.latitude);this.el.object3D.position.set(t[0],this.el.object3D.position.y,t[1])}});const st="0.0.10";r.ClickHandler=nt,r.DeviceOrientationControls=z,r.LocationBased=H,r.SphMercProjection=W,r.Webcam=G,r.version=st,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "locar",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "Location-based AR from AR.js.",
   "files": [
     "dist"
@@ -20,5 +20,8 @@
   "devDependencies": {
     "jsdoc": "^4.0.4",
     "vite": "^5.4.8"
+  },
+  "dependencies": {
+    "three": "^0.175.0"
   }
 }