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

experiment

Browse source
This commit is contained in:
Seth Alves 2016-04-01 17:17:21 -07:00
parent f05f283b04
commit d9f5a0ccaf
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
examples/controllers/handControllerGrab.js
View file

@ -1439,7 +1439,7 @@ function MyController(hand) {
this.offsetPosition = Vec3.multiplyQbyV(Quat.inverse(Quat.multiply(handRotation, this.offsetRotation)), offset); this.offsetPosition = Vec3.multiplyQbyV(Quat.inverse(Quat.multiply(handRotation, this.offsetRotation)), offset);
if (this.temporaryPositionOffset && (this.state == STATE_EQUIP || this.state == STATE_HOLD)) { if (this.temporaryPositionOffset && (this.state == STATE_EQUIP || this.state == STATE_HOLD)) {
this.offsetPosition = this.temporaryPositionOffset; this.offsetPosition = this.temporaryPositionOffset;
hasPresetPosition = true; // hasPresetPosition = true;
} }
} }
@ -1464,6 +1464,7 @@ function MyController(hand) {
reparentProps["localRotation"] = this.offsetRotation; reparentProps["localRotation"] = this.offsetRotation;
} }
Entities.editEntity(this.grabbedEntity, reparentProps); Entities.editEntity(this.grabbedEntity, reparentProps);
Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({ Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
action: 'equip', action: 'equip',
grabbedEntity: this.grabbedEntity grabbedEntity: this.grabbedEntity