Skip to content

InputActuatorComponent to allow the generation of an action space from an InputActionAsset #4881

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

Merged
merged 73 commits into from
Feb 19, 2021
Merged

InputActuatorComponent to allow the generation of an action space from an InputActionAsset #4881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
6ef9ebb
Add CreateActuators method to the ActuatorComponent class which wraps…
surfnerd Feb 1, 2021
9c0dcde
Update migrating doc.
surfnerd Feb 1, 2021
7bcdb0d
typo
surfnerd Feb 1, 2021
a60e9b0
Add input action asset
surfnerd Jan 19, 2021
2e9da14
[WIP] Initial implementation of InputActuator with Vector2 values.
surfnerd Jan 23, 2021
2911655
Fix rider warning.
surfnerd Jan 23, 2021
f235c38
Some changes.
surfnerd Jan 28, 2021
fdf8dc8
Inject bindings into the asset at runtime.
surfnerd Feb 1, 2021
2a8194f
remove some cruft.
surfnerd Feb 1, 2021
e37cba0
some small cleanup.
surfnerd Feb 1, 2021
372f38f
Rebase onto multiple actuator branch. thanks yamato.
surfnerd Feb 1, 2021
1ded6ec
more cleanup before creating 1:1 relationship bettwen actions and act…
surfnerd Feb 2, 2021
6d1608f
Update .gitignore, remove files i wish not to track.
surfnerd Feb 2, 2021
9dccd8f
break up actuators by action definition. Add a more interesting move…
surfnerd Feb 3, 2021
e0187e6
comment.
surfnerd Feb 3, 2021
da26c1f
Add jump to actions along with adaptors.
surfnerd Feb 3, 2021
27139b4
Jumping working.
surfnerd Feb 3, 2021
f2326ad
Add jump action. Setup an interface for us to get the users Input Ac…
surfnerd Feb 3, 2021
5c0b29d
add interface to allow modification of user instantiated asset.
surfnerd Feb 4, 2021
cd31e47
Make this work with multiple agents in a scene.
surfnerd Feb 4, 2021
422971c
Update scene and prefabs
surfnerd Feb 4, 2021
451ff5a
get training working.
surfnerd Feb 4, 2021
d22c0fa
fix button adaptor, add an onnx file.
surfnerd Feb 5, 2021
ba8fa87
Update onnx file.
surfnerd Feb 5, 2021
3c0633b
some changes.
surfnerd Feb 5, 2021
7857460
Get device paths working for multiple behaviors.
surfnerd Feb 5, 2021
c5267c5
Move composite initialization to right before we try to create device…
surfnerd Feb 5, 2021
33c52c4
Enable the rest of the areas.
surfnerd Feb 5, 2021
4eced60
Setup optional dependencies for ml-agents input module.
surfnerd Feb 6, 2021
20a8570
Fix name.
surfnerd Feb 6, 2021
46afb84
update yml, fix imports.
surfnerd Feb 6, 2021
d5c27fa
Add more adapators and composites.
surfnerd Feb 6, 2021
288f5d1
clean up the composite init code.
surfnerd Feb 6, 2021
0483eed
Address feedback about agent being able to switch between policies at…
surfnerd Feb 6, 2021
d4787da
some scene updates.
surfnerd Feb 6, 2021
709626a
Update onnx file and set version define for 1.1.0-preview or greater.
surfnerd Feb 8, 2021
493ed8d
Typo in class name.
surfnerd Feb 8, 2021
f7e812d
Add a bunch of docs.
surfnerd Feb 9, 2021
a6d4355
Remove heuristic.
surfnerd Feb 9, 2021
f95b96a
Remove calls to InputSystem.Update.
surfnerd Feb 9, 2021
071eba9
Finish up code docs.
surfnerd Feb 9, 2021
b025f9b
Add github docs for InputActuatorComponent.
surfnerd Feb 9, 2021
c4fb132
Remove references to com.unity.inputsystem from asmdefs. Fix spellin…
surfnerd Feb 9, 2021
9fe4db3
stash this.
surfnerd Feb 11, 2021
c990d55
Write tests and fix code. Removed composites.
surfnerd Feb 11, 2021
3966dec
Remove example project.
surfnerd Feb 11, 2021
3aa206c
ifdef for 2019.4 or newer.
surfnerd Feb 11, 2021
83a420b
Update changelog.
surfnerd Feb 12, 2021
5cde583
Enable input system tests in dev project.
surfnerd Feb 12, 2021
9089f1f
Add input assembly to code coverage.
surfnerd Feb 12, 2021
1dfc0b2
Fix assembly wildcard.
surfnerd Feb 12, 2021
3d9a627
Fixes for binding a device to a specific agent.
surfnerd Feb 13, 2021
95cadd4
Fix some issues, add API to behavior params along with an event for w…
surfnerd Feb 13, 2021
739c407
Fix tests.
surfnerd Feb 16, 2021
6da565e
Comment on static var.
surfnerd Feb 16, 2021
e9c9e77
Remove old code.
surfnerd Feb 16, 2021
3155f45
fix tets.
surfnerd Feb 16, 2021
26d74f1
Update combine method to not alloc, added doc.
surfnerd Feb 16, 2021
d0ebd0c
Update changelog.
surfnerd Feb 16, 2021
fb433c5
Address PR feedback.
surfnerd Feb 16, 2021
9e65a9a
Fix typo.
surfnerd Feb 16, 2021
aa9ff02
Fix tests again.
surfnerd Feb 17, 2021
040d393
Update docs to be more descriptive.
surfnerd Feb 17, 2021
0c09254
Address PR feedback.
surfnerd Feb 18, 2021
8b352d4
remove packages-lock.json from .gitignore per unity documentation.
surfnerd Feb 18, 2021
35731c6
Add profiling samples to actuator code.
surfnerd Feb 18, 2021
2554765
Fix ActionSpec loading during edit mode.
surfnerd Feb 18, 2021
3af71ad
Fix some subtle binding issue with switching between heuristic and no…
surfnerd Feb 18, 2021
27a9c55
Add minimal UI for the InputActuatorComponent to at least show the ac…
surfnerd Feb 18, 2021
5142ac8
fix imports, rename vars.
surfnerd Feb 18, 2021
2208128
add editor to asmdef.
surfnerd Feb 18, 2021
a385b95
Address PR feedback.
surfnerd Feb 18, 2021
6687ebb
address PR feedback.
surfnerd Feb 18, 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
2 changes: 1 addition & 1 deletion .yamato/com.unity.ml-agents-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ packages:
assembly: Unity.ML-Agents
minCoveragePct: 72
- name: com.unity.ml-agents.extensions
assembly: Unity.ML-Agents.Extensions
assembly: Unity.ML-Agents.Extensions*
minCoveragePct: 75
---

Expand Down
2 changes: 2 additions & 0 deletions DevProject/DevProject.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RL/@EntryIndexedValue">RL</s:String></wpf:ResourceDictionary>
16 changes: 9 additions & 7 deletions DevProject/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,26 @@
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "3.4.9",
"com.unity.ads": "3.6.1",
"com.unity.analytics": "3.3.5",
"com.unity.coding": "0.1.0-preview.13",
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.2.1",
"com.unity.ide.vscode": "1.2.3",
"com.unity.inputsystem": "1.1.0-preview.3",
"com.unity.ml-agents": "file:../../com.unity.ml-agents",
"com.unity.ml-agents.extensions": "file:../../com.unity.ml-agents.extensions",
"com.unity.multiplayer-hlapi": "1.0.6",
"com.unity.multiplayer-hlapi": "1.0.8",
"com.unity.package-manager-doctools": "1.7.0-preview",
"com.unity.package-validation-suite": "0.19.0-preview",
"com.unity.purchasing": "2.1.0",
"com.unity.test-framework": "1.1.16",
"com.unity.purchasing": "2.2.1",
"com.unity.test-framework": "1.1.20",
"com.unity.test-framework.performance": "2.2.0-preview",
"com.unity.testtools.codecoverage": "1.0.0-pre.3",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.2.12",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.4",
"com.unity.xr.legacyinputhelpers": "2.1.7",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
Expand Down Expand Up @@ -56,6 +57,7 @@
"registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates",
"testables": [
"com.unity.ml-agents",
"com.unity.ml-agents.extensions"
"com.unity.ml-agents.extensions",
"com.unity.inputsystem"
]
}
Loading