Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:58:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rearrange when avatar collisions are adjusted

Browse source
This commit is contained in:
Seth Alves 2015-09-29 15:52:38 -07:00
parent 8f2f14c9e5
commit 472ff89f48
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
examples/controllers/handControllerGrab.js
View file

@ -348,6 +348,9 @@ function MyController(hand, triggerAction) {
this.continueDistanceHolding = function() { this.continueDistanceHolding = function() {
if (this.triggerSmoothedReleased()) { if (this.triggerSmoothedReleased()) {
// HACK -- until we have collision groups, don't allow held object to collide with avatar
this.revertAvatarCollisions();
this.state = STATE_RELEASE; this.state = STATE_RELEASE;
return; return;
} }
@ -431,6 +434,9 @@ function MyController(hand, triggerAction) {
this.disableAvatarCollisions(); this.disableAvatarCollisions();
if (this.triggerSmoothedReleased()) { if (this.triggerSmoothedReleased()) {
// HACK -- until we have collision groups, don't allow held object to collide with avatar
this.revertAvatarCollisions();
this.state = STATE_RELEASE; this.state = STATE_RELEASE;
return; return;
} }
@ -477,6 +483,9 @@ function MyController(hand, triggerAction) {
this.continueNearGrabbing = function() { this.continueNearGrabbing = function() {
if (this.triggerSmoothedReleased()) { if (this.triggerSmoothedReleased()) {
// HACK -- until we have collision groups, don't allow held object to collide with avatar
this.revertAvatarCollisions();
this.state = STATE_RELEASE; this.state = STATE_RELEASE;
return; return;
} }
@ -608,9 +617,6 @@ function MyController(hand, triggerAction) {
this.release = function() { this.release = function() {
// HACK -- until we have collision groups, don't allow held object to collide with avatar
this.revertAvatarCollisions();
this.lineOff(); this.lineOff();
if (this.grabbedEntity !== null) { if (this.grabbedEntity !== null) {