Skip to content

Commit 1987ee5

Browse files
committed
Merge branch 'master' of github.com:leapmotion-examples/javascript
2 parents 82c7b83 + 54f980c commit 1987ee5

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

v2/oculus/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
Move lights around a THREE.js scene.
1+
Move lights around a THREE.js VR scene
2+
======================================
23

34
Right now, only one light can be controlled. A few things could be explored next:
45
- Manipulate different objects, by focusing the closest one on pinch.
56
- For handling close objects in constrained situations, use the mouse to select an object, and the hand to move it.
67
<br/>This could be used also to manipulate different aspects of an object independently - such as rotation.
78

89

9-
Recording made with the LeapJS [Recorder](http://developer.leapmotion.com/recorder).
10+
Recording made with the LeapJS [Recorder](http://developer.leapmotion.com/recorder).

v2/oculus/index.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<script src="//js.leapmotion.com/leap-0.6.2.min.js"></script>
99
<script src="//js.leapmotion.com/leap-plugins-0.1.7.min.js"></script>
1010
<script src="//js.leapmotion.com/leap.rigged-hand-0.1.5.min.js"></script>
11-
11+
<!-- Slightly modified version of OculusRiftEffect.js from THREE.js to target for DK2 -->
1212
<script type="text/javascript" src="javascript/OculusRiftEffect.js"></script>
1313

1414
<style>
@@ -32,7 +32,8 @@
3232

3333
<div class="info">
3434
<p>
35-
Designed to be used with a Oculus-mounted Leap Device. <a href="#" onclick="goFullScreen();">GO FULLSCREEN</a>
35+
Designed to be used with a Oculus-mounted Leap Device.
36+
<a href="#" onclick="goFullScreen();">GO FULLSCREEN</a>
3637
</p>
3738
<script>
3839
function goFullScreen(){
@@ -59,4 +60,4 @@
5960
</body>
6061
<script src="javascript/scene.js"></script>
6162
<script src="javascript/controller.js"></script>
62-
</html>
63+
</html>

0 commit comments

Comments
 (0)