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

Add menu items for 'gear' selection.

Browse source
This commit is contained in:
r3tk0n 2019-01-25 14:27:02 -08:00
parent 9ea476ea89
commit 35818e9b9d
2 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1814,15 +1814,6 @@ private:
float _driveGear4 { DEFAULT_GEAR_4 };
float _driveGear5 { DEFAULT_GEAR_5 };
int _controlSchemeIndex;
//Setting::Handle<float> _driveGear1Setting;
//Setting::Handle<float> _driveGear2Setting;
//Setting::Handle<float> _driveGear3Setting;
//Setting::Handle<float> _driveGear4Setting;
//Setting::Handle<float> _driveGear5Setting;
//Setting::Handle<int> controlSchemeIndex;
glm::vec3 _thrust { 0.0f }; // impulse accumulator for outside sources
glm::vec3 _actionMotorVelocity; // target local-frame velocity of avatar (default controller actions)
@ -2067,7 +2058,6 @@ private:
Setting::Handle<float> _driveGear3Setting;
Setting::Handle<float> _driveGear4Setting;
Setting::Handle<float> _driveGear5Setting;
Setting::Handle<int> controlSchemeIndexSetting;
std::vector<Setting::Handle<QUuid>> _avatarEntityIDSettings;
std::vector<Setting::Handle<QByteArray>> _avatarEntityDataSettings;

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

@ -353,45 +353,50 @@ void setupPreferences() {
auto getter = [myAvatar]()->float { return myAvatar->getDriveGear1(); };
auto setter = [myAvatar](float value) { myAvatar->setDriveGear1(value); };
auto preference = new SpinnerPreference(ACCEL_CURVE, "Gear 1", getter, setter);
preference->setMin(1);
preference->setMax(5);
preference->setMin(0.0f);
preference->setMax(1.0f);
preference->setStep(1);
preference->setDecimals(2);
preferences->addPreference(preference);
}
{
auto getter = [myAvatar]()->float { return myAvatar->getDriveGear2(); };
auto setter = [myAvatar](float value) { myAvatar->setDriveGear2(value); };
auto preference = new SpinnerPreference(ACCEL_CURVE, "Gear 2", getter, setter);
preference->setMin(1);
preference->setMax(5);
preference->setMin(0.0f);
preference->setMax(1.0f);
preference->setStep(1);
preference->setDecimals(2);
preferences->addPreference(preference);
}
{
auto getter = [myAvatar]()->float { return myAvatar->getDriveGear3(); };
auto setter = [myAvatar](float value) { myAvatar->setDriveGear3(value); };
auto preference = new SpinnerPreference(ACCEL_CURVE, "Gear 3", getter, setter);
preference->setMin(1);
preference->setMax(5);
preference->setMin(0.0f);
preference->setMax(1.0f);
preference->setStep(1);
preference->setDecimals(2);
preferences->addPreference(preference);
}
{
auto getter = [myAvatar]()->float { return myAvatar->getDriveGear4(); };
auto setter = [myAvatar](float value) { myAvatar->setDriveGear4(value); };
auto preference = new SpinnerPreference(ACCEL_CURVE, "Gear 4", getter, setter);
preference->setMin(1);
preference->setMax(5);
preference->setMin(0.0f);
preference->setMax(1.0f);
preference->setStep(1);
preference->setDecimals(2);
preferences->addPreference(preference);
}
{
auto getter = [myAvatar]()->float { return myAvatar->getDriveGear5(); };
auto setter = [myAvatar](float value) { myAvatar->setDriveGear5(value); };
auto preference = new SpinnerPreference(ACCEL_CURVE, "Gear 5", getter, setter);
preference->setMin(1);
preference->setMax(5);
preference->setMin(0.0f);
preference->setMax(1.0f);
preference->setStep(1);
preference->setDecimals(2);
preferences->addPreference(preference);
}