Skip to content

Commit

Permalink
Merge pull request #610 from AR-js-org/revert560
Browse files Browse the repository at this point in the history
Removed PR #560 from master, present in dev
  • Loading branch information
nickw1 authored Oct 29, 2024
2 parents e2f2893 + 05d5844 commit 7e63ff7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion aframe/build/aframe-ar-new-location-only.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion aframe/build/aframe-ar-nft.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion aframe/build/aframe-ar.js

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions aframe/src/new-location-based/gps-new-camera.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ AFRAME.registerComponent("gps-new-camera", {
init: function () {
this._testForOrientationControls();

this.fakeGpsStarted = false;

this.threeLoc = new THREEx.LocationBased(
this.el.sceneEl.object3D,
this.el.object3D,
Expand Down Expand Up @@ -98,7 +96,6 @@ AFRAME.registerComponent("gps-new-camera", {
maximumAge: this.data.gpsTimeInterval,
});
if (
!this.fakeGpsStarted &&
(this.data.simulateLatitude !== 0 || this.data.simulateLongitude !== 0) &&
(this.data.simulateLatitude != oldData.simulateLatitude ||
this.data.simulateLongitude != oldData.simulateLongitude)
Expand All @@ -108,7 +105,8 @@ AFRAME.registerComponent("gps-new-camera", {
this.data.simulateLongitude,
this.data.simulateLatitude
);
this.fakeGpsStarted = true;
this.data.simulateLatitude = 0;
this.data.simulateLongitude = 0;
}
if (this.data.simulateAltitude > -Number.MAX_VALUE) {
this.threeLoc.setElevation(this.data.simulateAltitude + 1.6);
Expand Down

0 comments on commit 7e63ff7

Please sign in to comment.