|
@@ -25,7 +25,6 @@
|
|
|
|
|
|
<script src="js/vr/DaydreamController.js"></script>
|
|
|
<script src="js/vr/WebVR.js"></script>
|
|
|
- <script src="js/vr/WebVRCamera.js"></script>
|
|
|
|
|
|
<script>
|
|
|
|
|
@@ -41,14 +40,13 @@
|
|
|
|
|
|
var container;
|
|
|
var camera, scene, ray, raycaster, renderer;
|
|
|
- var gamepad, vrdisplay;
|
|
|
+ var gamepad;
|
|
|
|
|
|
var room;
|
|
|
|
|
|
var INTERSECTED;
|
|
|
|
|
|
init();
|
|
|
- animate();
|
|
|
|
|
|
function init() {
|
|
|
|
|
@@ -119,18 +117,15 @@
|
|
|
renderer.sortObjects = false;
|
|
|
container.appendChild( renderer.domElement );
|
|
|
|
|
|
- //
|
|
|
-
|
|
|
- WEBVR.getVRDisplay( function ( display ) {
|
|
|
-
|
|
|
- if ( display !== undefined ) {
|
|
|
+ renderer.vr.enabled = true;
|
|
|
+ renderer.animate( update );
|
|
|
|
|
|
- vrdisplay = display;
|
|
|
- camera = new THREE.WebVRCamera( display, renderer );
|
|
|
+ //
|
|
|
|
|
|
- }
|
|
|
+ WEBVR.getVRDisplay( function ( device ) {
|
|
|
|
|
|
- document.body.appendChild( WEBVR.getButton( display, renderer.domElement ) );
|
|
|
+ renderer.vr.setDevice( device );
|
|
|
+ document.body.appendChild( WEBVR.getButton( device, renderer.domElement ) );
|
|
|
|
|
|
} );
|
|
|
|
|
@@ -169,13 +164,11 @@
|
|
|
|
|
|
//
|
|
|
|
|
|
- function animate() {
|
|
|
+ function update() {
|
|
|
|
|
|
gamepad.update();
|
|
|
render();
|
|
|
|
|
|
- ( vrdisplay ? vrdisplay : window ).requestAnimationFrame( animate );
|
|
|
-
|
|
|
}
|
|
|
|
|
|
function render() {
|