Skip to content

Commit 988133b

Browse files
wmurphyrdwmurphyrd
committed
Merge branch 'master' of github.com:wmurphyrd/aframe-super-hands-component into ammo-pr
2 parents 7e18404 + 1e68a32 commit 988133b

29 files changed

+3476
-5651
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: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Super Hands
22

3-
[![Build Status](https://travis-ci.com/wmurphyrd/aframe-super-hands-component.svg?branch=master)](https://travis-ci.com/wmurphyrd/aframe-super-hands-component)
3+
[![Build Status](https://travis-ci.com/c-frame/aframe-super-hands-component.svg?branch=master)](https://travis-ci.com/c-frame/aframe-super-hands-component)
44
[![npm Dowloads](https://img.shields.io/npm/dt/super-hands.svg?style=flat-square)](https://www.npmjs.com/package/super-hands)
55
[![npm Version](http://img.shields.io/npm/v/super-hands.svg?style=flat-square)](https://www.npmjs.com/package/super-hands)
66
[![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
@@ -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>
@@ -70,7 +70,7 @@ Install and use by directly by including the [browser files](dist):
7070
<a-entity sphere-collider="objects: a-box" super-hands hand-controls="hand: right"></a-entity>
7171
</a-entity>
7272
<!-- hover & drag-drop won't have any obvious effect without some additional event handlers or components. See the examples page for more -->
73-
<a-box hoverable grabbable stretchable draggable dropppable color="blue" position="0 0 -1"></a-box>
73+
<a-box hoverable grabbable stretchable draggable droppable color="blue" position="0 0 -1"></a-box>
7474
</a-scene>
7575
</body>
7676
```
@@ -107,51 +107,20 @@ require('super-hands');
107107

108108
## Examples
109109

110-
The [examples page](https://wmurphyrd.github.io/aframe-super-hands-component/examples/) showcases a variety of configurations and use cases for `super-hands`.
110+
The [examples page](https://c-frame.github.io/aframe-super-hands-component/examples/) showcases a variety of configurations and use cases for `super-hands`.
111111

112112
| Example Scene | Description | Target VR Devices |
113113
| --- | --- | --- |
114-
| [Hand controllers with physics](https://wmurphyrd.github.io/aframe-super-hands-component/examples/#physics) | Grab, stretch, and drag-drop cubes with simulated physical behavior in roomscale VR | Vive, Rift, Windows MR |
115-
| [Gaze and laser pointer controls without physics](https://wmurphyrd.github.io/aframe-super-hands-component/examples/#mouse) | Showcase fallback controls used for simpler VR devices and fallback interactivity without physics simulation | Desktop, mobile, cardboard, Gear VR, Daydream, Vive, Rift, Windows MR |
114+
| [Hand controllers with physics](https://c-frame.github.io/aframe-super-hands-component/examples/#physics) | Grab, stretch, and drag-drop cubes with simulated physical behavior in roomscale VR | Vive, Rift, Windows MR |
115+
| [Gaze and laser pointer controls without physics](https://c-frame.github.io/aframe-super-hands-component/examples/#mouse) | Showcase fallback controls used for simpler VR devices and fallback interactivity without physics simulation | Desktop, mobile, cardboard, Gear VR, Daydream, Vive, Rift, Windows MR |
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

@@ -256,7 +226,7 @@ In addition to the A-Frame style gesture events,
256226
interactions to be emitted by the target entities. This allows the use of these
257227
common Global Event Handler properties on entities to add reaction directly
258228
in the HTML. View the
259-
[related example](https://wmurphyrd.github.io/aframe-super-hands-component/examples/#events)
229+
[related example](https://c-frame.github.io/aframe-super-hands-component/examples/#events)
260230
to see this in use.
261231

262232
| entity HTML attribute | conditions | event.relatedTarget |

0 commit comments

Comments
 (0)