Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 05:46:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

solve the bug : Avatar scale value should be 3.0 ,if user has set scale value > 3.0 previously .

Browse source
This commit is contained in:
NeetBhagat 2017-06-30 15:40:38 +05:30
parent b22daa9a6f
commit 5ff0bc409b
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,6 +67,7 @@ const float MAX_WALKING_SPEED = 2.6f; // human walking speed
const float MAX_BOOST_SPEED = 0.5f * MAX_WALKING_SPEED; // action motor gets additive boost below this speed const float MAX_BOOST_SPEED = 0.5f * MAX_WALKING_SPEED; // action motor gets additive boost below this speed
const float MIN_AVATAR_SPEED = 0.05f; const float MIN_AVATAR_SPEED = 0.05f;
const float MIN_AVATAR_SPEED_SQUARED = MIN_AVATAR_SPEED * MIN_AVATAR_SPEED; // speed is set to zero below this const float MIN_AVATAR_SPEED_SQUARED = MIN_AVATAR_SPEED * MIN_AVATAR_SPEED; // speed is set to zero below this
const float DEFAULT_MAX_AVATAR_SCALE = 3.0f;
const float YAW_SPEED_DEFAULT = 120.0f; // degrees/sec const float YAW_SPEED_DEFAULT = 120.0f; // degrees/sec
const float PITCH_SPEED_DEFAULT = 90.0f; // degrees/sec const float PITCH_SPEED_DEFAULT = 90.0f; // degrees/sec
@ -1075,6 +1076,7 @@ void MyAvatar::loadData() {
getHead()->setBasePitch(loadSetting(settings, "headPitch", 0.0f)); getHead()->setBasePitch(loadSetting(settings, "headPitch", 0.0f));
_targetScale = loadSetting(settings, "scale", 1.0f); _targetScale = loadSetting(settings, "scale", 1.0f);
_targetScale = (_targetScale > DEFAULT_MAX_AVATAR_SCALE) ? DEFAULT_MAX_AVATAR_SCALE : _targetScale;
setScale(glm::vec3(_targetScale)); setScale(glm::vec3(_targetScale));
_prefOverrideAnimGraphUrl.set(QUrl(settings.value("animGraphURL", "").toString())); _prefOverrideAnimGraphUrl.set(QUrl(settings.value("animGraphURL", "").toString()));