Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 11:29:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added ability to rescale avatar

Browse source
This commit is contained in:
Philip Rosedale 2016-12-12 15:26:53 -08:00
parent a142c830fa
commit 9370c8af6b
1 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -703,6 +703,8 @@ function MyController(hand) {
this.autoUnequipCounter = 0; this.autoUnequipCounter = 0;
this.grabPointIntersectsEntity = false; this.grabPointIntersectsEntity = false;
this.shouldScale = false;
// handPosition is where the avatar's hand appears to be, in-world. // handPosition is where the avatar's hand appears to be, in-world.
this.getHandPosition = function () { this.getHandPosition = function () {
if (this.hand === RIGHT_HAND) { if (this.hand === RIGHT_HAND) {
@ -771,6 +773,11 @@ function MyController(hand) {
this.updateSmoothedTrigger(); this.updateSmoothedTrigger();
// If both grip buttons squeezed and nothing is held, rescale my avatar!
if (this.hand === RIGHT_HAND && this.state === STATE_OFF && this.getOtherHandController().state === STATE_OFF) {
this.maybeScaleMyAvatar();
}
if (this.ignoreInput()) { if (this.ignoreInput()) {
this.turnOffVisualizations(); this.turnOffVisualizations();
return; return;
@ -2194,10 +2201,28 @@ function MyController(hand) {
this.shouldScale = false; this.shouldScale = false;
} }
if (this.shouldScale) { if (this.shouldScale) {
var scalingCurrentDistance = Vec3.length(Vec3.subtract(this.getHandPosition(), this.getOtherHandController().getHandPosition())); var scalingCurrentDistance = Vec3.length(Vec3.subtract(this.getHandPosition(), this.getOtherHandController().getHandPosition()));
var currentRescale = scalingCurrentDistance / this.scalingStartDistance; var currentRescale = scalingCurrentDistance / this.scalingStartDistance;
var newDimensions = Vec3.multiply(currentRescale, this.scalingStartDimensions); var newDimensions = Vec3.multiply(currentRescale, this.scalingStartDimensions);
Entities.editEntity(this.grabbedEntity, { dimensions: newDimensions }) Entities.editEntity(this.grabbedEntity, { dimensions: newDimensions })
}
}
this.maybeScaleMyAvatar = function() {
if (!this.shouldScale) {
// If both secondary triggers squeezed, start scaling
if (this.secondarySqueezed() && this.getOtherHandController().secondarySqueezed()) {
this.scalingStartDistance = Vec3.length(Vec3.subtract(this.getHandPosition(), this.getOtherHandController().getHandPosition()));
this.scalingStartAvatarScale = MyAvatar.scale;
this.shouldScale = true;
}
} else if (!this.secondarySqueezed() || !this.getOtherHandController().secondarySqueezed()) {
this.shouldScale = false;
}
if (this.shouldScale) {
var scalingCurrentDistance = Vec3.length(Vec3.subtract(this.getHandPosition(), this.getOtherHandController().getHandPosition()));
var newAvatarScale = (scalingCurrentDistance / this.scalingStartDistance) * this.scalingStartAvatarScale;
MyAvatar.scale = newAvatarScale;
} }
} }