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

Can't resize if objects in both hands, avatar resize is seek + grips

Browse source
This commit is contained in:
Philip Rosedale 2016-12-14 13:38:37 -08:00
parent 9370c8af6b
commit 14c867fdbd
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -773,8 +773,8 @@ function MyController(hand) {
this.updateSmoothedTrigger(); this.updateSmoothedTrigger();
// If both grip buttons squeezed and nothing is held, rescale my avatar! // If both trigger and grip buttons squeezed and nothing is held, rescale my avatar!
if (this.hand === RIGHT_HAND && this.state === STATE_OFF && this.getOtherHandController().state === STATE_OFF) { if (this.hand === RIGHT_HAND && this.state === STATE_SEARCHING && this.getOtherHandController().state === STATE_SEARCHING) {
this.maybeScaleMyAvatar(); this.maybeScaleMyAvatar();
} }
@ -2191,8 +2191,8 @@ function MyController(hand) {
this.maybeScale = function(props) { this.maybeScale = function(props) {
if (!this.shouldScale) { if (!this.shouldScale) {
// If both secondary triggers squeezed, start scaling // If both secondary triggers squeezed, and the non-holding hand is empty, start scaling
if (this.secondarySqueezed() && this.getOtherHandController().secondarySqueezed()) { if (this.secondarySqueezed() && this.getOtherHandController().secondarySqueezed() && this.getOtherHandController().state === STATE_OFF) {
this.scalingStartDistance = Vec3.length(Vec3.subtract(this.getHandPosition(), this.getOtherHandController().getHandPosition())); this.scalingStartDistance = Vec3.length(Vec3.subtract(this.getHandPosition(), this.getOtherHandController().getHandPosition()));
this.scalingStartDimensions = props.dimensions; this.scalingStartDimensions = props.dimensions;
this.shouldScale = true; this.shouldScale = true;