Skip to content

Commit aa8905b

Browse files
AdaRoseCannonAdaRoseCannon
committed
Merge branch 'master' of https://github.com/aframevr/aframe into ar-hit-test
2 parents c40f4d2 + 63ba0ce commit aa8905b

File tree

9 files changed

+32
-28
lines changed

9 files changed

+32
-28
lines changed

‎dist/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ script below from the [jsdelivr CDN](https://www.jsdelivr.com/):
88
```html
99
<html>
1010
<head>
11-
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@1c91156f58974db40fa9f542bb959fb73fe1970f/dist/aframe-master.min.js"></script>
11+
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@a6886d5070b1d19c5b8682ed51eff8086b2849be/dist/aframe-master.min.js"></script>
1212
</head>
1313
<body>
1414
<a-scene>

‎dist/aframe-master.js‎

Lines changed: 4 additions & 2 deletions
Large diffs are not rendered by default.

‎dist/aframe-master.js.map‎

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

‎dist/aframe-master.min.js‎

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎dist/aframe-master.min.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/boilerplate/webxr-ar-lighting/index.html‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,6 @@
1010
body {
1111
font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
1212
}
13-
14-
#dom-overlay {
15-
overflow: hidden;
16-
position: absolute;
17-
pointer-events: none;
18-
box-sizing: border-box;
19-
bottom: 0;
20-
left: 0;
21-
right: 0;
22-
top: 0;
23-
padding: 1em;
24-
}
25-
26-
#dom-overlay>* {
27-
pointer-events: auto;
28-
}
2913
</style>
3014
</head>
3115

‎src/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ require('./core/a-mixin');
9090
require('./extras/components/');
9191
require('./extras/primitives/');
9292

93-
console.log('A-Frame Version: 1.2.0 (Date 2021-07-29, Commit #6fa0ea94)');
93+
console.log('A-Frame Version: 1.2.0 (Date 2021-08-11, Commit #6433499d)');
9494
console.log('THREE Version (https://github.com/supermedium/three.js):',
9595
pkg.dependencies['super-three']);
9696
console.log('WebVR Polyfill Version:', pkg.dependencies['webvr-polyfill']);

‎src/style/aframe.css‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,3 +396,19 @@ a-scene audio {
396396
background-color: #00ceff;
397397
width: 100%;
398398
}
399+
400+
.a-dom-overlay:not(.a-no-style) {
401+
overflow: hidden;
402+
position: absolute;
403+
pointer-events: none;
404+
box-sizing: border-box;
405+
bottom: 0;
406+
left: 0;
407+
right: 0;
408+
top: 0;
409+
padding: 1em;
410+
}
411+
412+
.a-dom-overlay:not(.a-no-style)>* {
413+
pointer-events: auto;
414+
}

‎src/systems/webxr.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ module.exports.System = registerSystem('webxr', {
2222
};
2323
this.sessionReferenceSpaceType = data.referenceSpaceType;
2424

25+
data.overlayElement.classList.remove('a-dom-overlay');
2526
if (data.overlayElement) {
2627
this.warnIfFeatureNotRequested('dom-overlay');
2728
this.sessionConfiguration.domOverlay = {root: data.overlayElement};
29+
data.overlayElement.classList.add('a-dom-overlay');
2830
}
2931
},
3032

0 commit comments

Comments
 (0)