Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Renamed webvr_vive_dragging to webvr_dragging.

Mr.doob 7 years ago
parent
c8987ce38a
commit
bea85821c3
2 changed files with 11 additions and 36 deletions
Unified View Show Diff Stats
  1. 1 1
      examples/files.js
  2. 10 35
      examples/webvr_dragging.html

+ 1 - 1
examples/files.js
View File 

@@ -320,13 +320,13 @@ var files = {
 
 	"webvr": [
 
 	"webvr": [
 
 		"webvr_ballshooter",
 
 		"webvr_ballshooter",
 
 		"webvr_cubes",
 
 		"webvr_cubes",
 
+		"webvr_dragging",
 
 		"webvr_lorenzattractor",
 
 		"webvr_lorenzattractor",
 
 		"webvr_panorama",
 
 		"webvr_panorama",
 
 		"webvr_rollercoaster",
 
 		"webvr_rollercoaster",
 
 		"webvr_sandbox",
 
 		"webvr_sandbox",
 
 		"webvr_video",
 
 		"webvr_video",
 
 		"webvr_vive",
 
 		"webvr_vive",
 
-		"webvr_vive_dragging",
 
 		"webvr_vive_paint",
 
 		"webvr_vive_paint",
 
 		"webvr_vive_sculpt"
 
 		"webvr_vive_sculpt"
 
 	],
 
 	],

+ 10 - 35
examples/webvr_vive_dragging.html → examples/webvr_dragging.html
View File 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="en">
 
 <html lang="en">
 
 	<head>
 
 	<head>
 
-		<title>three.js webvr - htc vive - dragging</title>
 
+		<title>three.js webvr - dragging</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<!-- Origin Trial Token, feature = WebVR (For Chrome M62+), origin = https://threejs.org, expires = 2018-07-25 -->
 
 		<!-- Origin Trial Token, feature = WebVR (For Chrome M62+), origin = https://threejs.org, expires = 2018-07-25 -->
 
@@ -26,12 +26,8 @@
 
 	<body>
 
 	<body>
 
 
 
 		<script src="../build/three.js"></script>
 
 		<script src="../build/three.js"></script>
 
-
 
-		<script src="js/vr/ViveController.js"></script>
 
 		<script src="js/vr/WebVR.js"></script>
 
 		<script src="js/vr/WebVR.js"></script>
 
 
 
-		<script src="js/loaders/OBJLoader.js"></script>
 
-
 
 		<script>
 
 		<script>
 
 
 
 			var container;
 
 			var container;
 
@@ -56,7 +52,7 @@
 
 				info.style.top = '10px';
 
 				info.style.top = '10px';
 
 				info.style.width = '100%';
 
 				info.style.width = '100%';
 
 				info.style.textAlign = 'center';
 
 				info.style.textAlign = 'center';
 
-				info.innerHTML = '<a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> webgl - htc vive';
 
+				info.innerHTML = '<a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> webgl - dragging';
 
 				container.appendChild( info );
 
 				container.appendChild( info );
 
 
 
 				scene = new THREE.Scene();
 
 				scene = new THREE.Scene();
 
@@ -141,34 +137,16 @@
 
 
 
 				// controllers
 
 				// controllers
 
 
 
-				controller1 = new THREE.ViveController( 0 );
 
-				controller1.standingMatrix = renderer.vr.getStandingMatrix();
 
-				controller1.addEventListener( 'triggerdown', onTriggerDown );
 
-				controller1.addEventListener( 'triggerup', onTriggerUp );
 
+				controller1 = renderer.vr.getController( 0 );
 
+				controller1.addEventListener( 'selectstart', onSelectStart );
 
+				controller1.addEventListener( 'selectend', onSelectEnd );
 
 				scene.add( controller1 );
 
 				scene.add( controller1 );
 
 
 
-				controller2 = new THREE.ViveController( 1 );
 
-				controller2.standingMatrix = renderer.vr.getStandingMatrix();
 
-				controller2.addEventListener( 'triggerdown', onTriggerDown );
 
-				controller2.addEventListener( 'triggerup', onTriggerUp );
 
+				controller2 = renderer.vr.getController( 0 );
 
+				controller1.addEventListener( 'selectstart', onSelectStart );
 
+				controller1.addEventListener( 'selectend', onSelectEnd );
 
 				scene.add( controller2 );
 
 				scene.add( controller2 );
 
 
 
-				var loader = new THREE.OBJLoader();
 
-				loader.setPath( 'models/obj/vive-controller/' );
 
-				loader.load( 'vr_controller_vive_1_5.obj', function ( object ) {
 
-
 
-					var loader = new THREE.TextureLoader();
 
-					loader.setPath( 'models/obj/vive-controller/' );
 
-
 
-					var controller = object.children[ 0 ];
 
-					controller.material.map = loader.load( 'onepointfive_texture.png' );
 
-					controller.material.specularMap = loader.load( 'onepointfive_spec.png' );
 
-
 
-					controller1.add( object.clone() );
 
-					controller2.add( object.clone() );
 
-
 
-				} );
 
-
 
 				//
 
 				//
 
 
 
 				var geometry = new THREE.BufferGeometry().setFromPoints( [ new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, - 1 ) ] );
 
 				var geometry = new THREE.BufferGeometry().setFromPoints( [ new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, - 1 ) ] );
 
@@ -197,7 +175,7 @@
 
 
 
 			}
 
 			}
 
 
 
-			function onTriggerDown( event ) {
 
+			function onSelectStart( event ) {
 
 
 
 				var controller = event.target;
 
 				var controller = event.target;
 
 
 
@@ -221,7 +199,7 @@
 
 
 
 			}
 
 			}
 
 
 
-			function onTriggerUp( event ) {
 
+			function onSelectEnd( event ) {
 
 
 
 				var controller = event.target;
 
 				var controller = event.target;
 
 
 
@@ -299,9 +277,6 @@
 
 
 
 			function render() {
 
 			function render() {
 
 
 
-				controller1.update();
 
-				controller2.update();
 
-
 
 				cleanIntersected();
 
 				cleanIntersected();
 
 
 
 				intersectObjects( controller1 );
 
 				intersectObjects( controller1 );