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

move advanced movement control changes to MyAvatar

Browse source
This commit is contained in:
Stephen Birarda 2017-03-14 15:03:01 -07:00
parent 1fe02477b0
commit 490cb83489
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,6 +86,7 @@ class MyAvatar : public Avatar {
Q_PROPERTY(bool hmdLeanRecenterEnabled READ getHMDLeanRecenterEnabled WRITE setHMDLeanRecenterEnabled) Q_PROPERTY(bool hmdLeanRecenterEnabled READ getHMDLeanRecenterEnabled WRITE setHMDLeanRecenterEnabled)
Q_PROPERTY(bool characterControllerEnabled READ getCharacterControllerEnabled WRITE setCharacterControllerEnabled) Q_PROPERTY(bool characterControllerEnabled READ getCharacterControllerEnabled WRITE setCharacterControllerEnabled)
Q_PROPERTY(bool useAdvancedMovementControls READ useAdvancedMovementControls WRITE setUseAdvancedMovementControls)
public: public:
explicit MyAvatar(RigPointer rig); explicit MyAvatar(RigPointer rig);
@ -172,6 +173,8 @@ public:
Q_INVOKABLE bool getHMDLeanRecenterEnabled() const { return _hmdLeanRecenterEnabled; } Q_INVOKABLE bool getHMDLeanRecenterEnabled() const { return _hmdLeanRecenterEnabled; }
bool useAdvancedMovementControls() const { return _useAdvancedMovementControls.get(); } bool useAdvancedMovementControls() const { return _useAdvancedMovementControls.get(); }
void setUseAdvancedMovementControls(bool useAdvancedMovementControls)
{ _useAdvancedMovementControls.set(useAdvancedMovementControls); }
// get/set avatar data // get/set avatar data
void saveData(); void saveData();

14
scripts/system/controllers/toggleAdvancedMovementForHandControllers.js
View file

@ -17,15 +17,14 @@ var mappingName, basicMapping, isChecked;
var TURN_RATE = 1000; var TURN_RATE = 1000;
var MENU_ITEM_NAME = "Advanced Movement For Hand Controllers"; var MENU_ITEM_NAME = "Advanced Movement For Hand Controllers";
var SETTINGS_KEY = 'advancedMovementForHandControllersIsChecked';
var isDisabled = false; var isDisabled = false;
var previousSetting = Settings.getValue(SETTINGS_KEY); var previousSetting = MyAvatar.useAdvancedMovementControls;
if (previousSetting === '' || previousSetting === false || previousSetting === 'false') { if (previousSetting === false) {
previousSetting = false; previousSetting = false;
isChecked = false; isChecked = false;
} }
if (previousSetting === true || previousSetting === 'true') { if (previousSetting === true) {
previousSetting = true; previousSetting = true;
isChecked = true; isChecked = true;
} }
@ -37,7 +36,6 @@ function addAdvancedMovementItemToSettingsMenu() {
isCheckable: true, isCheckable: true,
isChecked: previousSetting isChecked: previousSetting
}); });
} }
function rotate180() { function rotate180() {
@ -111,10 +109,10 @@ function menuItemEvent(menuItem) {
if (menuItem == MENU_ITEM_NAME) { if (menuItem == MENU_ITEM_NAME) {
isChecked = Menu.isOptionChecked(MENU_ITEM_NAME); isChecked = Menu.isOptionChecked(MENU_ITEM_NAME);
if (isChecked === true) { if (isChecked === true) {
Settings.setValue(SETTINGS_KEY, true); MyAvatar.setUseAdvancedMovementControls(true);
disableMappings(); disableMappings();
} else if (isChecked === false) { } else if (isChecked === false)
Settings.setValue(SETTINGS_KEY, false); MyAvatar.setUseAdvancedMovementControls(true);
enableMappings(); enableMappings();
} }
} }