Skip to content

Commit fdc2a3f

Browse files
s-lights-light
committed
Merge branch 'master' into fix_maxCanvas_embedded
2 parents 5af1ac7 + ec0d4d8 commit fdc2a3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1745
-1203
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ AR, hand tracking, compositor layers, immersive navigation (Quest only), Quest 2
8585
* Make msdf shader WebGL 2 compliant @arpu
8686
* Valve Index controller support @zach-capalbo
8787
* Cordova compatibility @benallfree
88-
* Change [look-controls](https://aframe.io/docs/1.0.0/components/look-controls.html#sidebar) `hmdEnable` property name to `magicWindowTrackingEnabled` @dmarcos
88+
* Change [look-controls](https://aframe.io/docs/1.0.0/components/look-controls.html#sidebar) `hmdEnabled` property name to `magicWindowTrackingEnabled` @dmarcos
8989
* Improve hand tracking pinch gesture accuracy @cesmoak (#4691)
9090
* Improve error handling when entering immersive mode (#4660) @federico-camonapp @dmarcos
9191
* Make text of [device permission ui component](https://aframe.io/docs/1.0.0/components/device-orientation-permission-ui.html#sidebar) dialogs configurable @dmarcos

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[slack]: https://aframe.io/slack-invite/
1+
[slack]: https://aframevr.slack.com/join/shared_invite/zt-f6rne3ly-ekVaBU~Xu~fsZHXr56jacQ
22
[stackoverflow]: http://stackoverflow.com/questions/tagged/aframe
33

44
Interested in contributing? As an open source project, we'd appreciate any help

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
—
2828
<a href="https://aframe.io/school/">School</a>
2929
&mdash;
30-
<a href="https://aframe.io/slack-invite/">Slack</a>
30+
<a href="https://aframevr.slack.com/join/shared_invite/zt-f6rne3ly-ekVaBU~Xu~fsZHXr56jacQ">Slack</a>
3131
&mdash;
3232
<a href="https://aframe.io/blog/">Blog</a>
3333
&mdash;
@@ -210,7 +210,7 @@ For questions and support, [ask on StackOverflow](https://stackoverflow.com/ques
210210

211211
## Stay in Touch
212212

213-
- To hang out with the community, [join the A-Frame Slack](https://aframe.io/slack-invite/).
213+
- To hang out with the community, [join the A-Frame Slack](https://aframevr.slack.com/join/shared_invite/zt-f6rne3ly-ekVaBU~Xu~fsZHXr56jacQ).
214214
- [Follow `A Week of A-Frame` on the A-Frame blog](https://aframe.io/blog).
215215
- [Follow @aframevr on Twitter](https://twitter.com/aframevr).
216216
- [Subscribe to the Newsletter](https://aframe.io/subscribe/).
@@ -225,7 +225,7 @@ And get in touch with the maintainers!
225225

226226
Get involved! Check out the [Contributing Guide](CONTRIBUTING.md) for how to get started.
227227

228-
You can also support development by [buying a gorgeous A-Frame t-shirt with exclusive designs](https://teespring.com/stores/aframe)
228+
You can also support development by [buying a gorgeous A-Frame t-shirt with exclusive designs](https://cottonbureau.com/products/a-frame-og#/9479538/tee-men-standard-tee-vintage-black-tri-blend-s)
229229

230230
## License
231231

‎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@b7a2d32d744d5c3868b1afaf9bd59e2d7b6bdfa5/dist/aframe-master.min.js"></script>
11+
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@72dc8cde5dd20d1e4402ff6b2005b8b45e168569/dist/aframe-master.min.js"></script>
1212
</head>
1313
<body>
1414
<a-scene>

‎dist/aframe-master.js‎

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

‎dist/aframe-master.js.map‎

Lines changed: 24 additions & 20 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: 177 additions & 170 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.

‎docs/components/ar-hit-test.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
title: hit-test
2+
title: ar-hit-test
33
type: components
44
layout: docs
55
parent_section: components
6-
source_code: src/components/hit-test.js
6+
source_code: src/components/ar-hit-test.js
77
examples: []
88
---
99

@@ -33,6 +33,7 @@ You can toggle this component's enabled state to not do any interactions until y
3333
| src | Image to use for the reticle | See: Assets |
3434
| type | 'footprint' or 'map' footprint is the shape of the model | "footprint" |
3535
| footprintDepth | Amount of the model used for the footprint, 1 is full height | 0.1 |
36+
| mapSize | If no target is set then this is the size of the map | 0.5 0.5 |
3637

3738
## Events
3839

‎docs/components/background.md‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,12 @@ frustum culling issues when `a-sky` is further than the far plane of the
1313
camera. There are no unexpected occlusions either with far objects that might
1414
be behind of the sphere geometry of `a-sky`.
1515

16-
The background component can also generate a default environment cube map for all
17-
materials, this is useful in case you find GLB models end up too dark or reflective
18-
materials don't look right because they are not reflecting the environment this
19-
will provide a default reflective environment.
20-
21-
## Scene Lighting and Lighting Estimation
22-
23-
The background component will ensure that an environment map is generated from your surroundings using WebXR
24-
Lighting estimation in Augmented Reality if it is available.
25-
26-
It will also create lights to match the lighting of the real world. So you should turn off any scene lights when the user enters AR using the `hide-on-enter-ar` component.
27-
28-
These lights are a `directional` and a `probe` light. If your scene makes use of shadows
29-
from a directional light you can provide this as the `directionalLight` property and it
30-
will control that light instead of making it's own one. Once the user leaves AR this
31-
light may have a different color, intensity and position than when they entered AR as it has been
32-
altered by the lighting estimation.
33-
3416
## Example
3517

3618
The example below sets the background color to red and use lighting estimation for AR.
3719

3820
```html
39-
<a-scene webxr="optionalFeatures: light-estimation;" background="color: red"></a-scene>
21+
<a-scene background="color: red"></a-scene>
4022
```
4123

4224
## Properties
@@ -45,6 +27,3 @@ The example below sets the background color to red and use lighting estimation f
4527
|----------------------------|-----------------------------------------------------------|-----------------|
4628
| color | Color of the scene background. | black |
4729
| transparent | Background is transparent. The color property is ignored. | false |
48-
| generateEnvironment | Whether to generate a default environment. | true |
49-
| environmentUpdateFrequency | How often to update the environment in seconds, 0 is off. | 0 |
50-
| directionalLight | Use an existing light for the AR lighting | null |

0 commit comments

Comments
 (0)