Skip to content

raycaster fixes and perf improvements (fixes #3428, #3429) #3250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 4, 2017
Merged

raycaster fixes and perf improvements (fixes #3428, #3429) #3250

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cad2c2d
remove object allocations from cursor component
ngokevin Nov 21, 2017
fb60d8e
only emit raycaster intersection/intersected events if newly intersected
ngokevin Nov 21, 2017
c2ef054
fix disabling of raycaster.showLine
ngokevin Nov 21, 2017
e24af91
fix disabling raycaster.line getting overridden by tick line updater
ngokevin Nov 21, 2017
a2b94db
remove arrow fn
ngokevin Dec 4, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
remove object allocations from cursor component
  • Loading branch information
@ngokevin
ngokevin committed Nov 21, 2017
commit cad2c2dedc85952a2e1c3a6cf364e1b36a5641fc
16 changes: 13 additions & 3 deletions src/components/cursor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ module.exports.Component = registerComponent('cursor', {
self.canvasBounds = self.el.sceneEl.canvas.getBoundingClientRect();
}, 200);

this.eventDetail = {};
this.intersectedEventDetail = {cursorEl: this.el};

// Bind methods.
this.onCursorDown = bind(this.onCursorDown, this);
this.onCursorUp = bind(this.onCursorUp, this);
Expand Down Expand Up @@ -235,7 +238,8 @@ module.exports.Component = registerComponent('cursor', {
// If intersected entity has changed since the cursorDown, still emit mouseUp on the
// previously cursorUp entity.
if (this.cursorDownEl && this.cursorDownEl !== this.intersectedEl) {
this.cursorDownEl.emit(EVENTS.MOUSEUP, {cursorEl: this.el, intersection: null});
this.intersectedEventDetail.intersection = null;
this.cursorDownEl.emit(EVENTS.MOUSEUP, this.intersectedEventDetail);
}

if (!this.data.fuse && this.intersectedEl && this.cursorDownEl === this.intersectedEl) {
Expand Down Expand Up @@ -329,8 +333,14 @@ module.exports.Component = registerComponent('cursor', {
var el = this.el;
var intersectedEl = this.intersectedEl;
var intersection = this.intersection;
el.emit(evtName, {intersectedEl: intersectedEl, intersection: intersection});

this.eventDetail.intersectedEl = intersectedEl;
this.eventDetail.intersection = intersection;
el.emit(evtName, this.eventDetail);

if (!intersectedEl) { return; }
intersectedEl.emit(evtName, {cursorEl: el, intersection: intersection});

this.intersectedEventDetail.intersection = intersection;
intersectedEl.emit(evtName, this.intersectedEventDetail);
}
});