Skip to content
This repository has been archived by the owner on May 13, 2022. It is now read-only.

Add support for input and gestures for hand controllers #68

Draft
wants to merge 87 commits into
base: development
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
feeadb6
updated lumin controller data provider
StephenHodgson Apr 6, 2020
1f65526
added controller data provider reference to the controller
StephenHodgson Apr 7, 2020
75a98d7
Merge branch 'dev/data-provider' into feature/controller-mapping-refa…
StephenHodgson Apr 7, 2020
8817174
updated references
StephenHodgson Apr 7, 2020
0e2b150
updated profile reference
StephenHodgson Apr 7, 2020
c6e9617
Merge branch 'development' into feature/controller-mapping-refactor
StephenHodgson Apr 7, 2020
bf15e21
updated references
StephenHodgson Apr 7, 2020
733e9bb
Added default controller definitions
StephenHodgson Apr 7, 2020
1804619
removed redundant action assignments in mappings
StephenHodgson Apr 9, 2020
f184f70
updated references
StephenHodgson Apr 9, 2020
f36d06d
added axis processor check
StephenHodgson Apr 9, 2020
7102173
Fixed inspector
StephenHodgson Apr 9, 2020
b960bb9
updated controller instance creation
StephenHodgson Apr 9, 2020
82e5af4
added a default constructor
StephenHodgson Apr 9, 2020
d82b617
fixed TryRenderControllerModel call
StephenHodgson Apr 10, 2020
d098d9f
removed unused reference
StephenHodgson Apr 11, 2020
dea329b
removed asset menu
StephenHodgson Apr 11, 2020
9dd28d0
Remove obsolete SetupDefaultInteractions (#59)
FejZa Apr 11, 2020
5e8e757
removed reference to input processor
StephenHodgson Apr 11, 2020
982009e
updated reference to camera rig
StephenHodgson Apr 11, 2020
108a804
updated platform flag to only be true on device
StephenHodgson Apr 11, 2020
aaf8b56
Merge branch 'fix/platform' into dev/camera-system-refactor
StephenHodgson Apr 11, 2020
6ee1a55
updated hand inspector
StephenHodgson Apr 12, 2020
00f4429
Merge branch 'development' into dev/camera-system-refactor
StephenHodgson Apr 12, 2020
a9eed8b
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 12, 2020
7ae8d55
Added Lumin camera data provider
StephenHodgson Apr 13, 2020
69a2e92
updated lumin platform definition
StephenHodgson Apr 13, 2020
3fb5675
Merge branch 'dev/platform-refactor' into dev/camera-system-refactor
StephenHodgson Apr 13, 2020
ac78aab
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 13, 2020
c5efa56
updated icon
StephenHodgson Apr 13, 2020
9673700
Added default lumin camera data provider profile
StephenHodgson Apr 13, 2020
8f998c6
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 13, 2020
d0e7b26
reverted name change
StephenHodgson Apr 13, 2020
764fb00
Merge branch 'dev/platform-refactor' into dev/camera-system-refactor
StephenHodgson Apr 13, 2020
c27bc80
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 13, 2020
3298634
Updated constructors for data providers
StephenHodgson Apr 14, 2020
20670aa
Merge branch 'development' into dev/camera-system-refactor
StephenHodgson Apr 14, 2020
3cfe9b5
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 14, 2020
5468ea8
Merge branch 'development' into dev/data-providers
StephenHodgson Apr 14, 2020
e9e3096
Merge branch 'dev/data-providers' into dev/camera-system-refactor
StephenHodgson Apr 14, 2020
91f4ae0
Added service parent reference
StephenHodgson Apr 14, 2020
56293dc
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 14, 2020
1b2b33d
cleaned up referenece
StephenHodgson Apr 14, 2020
667a65d
updated nearclip distance
StephenHodgson Apr 14, 2020
723e71a
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 14, 2020
da9ed10
Change requests for controller provider inspectors (#63)
FejZa Apr 15, 2020
431c599
Adjust to latest changes in Core
FejZa Apr 16, 2020
4a504c6
updated lumin camera settings
StephenHodgson Apr 19, 2020
cef1965
updated lumin camera data provider
StephenHodgson Apr 19, 2020
bcfcbf3
only reset local positions
StephenHodgson Apr 19, 2020
b6868df
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 19, 2020
dd380f8
Merge branch 'development' into dev/camera-system-refactor
StephenHodgson Apr 19, 2020
8156d4b
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 19, 2020
53756ac
Merge branch 'feature/controller-mapping-refactor' of https://github.…
FejZa Apr 20, 2020
6a84c5b
Merge branch 'development' into feature/controller-mapping-refactor
StephenHodgson Apr 23, 2020
e79ab1e
Merge branch 'development' into feature/controller-mapping-refactor
StephenHodgson Apr 24, 2020
6852a33
Merge branch 'feature/controller-mapping-refactor' into feature/hand-…
FejZa Apr 24, 2020
153ce62
Merge branch 'development' of https://github.com/XRTK/Lumin into feat…
FejZa Apr 27, 2020
6a0859a
Resolve conflicts
FejZa Apr 27, 2020
c9944a5
Undo meta changes
FejZa Apr 27, 2020
dff222c
Update copyright year
FejZa Apr 27, 2020
f451340
Fix namespace
FejZa Apr 27, 2020
c0566ca
Reset meta
FejZa Apr 27, 2020
120d65d
Cleanup
FejZa Apr 27, 2020
4e89c2a
Undo
FejZa Apr 27, 2020
84301b2
Fix controller providers namespace and location
FejZa Apr 27, 2020
bad9d20
Fix usings
FejZa Apr 27, 2020
7ed8d0d
Merge branch 'development' of https://github.com/XRTK/Lumin into feat…
FejZa Apr 28, 2020
5af274e
Merge branch 'development' of https://github.com/XRTK/Lumin into feat…
FejZa May 1, 2020
a572a57
Merge branch 'development' of https://github.com/XRTK/Lumin into feat…
FejZa May 2, 2020
ee8e8b1
Fix default Lumin hand data provider profile
FejZa May 2, 2020
e8bb655
Update profile references
FejZa May 3, 2020
543573f
Merge branch 'development' of https://github.com/XRTK/Lumin into feat…
FejZa May 5, 2020
a306549
Merge branch 'development' of https://github.com/XRTK/Lumin into feat…
FejZa May 9, 2020
7ccdf82
Introduce hand rendering mode
FejZa May 10, 2020
0bc7d6b
Implement runtime rendering mode switch
FejZa May 10, 2020
75b329f
Merge branch 'development' into feature/hand-input
StephenHodgson May 13, 2020
fb86843
Merge branch 'development' of https://github.com/XRTK/Lumin into feat…
FejZa May 18, 2020
a56c7ac
Merge branch 'development' of https://github.com/XRTK/Lumin into feat…
FejZa May 18, 2020
ca87650
Update converter to define platform capabilities
FejZa May 22, 2020
1670723
Remove the need for base converter
FejZa May 26, 2020
6e030cc
Fix build errors due to removal of base converter
FejZa May 26, 2020
6608a6d
Rename joints
FejZa May 27, 2020
f4b2291
Point to new hand controller profiles
FejZa May 27, 2020
bac39c7
Merge branch 'development' into feature/hand-input
StephenHodgson Jun 12, 2020
0707091
Merge branch 'development' into feature/hand-input
StephenHodgson Jun 16, 2020
468b6ac
Merge branch 'development' of https://github.com/XRTK/Lumin into feat…
FejZa Sep 4, 2020
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ MonoBehaviour:
m_EditorClassIdentifier:
hasSetupDefaults: 1
controllerMappingProfiles:
- {fileID: 11400000, guid: b43ff1b6f37e65946b1abc7e50af105f, type: 2}
- {fileID: 11400000, guid: 6c775257f26873e459a492f28125e129, type: 2}
handMeshingEnabled: 0
- {fileID: 11400000, guid: dd499836e4b82f14da2f414aad1fed8b, type: 2}
- {fileID: 11400000, guid: 78bf44d2b6970a74ea2721883b0b22bc, type: 2}
renderingMode: 1
handPhysicsEnabled: 0
useTriggers: 0
boundsMode: 0
trackedPoses: []
keyPointFilterLevel: 0
poseFilterLevel: 0
2 changes: 1 addition & 1 deletion XRTK.Lumin/Packages/com.xrtk.lumin/Runtime/Profiles.meta

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

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using XRTK.Definitions.Controllers;
using XRTK.Definitions.Utilities;
using XRTK.Lumin.Providers.Controllers;
using XRTK.Lumin.Providers.InputSystem.Controllers;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we revert this namespace change?


namespace XRTK.Lumin.Profiles
{
Expand Down

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

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

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

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
using XRTK.Services;
using XRTK.Utilities.Async;

namespace XRTK.Lumin.Providers.Controllers
namespace XRTK.Lumin.Providers.InputSystem.Controllers
{
[RuntimePlatform(typeof(LuminPlatform))]
[Guid("851006A2-0762-49AA-80A5-A01C9A8DBB58")]
Expand Down

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