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

protect flipped min/max scale in avatar mixer settings

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

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

@ -567,6 +567,9 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) {
float settingMaxScale = domainSettings[AVATARS_SETTINGS_KEY].toObject()[MAX_SCALE_OPTION].toDouble(MAX_AVATAR_SCALE); float settingMaxScale = domainSettings[AVATARS_SETTINGS_KEY].toObject()[MAX_SCALE_OPTION].toDouble(MAX_AVATAR_SCALE);
_domainMaximumScale = glm::clamp(settingMaxScale, MIN_AVATAR_SCALE, MAX_AVATAR_SCALE); _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);
qDebug() << "This domain requires a minimum avatar scale of" << _domainMinimumScale qDebug() << "This domain requires a minimum avatar scale of" << _domainMinimumScale
<< "and a maximum avatar scale of" << _domainMaximumScale; << "and a maximum avatar scale of" << _domainMaximumScale;
} }

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

@ -1909,6 +1909,9 @@ void MyAvatar::restrictScaleFromDomainSettings(const QJsonObject& domainSettings
float settingMaxScale = avatarsObject[MAX_SCALE_OPTION].toDouble(MAX_AVATAR_SCALE); float settingMaxScale = avatarsObject[MAX_SCALE_OPTION].toDouble(MAX_AVATAR_SCALE);
setDomainMaximumScale(settingMaxScale); setDomainMaximumScale(settingMaxScale);
// make sure that the domain owner didn't flip min and max
_domainMinimumScale = std::min(_domainMinimumScale, _domainMaximumScale);
qCDebug(interfaceapp, "This domain requires a minimum avatar scale of %f and a maximum avatar scale of %f", qCDebug(interfaceapp, "This domain requires a minimum avatar scale of %f and a maximum avatar scale of %f",
_domainMinimumScale, _domainMaximumScale); _domainMinimumScale, _domainMaximumScale);