Browse Source

Cleaned up 6dof webvr examples.

Mr.doob 7 years ago
parent
commit
5ef432b109

+ 2 - 6
examples/webvr_vive.html

@@ -57,11 +57,7 @@
 				scene = new THREE.Scene();
 				scene = new THREE.Scene();
 				scene.background = new THREE.Color( 0x505050 );
 				scene.background = new THREE.Color( 0x505050 );
 
 
-				var user = new THREE.Group();
-				scene.add( user );
-
 				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.1, 10 );
 				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.1, 10 );
-				user.add( camera );
 
 
 				room = new THREE.Mesh(
 				room = new THREE.Mesh(
 					new THREE.BoxGeometry( 6, 6, 6, 8, 8, 8 ),
 					new THREE.BoxGeometry( 6, 6, 6, 8, 8, 8 ),
@@ -165,11 +161,11 @@
 
 
 				controller1 = new THREE.ViveController( 0 );
 				controller1 = new THREE.ViveController( 0 );
 				controller1.standingMatrix = renderer.vr.getStandingMatrix();
 				controller1.standingMatrix = renderer.vr.getStandingMatrix();
-				user.add( controller1 );
+				scene.add( controller1 );
 
 
 				controller2 = new THREE.ViveController( 1 );
 				controller2 = new THREE.ViveController( 1 );
 				controller2.standingMatrix = renderer.vr.getStandingMatrix();
 				controller2.standingMatrix = renderer.vr.getStandingMatrix();
-				user.add( controller2 );
+				scene.add( controller2 );
 
 
 				var loader = new THREE.OBJLoader();
 				var loader = new THREE.OBJLoader();
 				loader.setPath( 'models/obj/vive-controller/' );
 				loader.setPath( 'models/obj/vive-controller/' );

+ 2 - 6
examples/webvr_vive_dragging.html

@@ -58,11 +58,7 @@
 				scene = new THREE.Scene();
 				scene = new THREE.Scene();
 				scene.background = new THREE.Color( 0x808080 );
 				scene.background = new THREE.Color( 0x808080 );
 
 
-				var user = new THREE.Group();
-				scene.add( user );
-
 				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.1, 10 );
 				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.1, 10 );
-				user.add( camera );
 
 
 				var geometry = new THREE.PlaneBufferGeometry( 4, 4 );
 				var geometry = new THREE.PlaneBufferGeometry( 4, 4 );
 				var material = new THREE.MeshStandardMaterial( {
 				var material = new THREE.MeshStandardMaterial( {
@@ -145,13 +141,13 @@
 				controller1.standingMatrix = renderer.vr.getStandingMatrix();
 				controller1.standingMatrix = renderer.vr.getStandingMatrix();
 				controller1.addEventListener( 'triggerdown', onTriggerDown );
 				controller1.addEventListener( 'triggerdown', onTriggerDown );
 				controller1.addEventListener( 'triggerup', onTriggerUp );
 				controller1.addEventListener( 'triggerup', onTriggerUp );
-				user.add( controller1 );
+				scene.add( controller1 );
 
 
 				controller2 = new THREE.ViveController( 1 );
 				controller2 = new THREE.ViveController( 1 );
 				controller2.standingMatrix = renderer.vr.getStandingMatrix();
 				controller2.standingMatrix = renderer.vr.getStandingMatrix();
 				controller2.addEventListener( 'triggerdown', onTriggerDown );
 				controller2.addEventListener( 'triggerdown', onTriggerDown );
 				controller2.addEventListener( 'triggerup', onTriggerUp );
 				controller2.addEventListener( 'triggerup', onTriggerUp );
-				user.add( controller2 );
+				scene.add( controller2 );
 
 
 				var loader = new THREE.OBJLoader();
 				var loader = new THREE.OBJLoader();
 				loader.setPath( 'models/obj/vive-controller/' );
 				loader.setPath( 'models/obj/vive-controller/' );

+ 2 - 6
examples/webvr_vive_paint.html

@@ -69,11 +69,7 @@
 				scene = new THREE.Scene();
 				scene = new THREE.Scene();
 				scene.background = new THREE.Color( 0x222222 );
 				scene.background = new THREE.Color( 0x222222 );
 
 
-				var user = new THREE.Group();
-				scene.add( user );
-
 				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.01, 50 );
 				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.01, 50 );
-				user.add( camera );
 
 
 				var geometry = new THREE.BoxGeometry( 0.5, 0.8, 0.5 );
 				var geometry = new THREE.BoxGeometry( 0.5, 0.8, 0.5 );
 				var material = new THREE.MeshStandardMaterial( {
 				var material = new THREE.MeshStandardMaterial( {
@@ -144,13 +140,13 @@
 				controller1.standingMatrix = renderer.vr.getStandingMatrix();
 				controller1.standingMatrix = renderer.vr.getStandingMatrix();
 				controller1.userData.points = [ new THREE.Vector3(), new THREE.Vector3() ];
 				controller1.userData.points = [ new THREE.Vector3(), new THREE.Vector3() ];
 				controller1.userData.matrices = [ new THREE.Matrix4(), new THREE.Matrix4() ];
 				controller1.userData.matrices = [ new THREE.Matrix4(), new THREE.Matrix4() ];
-				user.add( controller1 );
+				scene.add( controller1 );
 
 
 				controller2 = new THREE.PaintViveController( 1 );
 				controller2 = new THREE.PaintViveController( 1 );
 				controller2.standingMatrix = renderer.vr.getStandingMatrix();
 				controller2.standingMatrix = renderer.vr.getStandingMatrix();
 				controller2.userData.points = [ new THREE.Vector3(), new THREE.Vector3() ];
 				controller2.userData.points = [ new THREE.Vector3(), new THREE.Vector3() ];
 				controller2.userData.matrices = [ new THREE.Matrix4(), new THREE.Matrix4() ];
 				controller2.userData.matrices = [ new THREE.Matrix4(), new THREE.Matrix4() ];
-				user.add( controller2 );
+				scene.add( controller2 );
 
 
 				var loader = new THREE.OBJLoader();
 				var loader = new THREE.OBJLoader();
 				loader.setPath( 'models/obj/vive-controller/' );
 				loader.setPath( 'models/obj/vive-controller/' );

+ 2 - 6
examples/webvr_vive_sculpt.html

@@ -59,11 +59,7 @@
 				scene = new THREE.Scene();
 				scene = new THREE.Scene();
 				scene.background = new THREE.Color( 0x222222 );
 				scene.background = new THREE.Color( 0x222222 );
 
 
-				var user = new THREE.Group();
-				scene.add( user );
-
 				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.01, 50 );
 				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.01, 50 );
-				user.add( camera );
 
 
 				var geometry = new THREE.BoxGeometry( 0.5, 0.8, 0.5 );
 				var geometry = new THREE.BoxGeometry( 0.5, 0.8, 0.5 );
 				var material = new THREE.MeshStandardMaterial( {
 				var material = new THREE.MeshStandardMaterial( {
@@ -124,11 +120,11 @@
 
 
 				controller1 = new THREE.ViveController( 0 );
 				controller1 = new THREE.ViveController( 0 );
 				controller1.standingMatrix = renderer.vr.getStandingMatrix();
 				controller1.standingMatrix = renderer.vr.getStandingMatrix();
-				user.add( controller1 );
+				scene.add( controller1 );
 
 
 				controller2 = new THREE.ViveController( 1 );
 				controller2 = new THREE.ViveController( 1 );
 				controller2.standingMatrix = renderer.vr.getStandingMatrix();
 				controller2.standingMatrix = renderer.vr.getStandingMatrix();
-				user.add( controller2 );
+				scene.add( controller2 );
 
 
 				var loader = new THREE.OBJLoader();
 				var loader = new THREE.OBJLoader();
 				loader.setPath( 'models/obj/vive-controller/' );
 				loader.setPath( 'models/obj/vive-controller/' );