Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

better handling for a flipped min/max scale

Browse source
This commit is contained in:
Stephen Birarda 2016-11-10 16:50:36 -08:00
parent 88c63332de
commit 020942c826
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -568,7 +568,9 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) {
_domainMaximumScale = glm::clamp(settingMaxScale, MIN_AVATAR_SCALE, MAX_AVATAR_SCALE);
// make sure that the domain owner didn't flip min and max
_domainMinimumScale = std::min(_domainMinimumScale, _domainMaximumScale);
if (_domainMinimumScale > _domainMaximumScale) {
std::swap(_domainMinimumScale, _domainMaximumScale);
}
qDebug() << "This domain requires a minimum avatar scale of" << _domainMinimumScale
<< "and a maximum avatar scale of" << _domainMaximumScale;

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

@ -1910,7 +1910,9 @@ void MyAvatar::restrictScaleFromDomainSettings(const QJsonObject& domainSettings
setDomainMaximumScale(settingMaxScale);
// make sure that the domain owner didn't flip min and max
_domainMinimumScale = std::min(_domainMinimumScale, _domainMaximumScale);
if (_domainMinimumScale > _domainMaximumScale) {
std::swap(_domainMinimumScale, _domainMaximumScale);
}
qCDebug(interfaceapp, "This domain requires a minimum avatar scale of %f and a maximum avatar scale of %f",
_domainMinimumScale, _domainMaximumScale);