Skip to content

2021 update #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ASMach wants to merge 16 commits into
base: master
Choose a base branch
from
Open

2021 update #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5d7bce3
Installed new Input system
ASMach Nov 16, 2021
91ccfc7
First stage of update to use new input
ASMach Nov 16, 2021
686e558
Added namespace
ASMach Nov 16, 2021
7ba0b82
Added Player Input component
ASMach Nov 16, 2021
0c72f68
Added control input manager
ASMach Nov 16, 2021
8e91264
lighting updates
ASMach Nov 16, 2021
8470d4f
Use PitchRoll
ASMach Nov 16, 2021
f35518c
Setup control bindings on keyboard
ASMach Nov 16, 2021
08f7ca6
Keyboard and Joystick controls
ASMach Nov 16, 2021
f475b7f
Fixed additional controls
ASMach Nov 16, 2021
b20b43a
Additional controls
ASMach Nov 16, 2021
655d423
Plane update
ASMach Nov 16, 2021
5abe9da
Default control updates
ASMach Nov 16, 2021
4d4d752
Default controls changed to reflect text
ASMach Nov 16, 2021
f1a161a
Added throttle up-down with granularity
ASMach Nov 17, 2021
d091e9c
Fixed control bugs
ASMach Nov 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
285 changes: 285 additions & 0 deletions Assets/Aircraft Physics/Example/AirplaneControl.inputactions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,285 @@
{
"name": "AirplaneControl",
"maps": [
{
"name": "AirplaneControl",
"id": "c70314e2-c193-4362-b7fc-58de1e68a1e8",
"actions": [
{
"name": "PitchRoll",
"type": "Value",
"id": "71e1194d-1d64-4f9a-8352-5c82661ed35f",
"expectedControlType": "Vector2",
"processors": "",
"interactions": "",
"initialStateCheck": true
},
{
"name": "Yaw",
"type": "Value",
"id": "d9cc4d99-1e78-491f-b039-ba4fc66a99b6",
"expectedControlType": "Axis",
"processors": "",
"interactions": "",
"initialStateCheck": true
},
{
"name": "Throttle",
"type": "Value",
"id": "40542a18-db82-4a8a-a61f-d7792a3460ab",
"expectedControlType": "Axis",
"processors": "",
"interactions": "",
"initialStateCheck": true
},
{
"name": "Brakes",
"type": "Button",
"id": "5ab1118c-16a0-4fda-b3d8-9299a0689ff2",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Flaps",
"type": "Button",
"id": "a86f45bf-2c33-4251-b889-597d34bf2bc1",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
{
"name": "2D Vector",
"id": "37a378ba-192c-4aa9-9b00-05bc6df9b2e4",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "PitchRoll",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "912eec02-0f51-453c-ac46-5084005e4c31",
"path": "<Keyboard>/w",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "PitchRoll",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "55da6ffe-d96c-44fd-b533-f61da607d0b8",
"path": "<Keyboard>/s",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "PitchRoll",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "0594d19a-2bda-4d2f-99eb-3e0bb2ac5702",
"path": "<Keyboard>/a",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "PitchRoll",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "1cb98343-c4f1-48b1-974a-cb8717596550",
"path": "<Keyboard>/d",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "PitchRoll",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "2D Vector",
"id": "bc624559-fc85-4cb5-914c-2996b77b3eba",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "PitchRoll",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "b9eb50fd-9571-4a6c-ae57-316b9eaca377",
"path": "<Joystick>/stick/up",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "PitchRoll",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "ec5cbca1-0826-4c0d-90cd-b801c9130ec9",
"path": "<Joystick>/stick/down",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "PitchRoll",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "714f2355-607b-4895-a57a-3066bee0c698",
"path": "<Joystick>/stick/left",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "PitchRoll",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "b15692e7-4945-429f-9655-7e342f85fe06",
"path": "<Joystick>/stick/right",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "PitchRoll",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "1D Axis",
"id": "89d73883-3d9e-4f71-909e-5cd0d965e7f8",
"path": "1DAxis",
"interactions": "",
"processors": "",
"groups": "",
"action": "Yaw",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "negative",
"id": "08d54320-bd71-481e-96f1-f4cbb53bb9f4",
"path": "<Keyboard>/q",
"interactions": "",
"processors": "",
"groups": "Keyboard;Joystick",
"action": "Yaw",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "positive",
"id": "3f955865-0446-45aa-aa60-f5a32463e57e",
"path": "<Keyboard>/e",
"interactions": "",
"processors": "",
"groups": "Joystick;Keyboard",
"action": "Yaw",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "d7fb02a7-da11-4548-9ab6-4c819bc47eed",
"path": "<Keyboard>/b",
"interactions": "",
"processors": "",
"groups": "Keyboard;Joystick",
"action": "Brakes",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "b9457f6b-f589-4841-b38e-f6d25639db20",
"path": "<Keyboard>/f",
"interactions": "",
"processors": "",
"groups": "Keyboard;Joystick",
"action": "Flaps",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "1D Axis",
"id": "14705b29-c4a8-49a7-b0a4-c2deea3d0d47",
"path": "1DAxis",
"interactions": "",
"processors": "",
"groups": "",
"action": "Throttle",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "negative",
"id": "ac3f9a8f-0f00-43e8-b7fe-9063ad523b1c",
"path": "<Keyboard>/minus",
"interactions": "",
"processors": "",
"groups": "Keyboard;Joystick",
"action": "Throttle",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "positive",
"id": "555e02df-cc95-4b29-950c-f2ba7259e111",
"path": "<Keyboard>/equals",
"interactions": "",
"processors": "",
"groups": "Keyboard;Joystick",
"action": "Throttle",
"isComposite": false,
"isPartOfComposite": true
}
]
}
],
"controlSchemes": [
{
"name": "Keyboard",
"bindingGroup": "Keyboard",
"devices": [
{
"devicePath": "<Keyboard>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Joystick",
"bindingGroup": "Joystick",
"devices": [
{
"devicePath": "<Joystick>",
"isOptional": false,
"isOR": false
},
{
"devicePath": "<Keyboard>",
"isOptional": true,
"isOR": false
}
]
}
]
}
14 changes: 14 additions & 0 deletions Assets/Aircraft Physics/Example/AirplaneControl.inputactions.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading