Skip to content

Commit 162aad2

Browse files
committed
docs and examples
1 parent 0b321d7 commit 162aad2

File tree

14 files changed

+42
-38
lines changed

14 files changed

+42
-38
lines changed

README.md

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Super Hands
22

3-
[![Build Status](https://travis-ci.org/wmurphyrd/aframe-super-hands-component.svg?branch=master)](https://travis-ci.org/wmurphyrd/aframe-super-hands-component)
3+
[![Build Status](https://travis-ci.com/wmurphyrd/aframe-super-hands-component.svg?branch=master)](https://travis-ci.com/wmurphyrd/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,9 +56,9 @@ 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/0.8.2/aframe.min.js"></script>
59+
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
6060
<script src="https://cdn.rawgit.com/donmccurdy/aframe-extras/v4.1.2/dist/aframe-extras.min.js"></script>
61-
<script src="https://unpkg.com/[email protected].0/dist/super-hands.min.js"></script>
61+
<script src="https://unpkg.com/super-hands@^3.0.1/dist/super-hands.min.js"></script>
6262
</head>
6363

6464
<body>
@@ -117,6 +117,12 @@ The [examples page](https://wmurphyrd.github.io/aframe-super-hands-component/exa
117117

118118
## News
119119

120+
v3.0.1
121+
122+
* A-Frame 1.0.4 support confirmation
123+
* Updated dependencies and fixed tests
124+
* No notable changes
125+
120126
v3.0.0
121127

122128
* The 'Less is More' update. This package has scope has been narrowed to keep
@@ -155,15 +161,16 @@ v3.0.0
155161

156162
## Compatibility
157163

158-
With `progressive-controls`, `super-hands` can provide interactive controls
164+
With the right configuration, `super-hands` can provide interactive controls
159165
for any device: desktop, mobile ("magic window"), cardboard viewer + button,
160-
Daydream, GearVR, Vive, and Rift + Touch.
166+
3DOF (Daydream, GearVR) and full 6DOF tracked controls (Vive, Oculus Touch, Valve Index, et c).
161167

162168
`super-hands` dependency version compatibility:
163169

164170
| super-hands Version | A-Frame Version | aframe-extras Version | aframe-physics-system Version |
165171
| --- | --- | --- | --- |
166-
| ^v3.0.0 | >=v0.8.2 | ^v4.1.2 | ^v3.1.2 |
172+
| ^v3.0.1 | ^v1.0.4 | ^v6.1.1 | ^v4.0.1 |
173+
| v3.0.0 | ^v0.8.2 | ^v4.1.2 | ^v3.1.2 |
167174
| ^v2.0.0 | v0.6.x | ^v3.11.4 | ^v2.0.0 |
168175

169176
## Core Component

examples/events/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
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/0.8.2/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.0.4/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>
1010
<script src="https://rawgit.com/feiss/aframe-environment-component/master/dist/aframe-environment-component.min.js"></script>

examples/index.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ <h1>A-Frame Super Hands Component</h1>
7272
<img class="preview" src="./assets/physics.jpg"/>
7373
<!-- <div class="bonus"></div> -->
7474
</a>
75-
<p><a href="mouse/index-mouse.html">Mouse cursor based version for desktop</a></p>
75+
<p><a href="physics/index-mouse.html">Mouse cursor based version for desktop</a></p>
7676
<p><ul>
7777
<li>Grabbed boxes lock position and rotation to controller</li>
7878
<li><code>color-randomizer</code> changes the color of entities dropped inside of the color changer box</li>
@@ -119,6 +119,7 @@ <h1>A-Frame Super Hands Component</h1>
119119
colliderEndEventProperty: clearedEls"</pre>
120120
<p>This scene also shows the fallback movement that occurs when physics
121121
is not available.</p>
122+
<!--
122123
<a id="sticky" class="example" href="sticky/">Sticky Grab via
123124
Custom Button Mapping<br />
124125
<img class="preview" src="./assets/sticky.jpg"/>
@@ -130,6 +131,7 @@ <h1>A-Frame Super Hands Component</h1>
130131
<li>Press trackpad to drop the bat</li>
131132
<li>Stretch the balls by pressing both trackpads</li>
132133
</ul>
134+
-->
133135
<!-- GitHub Corner. -->
134136
<a href="https://github.com/wmurphyrd/aframe-super-hands-component" class="github-corner">
135137
<svg width="80" height="80" viewBox="0 0 250 250" style="fill:#222; color:#fff; position: absolute; top: 0; border: 0; right: 0;">

examples/mouse/index-mouse.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
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/0.8.2/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.0.4/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>
1010
<script src="https://rawgit.com/feiss/aframe-environment-component/master/dist/aframe-environment-component.min.js"></script>

examples/mouse/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
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/0.8.2/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.0.4/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>
1010
<script src="https://rawgit.com/feiss/aframe-environment-component/master/dist/aframe-environment-component.min.js"></script>

examples/physics/index-laser.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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/0.8.2/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script> -->
88
<!-- <script src="https://unpkg.com/super-hands/dist/super-hands.min.js"></script> -->
9-
<script src="//cdn.rawgit.com/donmccurdy/aframe-physics-system/v3.1.2/dist/aframe-physics-system.min.js"></script>
9+
<script src="https://cdn.jsdelivr.net/gh/n5ro/aframe-physics-system@v4.0.1/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>
1212
<script src="https://rawgit.com/feiss/aframe-environment-component/master/dist/aframe-environment-component.min.js"></script>

examples/physics/index-mouse.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,6 @@
9292
<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>
9393
</svg>
9494
</a>
95-
<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}}
95+
<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>
9696
</body>
9797
</html>

examples/physics/index.html

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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/0.8.2/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script> -->
88
<!-- <script src="https://unpkg.com/super-hands/dist/super-hands.min.js"></script> -->
9-
<script src="//cdn.rawgit.com/donmccurdy/aframe-physics-system/v3.1.2/dist/aframe-physics-system.min.js"></script>
9+
<script src="https://cdn.jsdelivr.net/gh/n5ro/aframe-physics-system@v4.0.1/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>
1212
<script src="https://rawgit.com/feiss/aframe-environment-component/master/dist/aframe-environment-component.min.js"></script>
@@ -67,14 +67,10 @@
6767
<a-entity>
6868
<a-camera positon="0 1.6 0"></a-camera>
6969
<a-entity id="rhand" mixin="touch"
70-
vive-controls="hand: right"
71-
oculus-touch-controls="hand: right"
72-
windows-motion-controls="hand: right">
70+
hand-controls="hand: right">
7371
</a-entity>
7472
<a-entity id="lhand" mixin="touch"
75-
vive-controls="hand: left"
76-
oculus-touch-controls="hand: left"
77-
windows-motion-controls="hand: left">
73+
hand-controls="hand: left">
7874
</a-entity>
7975
</a-entity>
8076
<a-entity class="cube" mixin="cube" position="0 0.265 -1" material="color: red"></a-entity>
@@ -86,7 +82,7 @@
8682
<a-entity class="transformer" mixin="transformer" position = "0 1.6 -1"
8783
material="src:#colortransform" shadow></a-entity>
8884
<!-- ground collider keeps objets from falling -->
89-
<a-box static-body width=100 height=0.001 depth=100 visible="false"></a-box>
85+
<a-box static-body width="100" height="0.01" depth="100" visible="false"></a-box>
9086
<a-link href="../mouse" title="Basic Example"
9187
static-body="shape: sphere; sphereRadius: 0.25"
9288
image="#portals-preview"
@@ -102,6 +98,6 @@
10298
<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>
10399
</svg>
104100
</a>
105-
<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}}
101+
<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>
106102
</body>
107103
</html>

examples/portals.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
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/0.8.2/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.0.4/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>
1010
<script src="https://cdn.rawgit.com/feiss/aframe-environment-component/a33afd32/dist/aframe-environment-component.min.js"></script>

examples/sticky/index.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
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/0.8.2/aframe.min.js"></script> -->
7+
<!-- <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script> -->
88
<!-- <script src="https://unpkg.com/super-hands/dist/super-hands.min.js"></script> -->
9-
<script src="//cdn.rawgit.com/donmccurdy/aframe-extras/v3.12.4/dist/aframe-extras.min.js"></script>
109
<script src="//cdn.rawgit.com/donmccurdy/aframe-physics-system/v2.0.0/dist/aframe-physics-system.min.js"></script>
1110
<script src="https://unpkg.com/aframe-event-set-component@^4.0.0/dist/aframe-event-set-component.min.js"></script>
1211
<script src="https://rawgit.com/feiss/aframe-environment-component/master/dist/aframe-environment-component.min.js"></script>
@@ -35,16 +34,16 @@
3534
<img id="portals-preview" src="../assets/portals.jpg"></img>
3635
</a-assets>
3736
<a-entity>
38-
<a-entity hand-controls="left" mixin="controller"></a-entity>
39-
<a-entity hand-controls="right" mixin="controller"></a-entity>
37+
<a-entity hand-controls="hand: left" mixin="controller"></a-entity>
38+
<a-entity hand-controls="hand: right" mixin="controller"></a-entity>
4039
</a-entity>
4140
<a-entity class="ball" mixin="ball" position="0 0.45 -1" material="color: red"></a-entity>
4241
<a-entity class="ball" mixin="ball" position="0 0.45 1" material="color: red"></a-entity>
4342
<a-entity class="ball" mixin="ball" position="-1 0.45 -1" material="color: blue"></a-entity>
4443
<a-entity class="ball" mixin="ball" position="-1 0.45 1" material="color: blue"></a-entity>
4544
<a-entity class="ball" mixin="ball" position="1 0.45 -1" material="color: green"></a-entity>
4645
<a-entity class="ball" mixin="ball" position="1 0.45 1" material="color: green"></a-entity>
47-
<a-cone id="stick" mixin="bat" position="0 0.5 0" height="1" dynamic-body
46+
<a-cone id="stick" mixin="bat" position="0 1 0" height="1" dynamic-body
4847
rotation="0 0 -90" radius-top="0.03" radius-bottom="0.02" >
4948
</a-cone>
5049
<a-box mixin="floor" rotation="-90 0 0" position="0 0.01 0"></a-box>
@@ -66,6 +65,6 @@
6665
<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>
6766
</svg>
6867
</a>
69-
<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}}
68+
<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>
7069
</body>
7170
</html>

0 commit comments

Comments
 (0)