Skip to content

max grab behavior attribute #149

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

Closed
wants to merge 2 commits into from
+7 −2
Closed

max grab behavior attribute #149

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
667560b
add property maxGrabBehavior to specify the behavior to follow when m…
InfiniteLee Jul 19, 2018
2b8c341
lint fixes
InfiniteLee Jul 19, 2018
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
9 changes: 7 additions & 2 deletions reaction_components/grabbable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const base = inherit({}, physicsCore, buttonsCore)
AFRAME.registerComponent('grabbable', inherit(base, {
schema: {
maxGrabbers: {type: 'int', default: NaN},
maxGrabBehavior: {default: 'nothing', oneOf: ['nothing', 'drop']},
invert: {default: false},
suppressY: {default: false}
},
Expand Down Expand Up @@ -74,9 +75,13 @@ AFRAME.registerComponent('grabbable', inherit(base, {
return
}
// room for more grabbers?
const grabAvailable = !Number.isFinite(this.data.maxGrabbers) ||
let grabAvailable = !Number.isFinite(this.data.maxGrabbers) ||
this.grabbers.length < this.data.maxGrabbers

if (Number.isFinite(this.data.maxGrabbers) && !grabAvailable &&
this.grabbed && this.data.maxGrabBehavior === 'drop') {
this.grabbers[0].components['super-hands'].onGrabEndButton()
Copy link
Member

@wmurphyrd wmurphyrd Jul 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would crash the component if it has button filtering enabled with a TypeError from trying to access properties on a null event detail.
https://github.com/wmurphyrd/aframe-super-hands-component/blob/master/reaction_components/prototypes/buttons-proto.js#L5

grabAvailable = true
}
if (this.grabbers.indexOf(evt.detail.hand) === -1 && grabAvailable) {
if (!evt.detail.hand.object3D) {
console.warn('grabbable entities must have an object3D')
Expand Down