Skip to content

Commit

Permalink
Bump builds
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmarcos
dmarcos committed Dec 23, 2019
1 parent d32c843 commit 4e78497
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 43 deletions.
10 changes: 5 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ and publishing now, remix the starter example on:
```html
<html>
<head>
<script src="https://aframe.io/releases/1.0.1/aframe.min.js"></script>
<script src="https://aframe.io/releases/1.0.2/aframe.min.js"></script>
</head>
<body>
<a-scene>
Expand All @@ -119,7 +119,7 @@ and publishing now, remix the starter example on:
```

With A-Frame's [entity-component
architecture](https://aframe.io/docs/1.0.1/introduction/entity-component-system.html), we can drop in community
architecture](https://aframe.io/docs/1.0.2/introduction/entity-component-system.html), we can drop in community
components from the ecosystem (e.g., ocean, physics) and plug them into our
objects straight from HTML:

Expand All @@ -128,7 +128,7 @@ objects straight from HTML:
```html
<html>
<head>
<script src="https://aframe.io/releases/1.0.1/aframe.min.js"></script>
<script src="https://aframe.io/releases/1.0.2/aframe.min.js"></script>
<script src="https://unpkg.com/[email protected]/dist/aframe-particle-system-component.min.js"></script>
<script src="https://unpkg.com/aframe-extras.ocean@%5E3.5.x/dist/aframe-extras.ocean.min.js"></script>
<script src="https://unpkg.com/[email protected]/dist/gradientsky.min.js"></script>
Expand Down Expand Up @@ -159,11 +159,11 @@ objects straight from HTML:

### Builds

To use the latest stable build of A-Frame, include [`aframe.min.js`](https://aframe.io/releases/1.0.1/aframe.min.js):
To use the latest stable build of A-Frame, include [`aframe.min.js`](https://aframe.io/releases/1.0.2/aframe.min.js):

```js
<head>
<script src="https://aframe.io/releases/1.0.1/aframe.min.js"></script>
<script src="https://aframe.io/releases/1.0.2/aframe.min.js"></script>
</head>
```

Expand Down
1 change: 0 additions & 1 deletion dist/aframe-v1.0.1.min.js.map
View file

This file was deleted.

78 changes: 52 additions & 26 deletions dist/aframe-v1.0.1.js → dist/aframe-v1.0.2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65819,7 +65819,7 @@ function extend() {
},{}],54:[function(_dereq_,module,exports){
module.exports={
"name": "aframe",
"version": "1.0.1",
"version": "1.0.2",
"description": "A web framework for building virtual reality experiences.",
"homepage": "https://aframe.io/",
"main": "dist/aframe-master.js",
Expand All @@ -65838,7 +65838,7 @@ module.exports={
"lint:fix": "semistandard --fix",
"precommit": "npm run lint",
"prepush": "node scripts/testOnlyCheck.js",
"prerelease": "cross-env FOR_RELEASE=true node scripts/release.js 1.0.0 1.0.1",
"prerelease": "cross-env node scripts/release.js 1.0.1 1.0.2",
"start": "npm run dev",
"start:https": "cross-env SSL=true npm run dev",
"test": "karma start ./tests/karma.conf.js",
Expand Down Expand Up @@ -68872,9 +68872,11 @@ module.exports.Component = registerComponent('look-controls', {
},

init: function () {
this.deltaYaw = 0;
this.previousHMDPosition = new THREE.Vector3();
this.hmdQuaternion = new THREE.Quaternion();
this.hmdEuler = new THREE.Euler();
this.magicWindowAbsoluteEuler = new THREE.Euler();
this.magicWindowDeltaEuler = new THREE.Euler();
this.position = new THREE.Vector3();
// To save / restore camera pose
this.savedRotation = new THREE.Vector3();
Expand Down Expand Up @@ -68902,6 +68904,7 @@ module.exports.Component = registerComponent('look-controls', {

setupMagicWindowControls: function () {
var magicWindowControls;

// Only on mobile devices and only enabled if DeviceOrientation permission has been granted.
if (utils.device.isMobile()) {
magicWindowControls = this.magicWindowControls = new THREE.DeviceOrientationControls(this.magicWindowObject);
Expand Down Expand Up @@ -69055,39 +69058,56 @@ module.exports.Component = registerComponent('look-controls', {
var poseMatrix = new THREE.Matrix4();

return function () {
var hmdEuler = this.hmdEuler;
var object3D = this.el.object3D;
var pitchObject = this.pitchObject;
var yawObject = this.yawObject;
var pose;
var sceneEl = this.el.sceneEl;

// WebXR API updates applies headset pose to the object3D matrixWorld internally.
// Reflect values back on position, rotation, scale so setAttribute returns expected values.
if (sceneEl.is('vr-mode') && sceneEl.hasWebXR) {
pose = sceneEl.renderer.xr.getCameraPose();
if (pose) {
poseMatrix.elements = pose.transform.matrix;
poseMatrix.decompose(object3D.position, object3D.rotation, object3D.scale);
// In VR mode, THREE is in charge of updating the camera pose.
if (sceneEl.is('vr-mode') && sceneEl.checkHeadsetConnected()) {
// With WebXR THREE applies headset pose to the object3D matrixWorld internally.
// Reflect values back on position, rotation, scale for getAttribute to return the expected values.
if (sceneEl.hasWebXR) {
pose = sceneEl.renderer.xr.getCameraPose();
if (pose) {
poseMatrix.elements = pose.transform.matrix;
poseMatrix.decompose(object3D.position, object3D.rotation, object3D.scale);
}
}
return;
} else {
object3D.updateMatrix();
}

// In VR mode, THREE is in charge of updating the camera rotation.
if (sceneEl.is('vr-mode') && sceneEl.checkHeadsetConnected()) { return; }
// Calculate magic window HMD quaternion.
if (this.magicWindowControls && this.magicWindowControls.enabled) {
this.magicWindowControls.update();
hmdEuler.setFromQuaternion(this.magicWindowObject.quaternion, 'YXZ');
}
this.updateMagicWindowOrientation();

// On mobile, do camera rotation with touch events and sensors.
object3D.rotation.x = hmdEuler.x + pitchObject.rotation.x;
object3D.rotation.y = hmdEuler.y + yawObject.rotation.y;
object3D.rotation.x = this.magicWindowDeltaEuler.x + pitchObject.rotation.x;
object3D.rotation.y = this.magicWindowDeltaEuler.y + yawObject.rotation.y;
object3D.rotation.z = this.magicWindowDeltaEuler.z;
};
})(),

updateMagicWindowOrientation: function () {
var magicWindowAbsoluteEuler = this.magicWindowAbsoluteEuler;
var magicWindowDeltaEuler = this.magicWindowDeltaEuler;
// Calculate magic window HMD quaternion.
if (this.magicWindowControls && this.magicWindowControls.enabled) {
this.magicWindowControls.update();
magicWindowAbsoluteEuler.setFromQuaternion(this.magicWindowObject.quaternion, 'YXZ');
if (!this.previousMagicWindowYaw && magicWindowAbsoluteEuler.y !== 0) {
this.previousMagicWindowYaw = magicWindowAbsoluteEuler.y;
}
if (this.previousMagicWindowYaw) {
magicWindowDeltaEuler.x = magicWindowAbsoluteEuler.x;
magicWindowDeltaEuler.y += magicWindowAbsoluteEuler.y - this.previousMagicWindowYaw;
magicWindowDeltaEuler.z = magicWindowAbsoluteEuler.z;
this.previousMagicWindowYaw = magicWindowAbsoluteEuler.y;
}
}
},

/**
* Translate mouse drag into rotation.
*
Expand Down Expand Up @@ -69126,11 +69146,11 @@ module.exports.Component = registerComponent('look-controls', {
* Register mouse down to detect mouse drag.
*/
onMouseDown: function (evt) {
if (!this.data.enabled) { return; }
var sceneEl = this.el.sceneEl;
if (!this.data.enabled || sceneEl.is('vr-mode')) { return; }
// Handle only primary button.
if (evt.button !== 0) { return; }

var sceneEl = this.el.sceneEl;
var canvasEl = sceneEl && sceneEl.canvas;

this.mouseDown = true;
Expand Down Expand Up @@ -69172,7 +69192,9 @@ module.exports.Component = registerComponent('look-controls', {
* Register touch down to detect touch drag.
*/
onTouchStart: function (evt) {
if (evt.touches.length !== 1 || !this.data.touchEnabled) { return; }
if (evt.touches.length !== 1 ||
!this.data.touchEnabled ||
this.el.sceneEl.is('vr-mode')) { return; }
this.touchStart = {
x: evt.touches[0].pageX,
y: evt.touches[0].pageY
Expand Down Expand Up @@ -69216,6 +69238,7 @@ module.exports.Component = registerComponent('look-controls', {
if (!this.el.sceneEl.checkHeadsetConnected()) { return; }
this.saveCameraPose();
this.el.object3D.position.set(0, 0, 0);
this.el.object3D.rotation.set(0, 0, 0);
this.el.object3D.updateMatrix();
},

Expand Down Expand Up @@ -70739,7 +70762,10 @@ module.exports.Component = registerComponent('device-orientation-permission-ui',
}

// Show alert on iPad if Safari is on desktop mode.
if (utils.device.isMobileDeviceRequestingDesktopSite()) { this.showMobileDesktopModeAlert(); }
if (utils.device.isMobileDeviceRequestingDesktopSite()) {
this.showMobileDesktopModeAlert();
return;
}

// Browser doesn't support or doesn't require permission to DeviceOrientationEvent API.
if (typeof DeviceOrientationEvent === 'undefined' || !DeviceOrientationEvent.requestPermission) {
Expand Down Expand Up @@ -80131,7 +80157,7 @@ _dereq_('./core/a-mixin');
_dereq_('./extras/components/');
_dereq_('./extras/primitives/');

console.log('A-Frame Version: 1.0.1 (Date 2019-12-20, Commit #7b1a50f7)');
console.log('A-Frame Version: 1.0.2 (Date 2019-12-23, Commit #52b781c6)');
console.log('three Version (https://github.com/supermedium/three.js):',
pkg.dependencies['super-three']);
console.log('WebVR Polyfill Version:', pkg.dependencies['webvr-polyfill']);
Expand Down Expand Up @@ -84576,4 +84602,4 @@ module.exports = getWakeLock();

},{"./util.js":193}]},{},[153])(153)
});
//# sourceMappingURL=aframe-v1.0.1.js.map
//# sourceMappingURL=aframe-v1.0.2.js.map
10 changes: 5 additions & 5 deletions dist/aframe-v1.0.1.js.map → dist/aframe-v1.0.2.js.map
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 4e78497

Please sign in to comment.