Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-15 17:59:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #10619 from NeetBhagat/4869-Entity-resize-issue

Browse source 
4869 entity resize issue
This commit is contained in:
Seth Alves 2017-06-08 16:34:07 -07:00 committed by GitHub
commit d87b858c0a
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/system/controllers/handControllerGrab.js
View file

@ -3334,7 +3334,8 @@ function MyController(hand) {
// If both secondary triggers squeezed, and the non-holding hand is empty, start scaling // If both secondary triggers squeezed, and the non-holding hand is empty, start scaling
if (this.secondarySqueezed() && if (this.secondarySqueezed() &&
this.getOtherHandController().secondarySqueezed() && this.getOtherHandController().secondarySqueezed() &&
this.getOtherHandController().state === STATE_OFF) { this.grabbedThingID && this.getOtherHandController().grabbedThingID &&
this.grabbedThingID == this.getOtherHandController().grabbedThingID) {
this.scalingStartDistance = Vec3.length(Vec3.subtract(this.getHandPosition(), this.scalingStartDistance = Vec3.length(Vec3.subtract(this.getHandPosition(),
this.getOtherHandController().getHandPosition())); this.getOtherHandController().getHandPosition()));
this.scalingStartDimensions = props.dimensions; this.scalingStartDimensions = props.dimensions;