Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/ray-input.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,12 @@ export default class RayInput extends EventEmitter {
delete this.handlers[object.id]
}

update() {
update(meshes) {
let lookAt = new THREE.Vector3(0, 0, -1);
lookAt.applyQuaternion(this.camera.quaternion);

this.currentMeshes = meshes;

let mode = this.controller.getInteractionMode();
switch (mode) {
case InteractionModes.MOUSE:
Expand Down Expand Up @@ -166,7 +168,7 @@ export default class RayInput extends EventEmitter {
default:
console.error('Unknown interaction mode.');
}
this.renderer.update();
this.renderer.update(meshes);
this.controller.update();
}

Expand Down Expand Up @@ -196,7 +198,7 @@ export default class RayInput extends EventEmitter {
//console.log('onRayDown_');

// Force the renderer to raycast.
this.renderer.update();
this.renderer.update(this.currentMeshes);
let mesh = this.renderer.getSelectedMesh();
this.emit('raydown', mesh);

Expand Down
25 changes: 19 additions & 6 deletions src/ray-renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,28 @@ export default class RayRenderer extends EventEmitter {
}
}

update() {
update(meshes) {
// Do the raycasting and issue various events as needed.
let intersects = this.raycaster.intersectObjects(meshes, true);
let intersectedMesh;

for (var i=0; i < intersects.length; i++) {
let obj = intersects[i].object;

// traverse the hierarchy backwards, to find a clickable mesh via a child
while (obj && !this.meshes[obj.id]) {
obj = obj.parent;
}

if (obj) {
intersectedMesh = obj.id;
break;
}
}

for (let id in this.meshes) {
let mesh = this.meshes[id];
let intersects = this.raycaster.intersectObject(mesh, true);
if (intersects.length > 1) {
console.warn('Unexpected: multiple meshes intersected.');
}
let isIntersected = (intersects.length > 0);
let isIntersected = (intersectedMesh === mesh.id);
let isSelected = this.selected[id];

// If it's newly selected, send rayover.
Expand Down