diff --git a/examples/webvr_cubes.html b/examples/webvr_cubes.html
index f63ce1aaa45b47bc422f7397e6b3a485dcb29890..fe1c10ecb2e282a60a07d087c4be043f8bc407ed 100644
--- a/examples/webvr_cubes.html
+++ b/examples/webvr_cubes.html
@@ -23,8 +23,6 @@
-
-
-
-
-
-
diff --git a/examples/webvr_sandbox.html b/examples/webvr_sandbox.html
index 33db54171f884317fd1ee2130030f0b4c21c8dd4..0abcfe75c71467a3413fd6b9e10b422c83cf1eca 100644
--- a/examples/webvr_sandbox.html
+++ b/examples/webvr_sandbox.html
@@ -17,8 +17,6 @@
-
-
@@ -34,7 +32,6 @@
//
var camera, scene, renderer;
- var effect, controls;
var mirror;
@@ -114,13 +111,14 @@
renderer.shadowMap.enabled = true;
document.body.appendChild( renderer.domElement );
- //
+ renderer.vr.enabled = true;
- controls = new THREE.VRControls( camera );
- effect = new THREE.VREffect( renderer );
+ //
WEBVR.getVRDisplay( function ( display ) {
+ renderer.vr.setDevice( display );
+
document.body.appendChild( WEBVR.getButton( display, renderer.domElement ) );
} );
@@ -136,14 +134,13 @@
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
- effect.setSize( window.innerWidth, window.innerHeight );
+ renderer.setSize( window.innerWidth, window.innerHeight );
}
function animate() {
- effect.requestAnimationFrame( animate );
- render();
+ renderer.animate( render );
}
@@ -154,9 +151,7 @@
mesh.rotation.x = time * 2;
mesh.rotation.y = time * 5;
- controls.update();
-
- effect.render( scene, camera );
+ renderer.render( scene, camera );
}
diff --git a/examples/webvr_video.html b/examples/webvr_video.html
index e0d2d42f4ae412d8b4c0e61e3dc528096eaa1585..a1e4490087adde11e5236c2083ec0a19679182ad 100644
--- a/examples/webvr_video.html
+++ b/examples/webvr_video.html
@@ -34,8 +34,6 @@
-
-
-
-
@@ -42,7 +40,6 @@
var container;
var camera, scene, renderer;
- var effect, controls;
var controller1, controller2;
var room;
@@ -165,17 +162,17 @@
renderer.sortObjects = false;
container.appendChild( renderer.domElement );
- controls = new THREE.VRControls( camera );
- controls.standing = true;
+ renderer.vr.enabled = true;
+ renderer.vr.standing = true;
// controllers
controller1 = new THREE.ViveController( 0 );
- controller1.standingMatrix = controls.getStandingMatrix();
+ controller1.standingMatrix = renderer.vr.getStandingMatrix();
scene.add( controller1 );
controller2 = new THREE.ViveController( 1 );
- controller2.standingMatrix = controls.getStandingMatrix();
+ controller2.standingMatrix = renderer.vr.getStandingMatrix();
scene.add( controller2 );
var loader = new THREE.OBJLoader();
@@ -194,10 +191,10 @@
} );
- effect = new THREE.VREffect( renderer );
-
WEBVR.getVRDisplay( function ( display ) {
+ renderer.vr.setDevice( display );
+
document.body.appendChild( WEBVR.getButton( display, renderer.domElement ) );
} );
@@ -213,19 +210,18 @@
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
- effect.setSize( window.innerWidth, window.innerHeight );
+ renderer.setSize( window.innerWidth, window.innerHeight );
}
- //
-
function animate() {
- effect.requestAnimationFrame( animate );
- render();
+ renderer.animate( render );
}
+ //
+
function render() {
var delta = clock.getDelta() * 60;
@@ -233,8 +229,6 @@
controller1.update();
controller2.update();
- controls.update();
-
for ( var i = 0; i < room.children.length; i ++ ) {
var cube = room.children[ i ];
@@ -268,7 +262,7 @@
}
- effect.render( scene, camera );
+ renderer.render( scene, camera );
}
diff --git a/examples/webvr_vive_camerarig.html b/examples/webvr_vive_camerarig.html
index dad7c0b8fb6a7fb267eac27ffc42411fc471ff09..93511c6dc54fcd79c8aefbf1db76183380c749c0 100644
--- a/examples/webvr_vive_camerarig.html
+++ b/examples/webvr_vive_camerarig.html
@@ -21,8 +21,6 @@
-
-
@@ -42,7 +40,6 @@
var container;
var cameraRig, camera, scene, renderer;
- var effect, controls;
var controller1, controller2;
var scale = 1;
var dragging = {
@@ -174,19 +171,19 @@
renderer.sortObjects = false;
container.appendChild( renderer.domElement );
- controls = new THREE.VRControls( camera );
- controls.standing = true;
+ renderer.vr.enabled = true;
+ renderer.vr.standing = true;
// controllers
controller1 = new THREE.ViveController( 0 );
- controller1.standingMatrix = controls.getStandingMatrix();
+ controller1.standingMatrix = renderer.vr.getStandingMatrix();
controller1.addEventListener( 'triggerdown', onTriggerDown );
controller1.addEventListener( 'triggerup', onTriggerUp );
cameraRig.add( controller1 );
controller2 = new THREE.ViveController( 1 );
- controller2.standingMatrix = controls.getStandingMatrix();
+ controller2.standingMatrix = renderer.vr.getStandingMatrix();
controller2.addEventListener( 'triggerdown', onTriggerDown );
controller2.addEventListener( 'triggerup', onTriggerUp );
cameraRig.add( controller2 );
@@ -207,10 +204,10 @@
} );
- effect = new THREE.VREffect( renderer );
-
WEBVR.getVRDisplay( function ( display ) {
+ renderer.vr.setDevice( display );
+
document.body.appendChild( WEBVR.getButton( display, renderer.domElement ) );
} );
@@ -226,7 +223,7 @@
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
- effect.setSize( window.innerWidth, window.innerHeight );
+ renderer.setSize( window.innerWidth, window.innerHeight );
}
@@ -234,8 +231,7 @@
function animate() {
- effect.requestAnimationFrame( animate );
- render();
+ renderer.animate( render );
}
@@ -246,8 +242,6 @@
controller1.update();
controller2.update();
- controls.update();
-
scaleUpdate();
for ( var i = 0; i < room.children.length; i ++ ) {
@@ -283,7 +277,7 @@
}
- effect.render( scene, camera );
+ renderer.render( scene, camera );
}
diff --git a/examples/webvr_vive_dragging.html b/examples/webvr_vive_dragging.html
index 27277759d36885d1eacd81885f397634329bcf1a..fb9e188e1cc0e12863b5a391cb7c6f4ad7adafcc 100644
--- a/examples/webvr_vive_dragging.html
+++ b/examples/webvr_vive_dragging.html
@@ -21,8 +21,6 @@
-
-
@@ -40,7 +38,6 @@
var container;
var camera, scene, renderer;
- var effect, controls;
var controller1, controller2;
var raycaster, intersected = [];
@@ -142,19 +139,19 @@
renderer.gammaOutput = true;
container.appendChild( renderer.domElement );
- controls = new THREE.VRControls( camera );
- controls.standing = true;
+ renderer.vr.enabled = true;
+ renderer.vr.standing = true;
// controllers
controller1 = new THREE.ViveController( 0 );
- controller1.standingMatrix = controls.getStandingMatrix();
+ controller1.standingMatrix = renderer.vr.getStandingMatrix();
controller1.addEventListener( 'triggerdown', onTriggerDown );
controller1.addEventListener( 'triggerup', onTriggerUp );
scene.add( controller1 );
controller2 = new THREE.ViveController( 1 );
- controller2.standingMatrix = controls.getStandingMatrix();
+ controller2.standingMatrix = renderer.vr.getStandingMatrix();
controller2.addEventListener( 'triggerdown', onTriggerDown );
controller2.addEventListener( 'triggerup', onTriggerUp );
scene.add( controller2 );
@@ -193,10 +190,10 @@
//
- effect = new THREE.VREffect( renderer );
-
WEBVR.getVRDisplay( function ( display ) {
+ renderer.vr.setDevice( display );
+
document.body.appendChild( WEBVR.getButton( display, renderer.domElement ) );
} );
@@ -212,7 +209,7 @@
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
- effect.setSize( window.innerWidth, window.innerHeight );
+ renderer.setSize( window.innerWidth, window.innerHeight );
}
@@ -312,8 +309,7 @@
function animate() {
- effect.requestAnimationFrame( animate );
- render();
+ renderer.animate( render );
}
@@ -322,14 +318,12 @@
controller1.update();
controller2.update();
- controls.update();
-
cleanIntersected();
intersectObjects( controller1 );
intersectObjects( controller2 );
- effect.render( scene, camera );
+ renderer.render( scene, camera );
}
diff --git a/examples/webvr_vive_paint.html b/examples/webvr_vive_paint.html
index 01a51423ec5e89b90dd888edcc730cd757b5ce2a..b6c9c0d5548ab9c47612770e6515c2157448afa3 100644
--- a/examples/webvr_vive_paint.html
+++ b/examples/webvr_vive_paint.html
@@ -21,8 +21,6 @@
-
-
@@ -41,7 +39,6 @@
var container;
var camera, scene, renderer;
- var effect, controls;
var controller1, controller2;
var line;
@@ -142,19 +139,19 @@
renderer.gammaOutput = true;
container.appendChild( renderer.domElement );
- controls = new THREE.VRControls( camera );
- controls.standing = true;
+ renderer.vr.enabled = true;
+ renderer.vr.standing = true;
// controllers
controller1 = new THREE.PaintViveController( 0 );
- controller1.standingMatrix = controls.getStandingMatrix();
+ controller1.standingMatrix = renderer.vr.getStandingMatrix();
controller1.userData.points = [ new THREE.Vector3(), new THREE.Vector3() ];
controller1.userData.matrices = [ new THREE.Matrix4(), new THREE.Matrix4() ];
scene.add( controller1 );
controller2 = new THREE.PaintViveController( 1 );
- controller2.standingMatrix = controls.getStandingMatrix();
+ controller2.standingMatrix = renderer.vr.getStandingMatrix();
controller2.userData.points = [ new THREE.Vector3(), new THREE.Vector3() ];
controller2.userData.matrices = [ new THREE.Matrix4(), new THREE.Matrix4() ];
scene.add( controller2 );
@@ -188,10 +185,10 @@
} );
- effect = new THREE.VREffect( renderer );
-
WEBVR.getVRDisplay( function ( display ) {
+ renderer.vr.setDevice( display );
+
document.body.appendChild( WEBVR.getButton( display, renderer.domElement ) );
} );
@@ -387,19 +384,12 @@
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
- effect.setSize( window.innerWidth, window.innerHeight );
+ renderer.setSize( window.innerWidth, window.innerHeight );
}
//
- function animate() {
-
- effect.requestAnimationFrame( animate );
- render();
-
- }
-
function handleController( controller ) {
controller.update();
@@ -435,9 +425,13 @@
}
- function render() {
+ function animate() {
+
+ renderer.animate( render );
- controls.update();
+ }
+
+ function render() {
var count = line.geometry.drawRange.count;
@@ -446,7 +440,7 @@
updateGeometry( count, line.geometry.drawRange.count );
- effect.render( scene, camera );
+ renderer.render( scene, camera );
}
diff --git a/examples/webvr_vive_sculpt.html b/examples/webvr_vive_sculpt.html
index 300b36b2702c3ec082fd5d61a07aa932cd1db9f0..5c9fb3900136fc8214dce562f3d7730937bae479 100644
--- a/examples/webvr_vive_sculpt.html
+++ b/examples/webvr_vive_sculpt.html
@@ -21,8 +21,6 @@
-
-
@@ -41,7 +39,6 @@
var container;
var camera, scene, renderer;
- var effect, controls;
var controller1, controller2;
var blob, vector;
@@ -124,17 +121,17 @@
renderer.gammaOutput = true;
container.appendChild( renderer.domElement );
- controls = new THREE.VRControls( camera );
- controls.standing = true;
+ renderer.vr.enabled = true;
+ renderer.vr.standing = true;
// controllers
controller1 = new THREE.ViveController( 0 );
- controller1.standingMatrix = controls.getStandingMatrix();
+ controller1.standingMatrix = renderer.vr.getStandingMatrix();
scene.add( controller1 );
controller2 = new THREE.ViveController( 1 );
- controller2.standingMatrix = controls.getStandingMatrix();
+ controller2.standingMatrix = renderer.vr.getStandingMatrix();
scene.add( controller2 );
var loader = new THREE.OBJLoader();
@@ -166,10 +163,10 @@
} );
- effect = new THREE.VREffect( renderer );
-
WEBVR.getVRDisplay( function ( display ) {
+ renderer.vr.setDevice( display );
+
document.body.appendChild( WEBVR.getButton( display, renderer.domElement ) );
} );
@@ -223,7 +220,7 @@
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
- effect.setSize( window.innerWidth, window.innerHeight );
+ renderer.setSize( window.innerWidth, window.innerHeight );
}
@@ -231,8 +228,7 @@
function animate() {
- effect.requestAnimationFrame( animate );
- render();
+ renderer.animate( render );
}
@@ -329,9 +325,7 @@
updateBlob();
- controls.update();
-
- effect.render( scene, camera );
+ renderer.render( scene, camera );
}