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

Change name and use only when in HMD.

Browse source
This commit is contained in:
Howard Stearns 2016-02-16 18:09:56 -08:00
parent 4150d318d3
commit 6d70584b5a
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/controllers/keyboardMouse.json
View file

@ -18,7 +18,7 @@
[ "Keyboard.MouseMoveRight" ] [ "Keyboard.MouseMoveRight" ]
] ]
}, },
"when": [ "Application.SnapTurn", "Keyboard.RightMouseButton" ], "when": [ "Application.InHMD", "Application.SnapTurn", "Keyboard.RightMouseButton" ],
"to": "Actions.StepYaw", "to": "Actions.StepYaw",
"filters": "filters":
[ [
@ -34,7 +34,7 @@
[ "Keyboard.TouchpadRight" ] [ "Keyboard.TouchpadRight" ]
] ]
}, },
"when": [ "Application.SnapTurn" ], "when": [ "Application.InHMD", "Application.SnapTurn" ],
"to": "Actions.StepYaw", "to": "Actions.StepYaw",
"filters": "filters":
[ [
@ -49,7 +49,7 @@
["Keyboard.D", "Keyboard.Right"] ["Keyboard.D", "Keyboard.Right"]
] ]
}, },
"when": [ "Application.SnapTurn" ], "when": [ "Application.InHMD", "Application.SnapTurn" ],
"to": "Actions.StepYaw", "to": "Actions.StepYaw",
"filters": "filters":
[ [

2
interface/resources/controllers/standard.json
View file

@ -5,7 +5,7 @@
{ "from": "Standard.LX", "to": "Actions.TranslateX" }, { "from": "Standard.LX", "to": "Actions.TranslateX" },
{ "from": "Standard.RX", { "from": "Standard.RX",
"when": [ "Application.SnapTurn" ], "when": [ "Application.InHMD", "Application.SnapTurn" ],
"to": "Actions.StepYaw", "to": "Actions.StepYaw",
"filters": "filters":
[ [

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

@ -60,7 +60,7 @@ void setupPreferences() {
{ {
auto getter = [=]()->bool {return myAvatar->getSnapTurn(); }; auto getter = [=]()->bool {return myAvatar->getSnapTurn(); };
auto setter = [=](bool value) { myAvatar->setSnapTurn(value); }; auto setter = [=](bool value) { myAvatar->setSnapTurn(value); };
preferences->addPreference(new CheckPreference(AVATAR_BASICS, "Snap Turn", getter, setter)); preferences->addPreference(new CheckPreference(AVATAR_BASICS, "Snap Turn when in HMD", getter, setter));
} }
{ {
auto getter = []()->QString { return Snapshot::snapshotsLocation.get(); }; auto getter = []()->QString { return Snapshot::snapshotsLocation.get(); };