Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:02:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for avatar scale preferences

Browse source
This commit is contained in:
Anthony J. Thibault 2017-09-07 15:30:16 -07:00
parent d0f9a20a01
commit f4f9c29bff
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/ui/PreferencesDialog.cpp
View file

@ -193,8 +193,8 @@ void setupPreferences() {
preferences->addPreference(new PrimaryHandPreference(AVATAR_TUNING, "Dominant Hand", getter, setter)); preferences->addPreference(new PrimaryHandPreference(AVATAR_TUNING, "Dominant Hand", getter, setter));
} }
{ {
auto getter = [=]()->float { return myAvatar->getModelScale(); }; auto getter = [=]()->float { return myAvatar->getTargetScale(); };
auto setter = [=](float value) { myAvatar->setModelScale(value); }; auto setter = [=](float value) { myAvatar->setTargetScale(value); };
auto preference = new SpinnerSliderPreference(AVATAR_TUNING, "Avatar Scale", getter, setter); auto preference = new SpinnerSliderPreference(AVATAR_TUNING, "Avatar Scale", getter, setter);
preference->setStep(0.05f); preference->setStep(0.05f);
preference->setDecimals(2); preference->setDecimals(2);

1
libraries/avatars-renderer/src/avatars-renderer/Avatar.h
View file

@ -232,6 +232,7 @@ public:
void animateScaleChanges(float deltaTime); void animateScaleChanges(float deltaTime);
void setTargetScale(float targetScale) override; void setTargetScale(float targetScale) override;
float getTargetScale() const { return _targetScale; }
Q_INVOKABLE float getSimulationRate(const QString& rateName = QString("")) const; Q_INVOKABLE float getSimulationRate(const QString& rateName = QString("")) const;