Skip to content

Commit cb0b755

Browse files
committed
also update gps-projected-camera
1 parent 3739ad8 commit cb0b755

File tree

4 files changed

+84
-72
lines changed

4 files changed

+84
-72
lines changed

aframe/build/aframe-ar-location-only.js

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,26 +1383,29 @@ AFRAME.registerComponent('gps-projected-camera', {
13831383
window.addEventListener(eventName, this._onDeviceOrientation, false);
13841384
},
13851385

1386-
play: function() {
1387-
this._watchPositionId = this._initWatchGPS(function (position) {
1388-
var localPosition = {
1389-
latitude: position.coords.latitude,
1390-
longitude: position.coords.longitude,
1391-
altitude: position.coords.altitude,
1392-
accuracy: position.coords.accuracy,
1393-
altitudeAccuracy: position.coords.altitudeAccuracy,
1394-
};
1395-
1386+
play: function() {
1387+
if (this.data.simulateLatitude !== 0 && this.data.simulateLongitude !== 0) {
1388+
localPosition.latitude = this.data.simulateLatitude;
1389+
localPosition.longitude = this.data.simulateLongitude;
13961390
if (this.data.simulateAltitude !== 0) {
13971391
localPosition.altitude = this.data.simulateAltitude;
13981392
}
1393+
this.currentCoords = localPosition;
1394+
this._updatePosition();
1395+
} else {
1396+
this._watchPositionId = this._initWatchGPS(function (position) {
1397+
var localPosition = {
1398+
latitude: position.coords.latitude,
1399+
longitude: position.coords.longitude,
1400+
altitude: position.coords.altitude,
1401+
accuracy: position.coords.accuracy,
1402+
altitudeAccuracy: position.coords.altitudeAccuracy,
1403+
};
1404+
1405+
if (this.data.simulateAltitude !== 0) {
1406+
localPosition.altitude = this.data.simulateAltitude;
1407+
}
13991408

1400-
if (this.data.simulateLatitude !== 0 && this.data.simulateLongitude !== 0) {
1401-
localPosition.latitude = this.data.simulateLatitude;
1402-
localPosition.longitude = this.data.simulateLongitude;
1403-
this.currentCoords = localPosition;
1404-
this._updatePosition();
1405-
} else {
14061409
this.currentCoords = localPosition;
14071410
var distMoved = this._haversineDist(
14081411
this.lastPosition,
@@ -1416,8 +1419,8 @@ AFRAME.registerComponent('gps-projected-camera', {
14161419
latitude: this.currentCoords.latitude
14171420
};
14181421
}
1419-
}
1420-
}.bind(this));
1422+
}.bind(this));
1423+
}
14211424
},
14221425

14231426
tick: function() {

aframe/build/aframe-ar-nft.js

Lines changed: 21 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

aframe/build/aframe-ar.js

Lines changed: 21 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

aframe/src/location-based/gps-projected-camera.js

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -131,26 +131,29 @@ AFRAME.registerComponent('gps-projected-camera', {
131131
window.addEventListener(eventName, this._onDeviceOrientation, false);
132132
},
133133

134-
play: function() {
135-
this._watchPositionId = this._initWatchGPS(function (position) {
136-
var localPosition = {
137-
latitude: position.coords.latitude,
138-
longitude: position.coords.longitude,
139-
altitude: position.coords.altitude,
140-
accuracy: position.coords.accuracy,
141-
altitudeAccuracy: position.coords.altitudeAccuracy,
142-
};
143-
134+
play: function() {
135+
if (this.data.simulateLatitude !== 0 && this.data.simulateLongitude !== 0) {
136+
localPosition.latitude = this.data.simulateLatitude;
137+
localPosition.longitude = this.data.simulateLongitude;
144138
if (this.data.simulateAltitude !== 0) {
145139
localPosition.altitude = this.data.simulateAltitude;
146140
}
141+
this.currentCoords = localPosition;
142+
this._updatePosition();
143+
} else {
144+
this._watchPositionId = this._initWatchGPS(function (position) {
145+
var localPosition = {
146+
latitude: position.coords.latitude,
147+
longitude: position.coords.longitude,
148+
altitude: position.coords.altitude,
149+
accuracy: position.coords.accuracy,
150+
altitudeAccuracy: position.coords.altitudeAccuracy,
151+
};
152+
153+
if (this.data.simulateAltitude !== 0) {
154+
localPosition.altitude = this.data.simulateAltitude;
155+
}
147156

148-
if (this.data.simulateLatitude !== 0 && this.data.simulateLongitude !== 0) {
149-
localPosition.latitude = this.data.simulateLatitude;
150-
localPosition.longitude = this.data.simulateLongitude;
151-
this.currentCoords = localPosition;
152-
this._updatePosition();
153-
} else {
154157
this.currentCoords = localPosition;
155158
var distMoved = this._haversineDist(
156159
this.lastPosition,
@@ -164,8 +167,8 @@ AFRAME.registerComponent('gps-projected-camera', {
164167
latitude: this.currentCoords.latitude
165168
};
166169
}
167-
}
168-
}.bind(this));
170+
}.bind(this));
171+
}
169172
},
170173

171174
tick: function() {

0 commit comments

Comments
 (0)