Skip to content

Commit f12bffa

Browse files
wmurphyrdwmurphyrd
authored
Merge pull request #227 from wmurphyrd/aframe-140
Aframe 140 compat
2 parents 99aa099 + 3d89ae4 commit f12bffa

23 files changed

+3315
-3676
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ addons:
55
services:
66
- xvfb
77
node_js:
8-
- '12.16.2'
9-
8+
- '14.21.1'
9+
install: travis_wait 20 npm ci
1010
script:
1111
- $CI_ACTION
1212

‎README.md‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Install and use by directly by including the [browser files](dist):
5656
```html
5757
<head>
5858
<title>Most Basic Super-Hands Example</title>
59-
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
59+
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
6060
<script src="https://cdn.jsdelivr.net/gh/donmccurdy/[email protected]/dist/aframe-extras.misc.min.js"></script>
6161
<script src="https://unpkg.com/super-hands@^3.0.3/dist/super-hands.min.js"></script>
6262
</head>
@@ -116,42 +116,11 @@ The [examples page](https://wmurphyrd.github.io/aframe-super-hands-component/exa
116116

117117
## News
118118

119-
v3.0.3
120-
* A-Frame 1.3.0 support confirmation
119+
v3.0.4
120+
* A-Frame 1.4.0 support confirmation
121121
* Updated dependencies and fixed tests and examples
122122
* No API changes
123123

124-
v3.0.1
125-
126-
* A-Frame 1.0.4 support confirmation
127-
* Updated dependencies and fixed tests
128-
* No notable changes
129-
130-
v3.0.0
131-
132-
* The 'Less is More' update. This package has scope has been narrowed to keep
133-
it maintainable, increase the frequency of updates, and allow for focus on
134-
implementing new gestures instead of peripheral components.
135-
* `progressive-controls` and `a-locomotor` removed from this repo.
136-
I understand `progressive-controls` was fairly popular, but is has a
137-
[compatibility issue](https://github.com/aframevr/aframe/issues/3610)
138-
with the latest A-Frame which was holding up releases for the entire
139-
package.
140-
I intend to refactor it and release it in another library, but you can
141-
still use the last version by including
142-
[its source file](https://github.com/wmurphyrd/aframe-super-hands-component/blob/dc1a601b7fa9d606a05ec2d3500f8f141c65c20c/misc_components/progressive-controls.js) in your project.
143-
* Smarter raycasting support: chooses nearest intersected entity first,
144-
reordering stack as distances change (\* if the raycaster in use updates
145-
intersection objects' distances)
146-
* Improved nested entity handling: only one component can react to each
147-
gesture event.
148-
* Improved stretching of complex physics bodies: all shapes, child entity
149-
shapes, and offsets are updated
150-
* Added support for `'worker'` and other `aframe-physics-system` drivers
151-
in `grabbable`
152-
* v2.x deprecations removed: `drag-droppable` component and
153-
`super-hands.colliderState` property.
154-
155124
[Previous news](news.md)
156125

157126
### Known Issues
@@ -171,9 +140,10 @@ for any device: desktop, mobile ("magic window"), cardboard viewer + button,
171140

172141
`super-hands` dependency version compatibility:
173142

174-
| super-hands Version | A-Frame Version | aframe-extras Version | aframe-physics-system Version |
143+
| super-hands Version | A-Frame Version | aframe-extras Version | @c-frame/aframe-physics-system Version |
175144
| --- | --- | --- | --- |
176-
| ^v3.0.3 | ^v1.3.0 | ^v6.1.1 | github:n5ro/aframe-physics-system#59100ac8 (last npm version cannot be installed) |
145+
| ^v3.0.4 | ^v1.4.0 | ^v6.1.1 | ^v4.1.0 |
146+
| ^v3.0.3 | ^v1.3.0 | ^v6.1.1 | ^v4.1.0 |
177147
| ^v3.0.2 | ^v1.0.4 | ^v6.1.1 | ^v4.0.1 |
178148
| v3.0.0 | ^v0.8.2 | ^v4.1.2 | ^v3.1.2 |
179149

‎examples/events/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<!-- Replace "../build.js" with the super-hands and
55
A-Frame distributions to run : -->
66
<script src="../build.js"></script>
7-
<!-- <script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> -->
88
<!-- <script src="https://unpkg.com/super-hands/dist/super-hands.min.js"></script> -->
99
<script src="//cdn.rawgit.com/donmccurdy/aframe-extras/v3.12.4/dist/aframe-extras.min.js"></script>
10-
<script src="https://unpkg.com/[email protected].1/dist/aframe-environment-component.min.js"></script>
10+
<script src="https://unpkg.com/[email protected].2/dist/aframe-environment-component.min.js"></script>
1111
<script>
1212
function randomizeColor (target) {
1313
target.setAttribute('color','#'+Math.random().toString(16).substr(-6));

‎examples/main.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
require('aframe')
2-
// fill in for outdated physics system dependencies
3-
require('super-three/examples/js/deprecated/Geometry.js')
42
require('../index.js')
53
// require('aframe-motion-capture-components')
64
/* used in examples to allow a desktop playback without HMD

‎examples/mouse/index-mouse.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<!-- Replace "../build.js" with the super-hands and
55
A-Frame distributions to run : -->
66
<script src="../build.js"></script>
7-
<!-- <script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> -->
88
<!-- <script src="https://unpkg.com/super-hands/dist/super-hands.min.js"></script> -->
99
<script src="https://unpkg.com/aframe-event-set-component@^5.0.0/dist/aframe-event-set-component.min.js"></script>
10-
<script src="https://unpkg.com/[email protected].1/dist/aframe-environment-component.min.js"></script>
10+
<script src="https://unpkg.com/[email protected].2/dist/aframe-environment-component.min.js"></script>
1111
<link rel="stylesheet" type="text/css" href="../assets/examples.css">
1212
</head>
1313
<body>
@@ -53,6 +53,6 @@
5353
<path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path>
5454
</svg>
5555
</a>
56-
<style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}
56+
<style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
5757
</body>
5858
</html>

‎examples/mouse/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<!-- Replace "../build.js" with the super-hands and
55
A-Frame distributions to run : -->
66
<script src="../build.js"></script>
7-
<!-- <script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> -->
88
<!-- <script src="https://unpkg.com/super-hands/dist/super-hands.min.js"></script> -->
99
<script src="https://unpkg.com/aframe-event-set-component@^4.0.0/dist/aframe-event-set-component.min.js"></script>
10-
<script src="https://unpkg.com/[email protected].1/dist/aframe-environment-component.min.js"></script>
10+
<script src="https://unpkg.com/[email protected].2/dist/aframe-environment-component.min.js"></script>
1111
<link rel="stylesheet" type="text/css" href="../assets/examples.css">
1212
</head>
1313
<body>

‎examples/physics/index-laser.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<!-- Replace "../build.js" with the super-hands and
55
A-Frame distributions to run : -->
66
<script src="../build.js"></script>
7-
<!-- <script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> -->
88
<!-- <script src="https://unpkg.com/super-hands/dist/super-hands.min.js"></script> -->
9-
<script src="https://cdn.jsdelivr.net/gh/n5ro/aframe-physics-system@v4.0.1/dist/aframe-physics-system.js"></script>
9+
<script src="https://cdn.jsdelivr.net/gh/c-frame/aframe-physics-system@v4.1.0/dist/aframe-physics-system.js"></script>
1010
<script src="https://unpkg.com/aframe-event-set-component@^4.1.1/dist/aframe-event-set-component.min.js"></script>
1111
<script src="https://unpkg.com/aframe-physics-extras/dist/aframe-physics-extras.min.js"></script>
12-
<script src="https://unpkg.com/[email protected].1/dist/aframe-environment-component.min.js"></script>
12+
<script src="https://unpkg.com/[email protected].2/dist/aframe-environment-component.min.js"></script>
1313
<script>
1414
//color randomizer
1515
AFRAME.registerComponent('color-randomizer', {

‎examples/physics/index-mouse.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<!-- Replace "../build.js" with the super-hands and
55
A-Frame distributions to run : -->
66
<script src="../build.js"></script>
7-
<!-- <script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> -->
88
<!-- <script src="https://unpkg.com/super-hands/dist/super-hands.min.js"></script> -->
9-
<script src="https://cdn.jsdelivr.net/gh/n5ro/aframe-physics-system@v4.0.1/dist/aframe-physics-system.js"></script>
9+
<script src="https://cdn.jsdelivr.net/gh/c-frame/aframe-physics-system@v4.1.0/dist/aframe-physics-system.js"></script>
1010
<script src="https://unpkg.com/aframe-event-set-component@^4.1.1/dist/aframe-event-set-component.min.js"></script>
1111
<!-- <script src="https://unpkg.com/aframe-physics-extras/dist/aframe-physics-extras.min.js"></script> -->
12-
<script src="https://unpkg.com/[email protected].1/dist/aframe-environment-component.min.js"></script>
12+
<script src="https://unpkg.com/[email protected].2/dist/aframe-environment-component.min.js"></script>
1313
<script>
1414
//color randomizer
1515
AFRAME.registerComponent('color-randomizer', {

‎examples/physics/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<!-- Replace "../build.js" with the super-hands and
55
A-Frame distributions to run : -->
66
<script src="../build.js"></script>
7-
<!-- <script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> -->
88
<!-- <script src="https://unpkg.com/super-hands/dist/super-hands.min.js"></script> -->
9-
<script src="https://cdn.jsdelivr.net/gh/n5ro/aframe-physics-system@v4.0.1/dist/aframe-physics-system.js"></script>
9+
<script src="https://cdn.jsdelivr.net/gh/c-frame/aframe-physics-system@v4.1.0/dist/aframe-physics-system.js"></script>
1010
<script src="https://unpkg.com/aframe-event-set-component@^4.1.1/dist/aframe-event-set-component.min.js"></script>
1111
<script src="https://unpkg.com/aframe-physics-extras/dist/aframe-physics-extras.min.js"></script>
12-
<script src="https://unpkg.com/[email protected].1/dist/aframe-environment-component.min.js"></script>
12+
<script src="https://unpkg.com/[email protected].2/dist/aframe-environment-component.min.js"></script>
1313
<script>
1414
//color randomizer
1515
AFRAME.registerComponent('color-randomizer', {

‎examples/portals.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<!-- Replace "../build.js" with the super-hands and
55
A-Frame distributions to run : -->
66
<script src="./build.js"></script>
7-
<!-- <script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script> -->
88
<!-- <script src="https://unpkg.com/super-hands/dist/super-hands.min.js"></script> -->
99
<script src="//cdn.rawgit.com/donmccurdy/aframe-extras/v3.12.4/dist/aframe-extras.min.js"></script>
10-
<script src="https://cdn.rawgit.com/feiss/aframe-environment-component/a33afd32/dist/aframe-environment-component.min.js"></script>
10+
<script src="https://unpkg.com/aframe-environment-component@1.3.2/dist/aframe-environment-component.min.js"></script>
1111
<script src="https://unpkg.com/aframe-event-set-component@^4.0.0/dist/aframe-event-set-component.min.js"></script>
1212
</head>
1313
<body>
@@ -67,6 +67,6 @@
6767
<path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path>
6868
</svg>
6969
</a>
70-
<style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}
70+
<style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
7171
</body>
7272
</html>

0 commit comments

Comments
 (0)