Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-16 22:00:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made increaseScale and decreaseScale more responsive at limits

Browse source
This commit is contained in:
Anthony J. Thibault 2017-11-22 14:45:52 -08:00
parent 9f54ce55f3
commit b3896f664d
4 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/src/avatar/MyAvatar.cpp
View file

@ -2162,16 +2162,6 @@ bool findAvatarAvatarPenetration(const glm::vec3 positionA, float radiusA, float
// target scale to match the new scale they have chosen. When they leave the domain they will not return to the scale they were // target scale to match the new scale they have chosen. When they leave the domain they will not return to the scale they were
// before they entered the limiting domain. // before they entered the limiting domain.
float MyAvatar::getDomainMinScale() {
const float unscaledHeight = getUnscaledEyeHeight();
return _domainMinimumHeight / unscaledHeight;
}
float MyAvatar::getDomainMaxScale() {
const float unscaledHeight = getUnscaledEyeHeight();
return _domainMaximumHeight / unscaledHeight;
}
void MyAvatar::setGravity(float gravity) { void MyAvatar::setGravity(float gravity) {
_characterController.setGravity(gravity); _characterController.setGravity(gravity);
} }
@ -2184,7 +2174,9 @@ void MyAvatar::increaseSize() {
float minScale = getDomainMinScale(); float minScale = getDomainMinScale();
float maxScale = getDomainMaxScale(); float maxScale = getDomainMaxScale();
float newTargetScale = glm::clamp(_targetScale * (1.0f + SCALING_RATIO), minScale, maxScale); float clampedTargetScale = glm::clamp(_targetScale, minScale, maxScale);
float newTargetScale = glm::clamp(clampedTargetScale * (1.0f + SCALING_RATIO), minScale, maxScale);
setTargetScale(newTargetScale); setTargetScale(newTargetScale);
} }
@ -2192,7 +2184,9 @@ void MyAvatar::decreaseSize() {
float minScale = getDomainMinScale(); float minScale = getDomainMinScale();
float maxScale = getDomainMaxScale(); float maxScale = getDomainMaxScale();
float newTargetScale = glm::clamp(_targetScale * (1.0f - SCALING_RATIO), minScale, maxScale); float clampedTargetScale = glm::clamp(_targetScale, minScale, maxScale);
float newTargetScale = glm::clamp(clampedTargetScale * (1.0f - SCALING_RATIO), minScale, maxScale);
setTargetScale(newTargetScale); setTargetScale(newTargetScale);
} }

2
interface/src/avatar/MyAvatar.h
View file

@ -558,8 +558,6 @@ public slots:
void increaseSize(); void increaseSize();
void decreaseSize(); void decreaseSize();
void resetSize(); void resetSize();
float getDomainMinScale();
float getDomainMaxScale();
void setGravity(float gravity); void setGravity(float gravity);
float getGravity(); float getGravity();

26
libraries/avatars/src/AvatarData.cpp
View file

@ -119,14 +119,8 @@ void AvatarData::setTargetScale(float targetScale) {
float AvatarData::getDomainLimitedScale() const { float AvatarData::getDomainLimitedScale() const {
if (canMeasureEyeHeight()) { if (canMeasureEyeHeight()) {
const float unscaledEyeHeight = getUnscaledEyeHeight(); const float minScale = getDomainMinScale();
const float maxScale = getDomainMaxScale();
// Add in an estimate of forehead height.
const float ratio = unscaledEyeHeight / DEFAULT_AVATAR_HEIGHT;
const float unscaledHeight = unscaledEyeHeight + ratio * DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD;
const float minScale = _domainMinimumHeight / unscaledHeight;
const float maxScale = _domainMaximumHeight / unscaledHeight;
return glm::clamp(_targetScale, minScale, maxScale); return glm::clamp(_targetScale, minScale, maxScale);
} else { } else {
// We can't make a good estimate. // We can't make a good estimate.
@ -142,6 +136,22 @@ void AvatarData::setDomainMaximumHeight(float domainMaximumHeight) {
_domainMaximumHeight = glm::clamp(domainMaximumHeight, MIN_AVATAR_HEIGHT, MAX_AVATAR_HEIGHT); _domainMaximumHeight = glm::clamp(domainMaximumHeight, MIN_AVATAR_HEIGHT, MAX_AVATAR_HEIGHT);
} }
float AvatarData::getDomainMinScale() const {
const float unscaledHeight = getUnscaledHeight();
return _domainMinimumHeight / unscaledHeight;
}
float AvatarData::getDomainMaxScale() const {
const float unscaledHeight = getUnscaledHeight();
return _domainMaximumHeight / unscaledHeight;
}
float AvatarData::getUnscaledHeight() const {
const float eyeHeight = getUnscaledEyeHeight();
const float ratio = eyeHeight / DEFAULT_AVATAR_HEIGHT;
return eyeHeight + ratio * DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD;
}
float AvatarData::getHeight() const { float AvatarData::getHeight() const {
const float eyeHeight = getEyeHeight(); const float eyeHeight = getEyeHeight();
const float ratio = eyeHeight / DEFAULT_AVATAR_HEIGHT; const float ratio = eyeHeight / DEFAULT_AVATAR_HEIGHT;

4
libraries/avatars/src/AvatarData.h
View file

@ -483,6 +483,8 @@ public:
virtual void setTargetScale(float targetScale); virtual void setTargetScale(float targetScale);
float getDomainLimitedScale() const; float getDomainLimitedScale() const;
float getDomainMinScale() const;
float getDomainMaxScale() const;
// returns eye height of avatar in meters, ignoreing avatar scale. // returns eye height of avatar in meters, ignoreing avatar scale.
// if _targetScale is 1 then this will be identical to getEyeHeight; // if _targetScale is 1 then this will be identical to getEyeHeight;
@ -508,6 +510,8 @@ public:
*/ */
Q_INVOKABLE virtual float getHeight() const; Q_INVOKABLE virtual float getHeight() const;
float getUnscaledHeight() const;
void setDomainMinimumHeight(float domainMinimumHeight); void setDomainMinimumHeight(float domainMinimumHeight);
void setDomainMaximumHeight(float domainMaximumHeight); void setDomainMaximumHeight(float domainMaximumHeight);