Browse Source

Fixed canvas_interactive_voxelpainter.

Mr.doob 12 years ago
parent
commit
93d82a390a
2 changed files with 3 additions and 7 deletions
  1. 2 4
      examples/canvas_interactive_voxelpainter.html
  2. 1 3
      src/core/Projector.js

+ 2 - 4
examples/canvas_interactive_voxelpainter.html

@@ -82,7 +82,6 @@
 				scene.add( plane );
 
 				mouse2D = new THREE.Vector3( 0, 10000, 0.5 );
-				raycaster = new THREE.Raycaster( camera.position );
 
 				// Lights
 
@@ -140,9 +139,6 @@
 				mouse2D.x = ( event.clientX / window.innerWidth ) * 2 - 1;
 				mouse2D.y = - ( event.clientY / window.innerHeight ) * 2 + 1;
 
-				mouse3D = projector.unprojectVector( mouse2D.clone(), camera );
-				raycaster.direction = mouse3D.subSelf( camera.position ).normalize();
-
 				var intersects = raycaster.intersectObjects( scene.children );
 
 				if ( intersects.length > 0 ) {
@@ -249,6 +245,8 @@
 				camera.position.z = 1400 * Math.cos( theta * Math.PI / 360 );
 				camera.lookAt( target );
 
+				raycaster = projector.pickingRay( mouse2D.clone(), camera );
+
 				renderer.render( scene, camera );
 
 			}

+ 1 - 3
src/core/Projector.js

@@ -53,11 +53,9 @@ THREE.Projector = function() {
 
 	this.pickingRay = function ( vector, camera ) {
 
-		var end, ray, t;
-
 		// set two vectors with opposing z values
 		vector.z = -1.0;
-		end = new THREE.Vector3( vector.x, vector.y, 1.0 );
+		var end = new THREE.Vector3( vector.x, vector.y, 1.0 );
 
 		this.unprojectVector( vector, camera );
 		this.unprojectVector( end, camera );