Better 2D cursor #75
Merged
Better 2D cursor #75
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…on; look-controls are paused when an interactable is grabbed; colors changed; cursor no longer appears to be in "hovered" state when moused over the floor or table;
# Conflicts: # src/room.css # src/room.html
netpro2k
reviewed
Mar 28, 2018
src/components/super-cursor.js
Outdated
| } | ||
| }, | ||
|
|
||
| _handleMouseDown: function(e) { | ||
| this.mouseDown = true; |
There was a problem hiding this comment.
This flag appears to be unused.
src/components/super-cursor.js
Outdated
| this.el.setAttribute("raycaster", { origin: this.origin, direction: this.direction }); | ||
|
|
||
| let className = null; | ||
|
|
||
| if (!this.isGrabbing) { | ||
| const intersections = this.el.components.raycaster.intersections; | ||
| if (intersections.length > 0 && intersections[0].distance <= this.data.maxDistance) { | ||
| isIntersecting = true; |
There was a problem hiding this comment.
Instead of storing isIntersecting, className, point and currentDistance I would probably just store the interesection itself.
| @@ -62,49 +86,70 @@ AFRAME.registerComponent("super-cursor", { | |||
| } | |||
|
|
|||
| if (this.isGrabbing || !isIntersecting) { | |||
| const head = this.el.object3D; | |||
| head.getWorldPosition(this.origin); | |||
| head.getWorldDirection(this.direction); | |||
| const distance = Math.min( | |||
| Math.max(this.data.minDistance, this.currentDistance - this.currentDistanceMod), | |||
| this.data.maxDistance | |||
| ); | |||
| this.currentDistanceMod = this.currentDistance - distance; | |||
There was a problem hiding this comment.
bit confused what this is doing here?
There was a problem hiding this comment.
this is the logic that allows you to scroll the mouse wheel to move the object closer or farther from you.
# Conflicts: # src/room.js
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
no more cursor lock; super-cursor follows around cursor screen position; look-controls are paused when an interactable is grabbed; colors changed; cursor no longer appears to be in "hovered" state when moused over the floor or table; system cursor is hidden.