From 6d70584b5a33dcbb1739e3b7d1e87332ee660378 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Tue, 16 Feb 2016 18:09:56 -0800
Subject: [PATCH] Change name and use only when in HMD.
---
interface/resources/controllers/keyboardMouse.json | 6 +++---
interface/resources/controllers/standard.json | 2 +-
interface/src/ui/PreferencesDialog.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/interface/resources/controllers/keyboardMouse.json b/interface/resources/controllers/keyboardMouse.json
index c76c35b86e..0037e3741d 100644
--- a/interface/resources/controllers/keyboardMouse.json
+++ b/interface/resources/controllers/keyboardMouse.json
@@ -18,7 +18,7 @@
[ "Keyboard.MouseMoveRight" ]
]
},
- "when": [ "Application.SnapTurn", "Keyboard.RightMouseButton" ],
+ "when": [ "Application.InHMD", "Application.SnapTurn", "Keyboard.RightMouseButton" ],
"to": "Actions.StepYaw",
"filters":
[
@@ -34,7 +34,7 @@
[ "Keyboard.TouchpadRight" ]
]
},
- "when": [ "Application.SnapTurn" ],
+ "when": [ "Application.InHMD", "Application.SnapTurn" ],
"to": "Actions.StepYaw",
"filters":
[
@@ -49,7 +49,7 @@
["Keyboard.D", "Keyboard.Right"]
]
},
- "when": [ "Application.SnapTurn" ],
+ "when": [ "Application.InHMD", "Application.SnapTurn" ],
"to": "Actions.StepYaw",
"filters":
[
diff --git a/interface/resources/controllers/standard.json b/interface/resources/controllers/standard.json
index e1308545a3..5dd6c0641d 100644
--- a/interface/resources/controllers/standard.json
+++ b/interface/resources/controllers/standard.json
@@ -5,7 +5,7 @@
{ "from": "Standard.LX", "to": "Actions.TranslateX" },
{ "from": "Standard.RX",
- "when": [ "Application.SnapTurn" ],
+ "when": [ "Application.InHMD", "Application.SnapTurn" ],
"to": "Actions.StepYaw",
"filters":
[
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 9dae995175..80f2989127 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -60,7 +60,7 @@ void setupPreferences() {
{
auto getter = [=]()->bool {return myAvatar->getSnapTurn(); };
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(); };