Update three.js calls in ObjectSelection

Author: davidpiegza

utils/ObjectSelection.js

@@ -2,10 +2,10 @@
   @author David Piegza
 
   Implements a selection for objects in a scene.
-  
+
   It invokes a callback function when the mouse enters and when it leaves the object.
   Based on a Three.js selection example.
-  
+
   Parameters:
     domElement: HTMLDomElement
     selected: callback function, passes the current selected object (on mouseover)
@@ -16,11 +16,11 @@ THREE.ObjectSelection = function(parameters) {
   var parameters = parameters || {};
 
   this.domElement = parameters.domElement || document;
-  this.projector = new THREE.Projector;
+  this.projector = new THREE.Projector();
   this.INTERSECTED;
-  
+
   var _this = this;
-  
+
   var callbackSelected = parameters.selected;
   var callbackClicked = parameters.clicked;
   var mouse = { x: 0, y: 0 };
@@ -41,42 +41,34 @@ THREE.ObjectSelection = function(parameters) {
   }
 
   this.render = function(scene, camera) {
-    // find intersections
-    camera.update();
-
     var vector = new THREE.Vector3( mouse.x, mouse.y, 0.5 );
     this.projector.unprojectVector( vector, camera );
 
-    var ray = new THREE.Ray( camera.position, vector.subSelf( camera.position ).normalize() );
+    var raycaster = new THREE.Raycaster(camera.position, vector.sub(camera.position).normalize());
+
+    var intersects = raycaster.intersectObject(scene, true);
 
-    var intersects = ray.intersectScene( scene );
     if( intersects.length > 0 ) {
       if ( this.INTERSECTED != intersects[ 0 ].object ) {
         if ( this.INTERSECTED ) {
-          this.INTERSECTED.materials[ 0 ].color.setHex( this.INTERSECTED.currentHex );
+          this.INTERSECTED.material.color.setHex( this.INTERSECTED.currentHex );
         }
 
         this.INTERSECTED = intersects[ 0 ].object;
-        this.INTERSECTED.currentHex = this.INTERSECTED.materials[ 0 ].color.getHex();
-        this.INTERSECTED.materials[ 0 ].color.setHex( 0xff0000 );
+        this.INTERSECTED.currentHex = this.INTERSECTED.material.color.getHex();
+        this.INTERSECTED.material.color.setHex( 0xff0000 );
         if(typeof callbackSelected === 'function') {
           callbackSelected(this.INTERSECTED);
         }
       }
     } else {
       if ( this.INTERSECTED ) {
-        this.INTERSECTED.materials[ 0 ].color.setHex( this.INTERSECTED.currentHex );
+        this.INTERSECTED.material.color.setHex( this.INTERSECTED.currentHex );
       }
       this.INTERSECTED = null;
       if(typeof callbackSelected === 'function') {
         callbackSelected(this.INTERSECTED);
       }
     }
-  }  
+  }
 }
-
-
-
-
-
-