Skip to content

Commit

Permalink
chore(release): 1.4.0-57
Browse files Browse the repository at this point in the history
  • Loading branch information
@speigg
speigg committed Oct 4, 2017
1 parent 93c9713 commit d5441d1
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 42 deletions.
48 changes: 28 additions & 20 deletions dist/argon.core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21346,7 +21346,7 @@ $__System.register('1', ['2', '3', '3c', '4', '9', '10', 'a', '20', '33', '42',
requestVertexNormals: true
}));

_export('version', version = "1.4.0-56");
_export('version', version = "1.4.0-57");

__extends$1 = undefined && undefined.__extends || function (d, b) {
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
Expand Down Expand Up @@ -25861,19 +25861,6 @@ $__System.register('1', ['2', '3', '3c', '4', '9', '10', 'a', '20', '33', '42',
sessionEntities[id] = state.entities[id];
}
}
// identify frames to hide from the session
var excludedFrames = this._excludedFrames;
for (id in excludedFrames) delete excludedFrames[id]; //clear
// exclude device orientation frame since each session can get this directly
if (session.versionNumber >= 1.4) excludedFrames[this.device.deviceOrientation.id] = true;
// exclude geolocated frames if necessary
if (this.permissionServiceProvider.getPermissionState(session, 'geolocation') != PermissionState.GRANTED) {
excludedFrames[this.deviceService.origin.id] = true;
excludedFrames[this.contextService.origin.id] = true;
} else {
delete excludedFrames[this.deviceService.origin.id];
delete excludedFrames[this.contextService.origin.id];
}
// identity frames to provide to the session
var includedFrames = this._includedFrames;
for (id in includedFrames) delete includedFrames[id]; //clear
Expand All @@ -25883,16 +25870,37 @@ $__System.register('1', ['2', '3', '3c', '4', '9', '10', 'a', '20', '33', '42',
includedFrames[id] = true;
}
}
includedFrames['ar.device.stage'] = true;
includedFrames['ar.device.user'] = true;
includedFrames['ar.stage'] = true;
includedFrames['ar.user'] = true;
includedFrames['ar.view'] = true;
var deviceService = this.deviceService;
var deviceOriginId = deviceService.origin.id;
var deviceStageId = deviceService.stage.id;
var deviceUserId = deviceService.stage.id;
var contextService = this.contextService;
var contextOriginId = contextService.origin.id;
var contextStageId = contextService.stage.id;
var contextUserId = contextService.stage.id;
includedFrames[deviceOriginId] = true;
includedFrames[deviceStageId] = true;
includedFrames[deviceUserId] = true;
includedFrames[contextOriginId] = true;
includedFrames[contextStageId] = true;
includedFrames[contextUserId] = true;
includedFrames[contextService.view.id] = true;
for (var i = 0; i < state.subviews.length; i++) {
includedFrames['ar.view_' + i] = true;
includedFrames['ar.device.view_' + i] = true;
}
subscriptions && entityServiceProvider.fillEntityStateMap(sessionEntities, state.time, subscriptions, excludedFrames);
// identify frames to hide from the session
var excludedFrames = this._excludedFrames;
for (id in excludedFrames) delete excludedFrames[id]; //clear
// exclude device orientation frame since each session can get this directly
if (session.versionNumber >= 1.4) excludedFrames[this.device.deviceOrientation.id] = true;
// exclude geolocated frames if necessary
if (this.permissionServiceProvider.getPermissionState(session, 'geolocation') != PermissionState.GRANTED) {
excludedFrames[deviceOriginId] = true;
excludedFrames[contextOriginId] = true;
}
// get states for all included frames, minus excluded frames
entityServiceProvider.fillEntityStateMap(sessionEntities, state.time, includedFrames, excludedFrames);
// recycle the frame state object, but with the session entities
var parentEntities = state.entities;
state.entities = sessionEntities;
Expand Down
48 changes: 28 additions & 20 deletions dist/argon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26931,7 +26931,7 @@ $__System.register('1', ['2', '3', '3c', '4', '9', '10', 'a', '20', '33', '42',
requestVertexNormals: true
}));

_export('version', version = "1.4.0-56");
_export('version', version = "1.4.0-57");

__extends$1 = undefined && undefined.__extends || function (d, b) {
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
Expand Down Expand Up @@ -31446,19 +31446,6 @@ $__System.register('1', ['2', '3', '3c', '4', '9', '10', 'a', '20', '33', '42',
sessionEntities[id] = state.entities[id];
}
}
// identify frames to hide from the session
var excludedFrames = this._excludedFrames;
for (id in excludedFrames) delete excludedFrames[id]; //clear
// exclude device orientation frame since each session can get this directly
if (session.versionNumber >= 1.4) excludedFrames[this.device.deviceOrientation.id] = true;
// exclude geolocated frames if necessary
if (this.permissionServiceProvider.getPermissionState(session, 'geolocation') != PermissionState.GRANTED) {
excludedFrames[this.deviceService.origin.id] = true;
excludedFrames[this.contextService.origin.id] = true;
} else {
delete excludedFrames[this.deviceService.origin.id];
delete excludedFrames[this.contextService.origin.id];
}
// identity frames to provide to the session
var includedFrames = this._includedFrames;
for (id in includedFrames) delete includedFrames[id]; //clear
Expand All @@ -31468,16 +31455,37 @@ $__System.register('1', ['2', '3', '3c', '4', '9', '10', 'a', '20', '33', '42',
includedFrames[id] = true;
}
}
includedFrames['ar.device.stage'] = true;
includedFrames['ar.device.user'] = true;
includedFrames['ar.stage'] = true;
includedFrames['ar.user'] = true;
includedFrames['ar.view'] = true;
var deviceService = this.deviceService;
var deviceOriginId = deviceService.origin.id;
var deviceStageId = deviceService.stage.id;
var deviceUserId = deviceService.stage.id;
var contextService = this.contextService;
var contextOriginId = contextService.origin.id;
var contextStageId = contextService.stage.id;
var contextUserId = contextService.stage.id;
includedFrames[deviceOriginId] = true;
includedFrames[deviceStageId] = true;
includedFrames[deviceUserId] = true;
includedFrames[contextOriginId] = true;
includedFrames[contextStageId] = true;
includedFrames[contextUserId] = true;
includedFrames[contextService.view.id] = true;
for (var i = 0; i < state.subviews.length; i++) {
includedFrames['ar.view_' + i] = true;
includedFrames['ar.device.view_' + i] = true;
}
subscriptions && entityServiceProvider.fillEntityStateMap(sessionEntities, state.time, subscriptions, excludedFrames);
// identify frames to hide from the session
var excludedFrames = this._excludedFrames;
for (id in excludedFrames) delete excludedFrames[id]; //clear
// exclude device orientation frame since each session can get this directly
if (session.versionNumber >= 1.4) excludedFrames[this.device.deviceOrientation.id] = true;
// exclude geolocated frames if necessary
if (this.permissionServiceProvider.getPermissionState(session, 'geolocation') != PermissionState.GRANTED) {
excludedFrames[deviceOriginId] = true;
excludedFrames[contextOriginId] = true;
}
// get states for all included frames, minus excluded frames
entityServiceProvider.fillEntityStateMap(sessionEntities, state.time, includedFrames, excludedFrames);
// recycle the frame state object, but with the session entities
var parentEntities = state.entities;
state.entities = sessionEntities;
Expand Down
2 changes: 1 addition & 1 deletion dist/argon.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@argonjs/argon",
"version": "1.4.0-56",
"version": "1.4.0-57",
"main": "dist/argon.core.js",
"browser": "dist/argon.js",
"typings": "index.d.ts",
Expand Down

0 comments on commit d5441d1

Please sign in to comment.