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

changed the ui to the settings/controls

Browse source
This commit is contained in:
amantley 2018-10-22 21:26:30 -07:00
parent 472ab1c613
commit 8cb09c37ee
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -533,7 +533,7 @@ void MyAvatar::update(float deltaTime) {
float tau = deltaTime / HMD_FACING_TIMESCALE;
setHipToHandController(computeHandAzimuth());
qCDebug(interfaceapp) << "lock " << _lockSitStandState.get() << " sit " << _isInSittingState.get() << " hmd lean "<< _hmdLeanRecenterEnabled;
// put the average hand azimuth into sensor space.
// then mix it with head facing direction to determine rotation recenter
if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid()) {

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

@ -243,6 +243,29 @@ void setupPreferences() {
preference->setIndented(true);
preferences->addPreference(preference);
}
{
auto getter = [myAvatar]()->int { if (myAvatar->getUserRecenterModel() == MyAvatar::SitStandModelType::Auto) {
return 0;
} else if (myAvatar->getUserRecenterModel() == MyAvatar::SitStandModelType::ForceSit) {
return 1;
} else {
return 2;
}};
auto setter = [myAvatar](int value) { if (value == 0) {
myAvatar->setUserRecenterModel(MyAvatar::SitStandModelType::Auto);
} else if (value == 1) {
myAvatar->setUserRecenterModel(MyAvatar::SitStandModelType::ForceSit);
} else {
myAvatar->setUserRecenterModel(MyAvatar::SitStandModelType::DisableHMDLean);
}};
auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Auto / Force Sit / Disable Recenter", getter, setter);
QStringList items;
items << "Auto" << "Force Sitting" << "Disable Recenter";
preference->setHeading("User Activity mode");
preference->setItems(items);
preferences->addPreference(preference);
}
{
auto getter = [myAvatar]()->int { return myAvatar->getSnapTurn() ? 0 : 1; };
auto setter = [myAvatar](int value) { myAvatar->setSnapTurn(value == 0); };