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

Merge pull request #13556 from dback2/deselectInput

Browse source 
Change deselecting entities to Ctrl + D and prevent W/A/S/D/E/Q movements with Ctrl
This commit is contained in:
David Back 2018-07-09 10:40:33 -07:00 committed by GitHub
commit d4f43a56f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,10 @@
{ {
"name": "Keyboard/Mouse to Actions", "name": "Keyboard/Mouse to Actions",
"channels": [ "channels": [
{ "from": "Keyboard.A", "when": "Keyboard.RightMouseButton", "to": "Actions.LATERAL_LEFT" }, { "from": "Keyboard.A", "when": ["Keyboard.RightMouseButton", "!Keyboard.Control"], "to": "Actions.LATERAL_LEFT" },
{ "from": "Keyboard.D", "when": "Keyboard.RightMouseButton", "to": "Actions.LATERAL_RIGHT" }, { "from": "Keyboard.D", "when": ["Keyboard.RightMouseButton", "!Keyboard.Control"], "to": "Actions.LATERAL_RIGHT" },
{ "from": "Keyboard.E", "to": "Actions.LATERAL_RIGHT" }, { "from": "Keyboard.E", "when": "!Keyboard.Control", "to": "Actions.LATERAL_RIGHT" },
{ "from": "Keyboard.Q", "to": "Actions.LATERAL_LEFT" }, { "from": "Keyboard.Q", "when": "!Keyboard.Control", "to": "Actions.LATERAL_LEFT" },
{ "comment" : "Mouse turn need to be small continuous increments", { "comment" : "Mouse turn need to be small continuous increments",
"from": { "makeAxis" : [ "from": { "makeAxis" : [
@ -87,21 +86,41 @@
}, },
{ "from": { "makeAxis" : [ { "from": { "makeAxis" : [
["Keyboard.A", "Keyboard.TouchpadLeft"], ["Keyboard.A"],
["Keyboard.D", "Keyboard.TouchpadRight"] ["Keyboard.D"]
]
},
"when": ["Application.CameraFirstPerson", "!Keyboard.Control"],
"to": "Actions.Yaw"
},
{ "from": { "makeAxis" : [
["Keyboard.A"],
["Keyboard.D"]
]
},
"when": ["Application.CameraThirdPerson", "!Keyboard.Control"],
"to": "Actions.Yaw"
},
{ "from": { "makeAxis" : [
["Keyboard.TouchpadLeft"],
["Keyboard.TouchpadRight"]
] ]
}, },
"when": "Application.CameraFirstPerson", "when": "Application.CameraFirstPerson",
"to": "Actions.Yaw" "to": "Actions.Yaw"
}, },
{ "from": { "makeAxis" : [ { "from": { "makeAxis" : [
["Keyboard.A", "Keyboard.TouchpadLeft"], ["Keyboard.TouchpadLeft"],
["Keyboard.D", "Keyboard.TouchpadRight"] ["Keyboard.TouchpadRight"]
] ]
}, },
"when": "Application.CameraThirdPerson", "when": "Application.CameraThirdPerson",
"to": "Actions.Yaw" "to": "Actions.Yaw"
}, },
{ "from": { "makeAxis" : ["Keyboard.MouseMoveLeft", "Keyboard.MouseMoveRight"] }, { "from": { "makeAxis" : ["Keyboard.MouseMoveLeft", "Keyboard.MouseMoveRight"] },
"when": "Keyboard.RightMouseButton", "when": "Keyboard.RightMouseButton",
"to": "Actions.Yaw", "to": "Actions.Yaw",

2
scripts/system/edit.js
View file

@ -1782,7 +1782,7 @@ var keyReleaseEvent = function (event) {
// since sometimes our menu shortcut keys don't work, trap our menu items here also and fire the appropriate menu items // since sometimes our menu shortcut keys don't work, trap our menu items here also and fire the appropriate menu items
if (event.text === "DELETE") { if (event.text === "DELETE") {
deleteSelectedEntities(); deleteSelectedEntities();
} else if (event.text === "ESC") { } else if (event.text === 'd' && event.isControl) {
selectionManager.clearSelections(); selectionManager.clearSelections();
} else if (event.text === "t") { } else if (event.text === "t") {
selectionDisplay.toggleSpaceMode(); selectionDisplay.toggleSpaceMode();