Skip to content

Commit 4f6c006

Browse files
keveleighkeveleigh
authored
Merge pull request #9687 from keveleigh/hand-mesh-and-scene-updates
Hand mesh and scene updates
2 parents 87d1c35 + 601532b commit 4f6c006

File tree

6 files changed

+52
-56
lines changed

6 files changed

+52
-56
lines changed

‎Assets/MRTK/Examples/Demos/HandTracking/Scenes/HandInteractionExamples.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14501,7 +14501,7 @@ PrefabInstance:
1450114501
- target: {fileID: 4943773361295851263, guid: c0931c4da6d91ea429abedb10290dd16,
1450214502
type: 3}
1450314503
propertyPath: m_IsActive
14504-
value: 0
14504+
value: 1
1450514505
objectReference: {fileID: 0}
1450614506
- target: {fileID: 6325538427078370090, guid: c0931c4da6d91ea429abedb10290dd16,
1450714507
type: 3}

‎Assets/MRTK/Examples/Experimental/ExamplesHub/Profiles/MRTKExamplesHubSceneSystemProfile.asset‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -33,116 +33,116 @@ MonoBehaviour:
3333
contentScenes:
3434
- Name: MRTKExamplesHubMainMenu
3535
Path: Assets/MRTK/Examples/Experimental/ExamplesHub/Scenes/MRTKExamplesHubMainMenu.unity
36-
Included: 1
37-
BuildIndex: 1
36+
Included: 0
37+
BuildIndex: -1
3838
Tag: Untagged
3939
Asset: {fileID: 102900000, guid: 63a00118e809c754f9c7911bb85d635f, type: 3}
4040
- Name: HandInteractionExamples
4141
Path: Assets/MRTK/Examples/Demos/HandTracking/Scenes/HandInteractionExamples.unity
4242
Included: 1
43-
BuildIndex: 2
43+
BuildIndex: 0
4444
Tag: Untagged
4545
Asset: {fileID: 102900000, guid: 3dd4a396b5225f8469b9a1eb608bfa57, type: 3}
4646
- Name: ClippingExamples
4747
Path: Assets/MRTK/Examples/Demos/StandardShader/Scenes/ClippingExamples.unity
48-
Included: 1
49-
BuildIndex: 3
48+
Included: 0
49+
BuildIndex: -1
5050
Tag: Untagged
5151
Asset: {fileID: 102900000, guid: e532091edada3e04aa706112e8d5f310, type: 3}
5252
- Name: TooltipExamples
5353
Path: Assets/MRTK/Examples/Demos/UX/Tooltips/Scenes/TooltipExamples.unity
54-
Included: 1
55-
BuildIndex: 4
54+
Included: 0
55+
BuildIndex: -1
5656
Tag: Untagged
5757
Asset: {fileID: 102900000, guid: de90a43947eced441b4c426e11f35f28, type: 3}
5858
- Name: MaterialGallery
5959
Path: Assets/MRTK/Examples/Demos/StandardShader/Scenes/MaterialGallery.unity
60-
Included: 1
61-
BuildIndex: 5
60+
Included: 0
61+
BuildIndex: -1
6262
Tag: Untagged
6363
Asset: {fileID: 102900000, guid: c6b1477d31864dff836e9738518eae60, type: 3}
6464
- Name: BoundingBoxExamples
6565
Path: Assets/MRTK/Examples/Demos/UX/BoundingBox/Scenes/BoundingBoxExamples.unity
66-
Included: 1
67-
BuildIndex: 6
66+
Included: 0
67+
BuildIndex: -1
6868
Tag: Untagged
6969
Asset: {fileID: 102900000, guid: 9da574c0affd04d42a6b1e5db09e82b4, type: 3}
7070
- Name: PressableButtonExample
7171
Path: Assets/MRTK/Examples/Demos/UX/PressableButton/Scenes/PressableButtonExample.unity
72-
Included: 1
73-
BuildIndex: 7
72+
Included: 0
73+
BuildIndex: -1
7474
Tag: Untagged
7575
Asset: {fileID: 102900000, guid: b2d06bb8d7f107d4783a56c796c5c120, type: 3}
7676
- Name: HandMenuExamples
7777
Path: Assets/MRTK/Examples/Demos/HandTracking/Scenes/HandMenuExamples.unity
78-
Included: 1
79-
BuildIndex: 8
78+
Included: 0
79+
BuildIndex: -1
8080
Tag: Untagged
8181
Asset: {fileID: 102900000, guid: 2792ec9767804e644906ab978f2eed23, type: 3}
8282
- Name: SlateExample
8383
Path: Assets/MRTK/Examples/Demos/UX/Slate/SlateExample.unity
84-
Included: 1
85-
BuildIndex: 9
84+
Included: 0
85+
BuildIndex: -1
8686
Tag: Untagged
8787
Asset: {fileID: 102900000, guid: 86e8b0c6246dbb74aa04ecd40a57d89c, type: 3}
8888
- Name: SliderExample
8989
Path: Assets/MRTK/Examples/Demos/UX/Slider/Scenes/SliderExample.unity
90-
Included: 1
91-
BuildIndex: 10
90+
Included: 0
91+
BuildIndex: -1
9292
Tag: Untagged
9393
Asset: {fileID: 102900000, guid: 086aad2912678d04e968264b2398004b, type: 3}
9494
- Name: EyeTrackingDemo-02-TargetSelection
9595
Path: Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-02-TargetSelection.unity
96-
Included: 1
97-
BuildIndex: 11
96+
Included: 0
97+
BuildIndex: -1
9898
Tag: Untagged
9999
Asset: {fileID: 102900000, guid: 55643f7e4eceb734784192b162f565e0, type: 3}
100100
- Name: EyeTrackingDemo-03-Navigation
101101
Path: Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-03-Navigation.unity
102-
Included: 1
103-
BuildIndex: 12
102+
Included: 0
103+
BuildIndex: -1
104104
Tag: Untagged
105105
Asset: {fileID: 102900000, guid: 5df475f0bf57b1f488d59e0e16040d9a, type: 3}
106106
- Name: EyeTrackingDemo-04-TargetPositioning
107107
Path: Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-04-TargetPositioning.unity
108-
Included: 1
109-
BuildIndex: 13
108+
Included: 0
109+
BuildIndex: -1
110110
Tag: Untagged
111111
Asset: {fileID: 102900000, guid: 91ded1f5ef2ae854ba4ac94eca7a2494, type: 3}
112112
- Name: EyeTrackingDemo-05-Visualizer
113113
Path: Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-05-Visualizer.unity
114-
Included: 1
115-
BuildIndex: 14
114+
Included: 0
115+
BuildIndex: -1
116116
Tag: Untagged
117117
Asset: {fileID: 102900000, guid: 2d6c43a82f3a88c4dbdc3b5e99a68d8a, type: 3}
118118
- Name: NearMenuExamples
119119
Path: Assets/MRTK/Examples/Demos/HandTracking/Scenes/NearMenuExamples.unity
120-
Included: 1
121-
BuildIndex: 15
120+
Included: 0
121+
BuildIndex: -1
122122
Tag: Untagged
123123
Asset: {fileID: 102900000, guid: bf3eb3415bffceb41810526380c2c71c, type: 3}
124124
- Name: ScrollingObjectCollection
125125
Path: Assets/MRTK/Examples/Demos/ScrollingObjectCollection/Scenes/ScrollingObjectCollection.unity
126-
Included: 1
127-
BuildIndex: 17
126+
Included: 0
127+
BuildIndex: -1
128128
Tag: Untagged
129129
Asset: {fileID: 102900000, guid: 79a0bb4c0426b7a4099c35eeced52ee4, type: 3}
130130
- Name: HandCoachExample
131131
Path: Assets/MRTK/Examples/Demos/HandCoach/Scenes/HandCoachExample.unity
132-
Included: 1
133-
BuildIndex: 19
132+
Included: 0
133+
BuildIndex: -1
134134
Tag: Untagged
135135
Asset: {fileID: 102900000, guid: 58e887502677eb649950ada695c4ad38, type: 3}
136136
- Name: SceneUnderstandingExample
137137
Path: Assets/MRTK/Examples/Experimental/SceneUnderstanding/Scenes/SceneUnderstandingExample.unity
138-
Included: 1
139-
BuildIndex: 20
138+
Included: 0
139+
BuildIndex: -1
140140
Tag: Untagged
141141
Asset: {fileID: 102900000, guid: d42a352dc9a8c4d4990a924687759199, type: 3}
142142
- Name: SurfaceMagnetismSpatialAwarenessExample
143143
Path: Assets/MRTK/Examples/Demos/Solvers/Scenes/SurfaceMagnetismSpatialAwarenessExample.unity
144-
Included: 1
145-
BuildIndex: 18
144+
Included: 0
145+
BuildIndex: -1
146146
Tag: Untagged
147147
Asset: {fileID: 102900000, guid: 8feae87497f549c4e8dc08a6e4b7b15c, type: 3}
148148
permittedLightingSceneComponentTypes:

‎Assets/MRTK/Providers/WindowsMixedReality/Shared/WindowsMixedRealityHandMeshProvider.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ public class WindowsMixedRealityHandMeshProvider
3333
private WindowsMixedRealityHandMeshProvider(Handedness handedness) => this.handedness = handedness;
3434

3535
[Obsolete("WindowsMixedRealityHandMeshProvider(IMixedRealityController) is obsolete. Please use either the static Left or Right members and call SetInputSource()")]
36-
public WindowsMixedRealityHandMeshProvider(IMixedRealityController controller) => inputSource = controller.InputSource;
36+
public WindowsMixedRealityHandMeshProvider(IMixedRealityController controller) : this(controller.ControllerHandedness)
37+
{
38+
SetInputSource(controller.InputSource);
39+
}
3740

3841
private readonly Handedness handedness;
3942
private IMixedRealityInputSource inputSource = null;

‎Assets/MRTK/SDK/Features/UX/Scripts/PulseShader/PulseShaderHandMeshHandler.cs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -188,20 +188,14 @@ public void PulseFingerTips()
188188
// Check if the palm is facing the camera
189189
private bool IsAPalmFacingCamera()
190190
{
191-
foreach (IMixedRealityController c in CoreServices.InputSystem.DetectedControllers)
191+
foreach (IMixedRealityController controller in CoreServices.InputSystem.DetectedControllers)
192192
{
193-
if (c.ControllerHandedness.IsMatch(Handedness.Both))
193+
if (controller.ControllerHandedness.IsMatch(Handedness.Both)
194+
&& controller is IMixedRealityHand jointedHand
195+
&& jointedHand.TryGetJoint(TrackedHandJoint.Palm, out MixedRealityPose palmPose)
196+
&& Vector3.Dot(palmPose.Up, CameraCache.Main.transform.forward) > 0.0f)
194197
{
195-
MixedRealityPose palmPose;
196-
var jointedHand = c as IMixedRealityHand;
197-
198-
if ((jointedHand != null) && jointedHand.TryGetJoint(TrackedHandJoint.Palm, out palmPose))
199-
{
200-
if (Vector3.Dot(palmPose.Up, CameraCache.Main.transform.forward) > 0.0f)
201-
{
202-
return true;
203-
}
204-
}
198+
return true;
205199
}
206200
}
207201

‎Assets/MRTK/SDK/Features/UX/Scripts/Utilities/FeaturesPanelVisuals.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ internal class FeaturesPanelVisuals : MonoBehaviour
2121
[SerializeField]
2222
private Interactable handJointsButton = null;
2323

24-
// Start is called before the first frame update
25-
void Start()
24+
private void Start()
2625
{
2726
profilerButton.IsToggled = (CoreServices.DiagnosticsSystem?.ShowProfiler).GetValueOrDefault(false);
2827
handRayButton.IsToggled = PointerUtils.GetPointerBehavior<ShellHandRayPointer>(Handedness.Any, InputSourceType.Hand) != PointerBehavior.AlwaysOff;
@@ -32,8 +31,8 @@ void Start()
3231
{
3332
handProfile = CoreServices.InputSystem.InputSystemProfile.HandTrackingProfile;
3433
}
35-
handMeshButton.IsToggled = (handProfile != null) ? handProfile.EnableHandMeshVisualization : false;
36-
handJointsButton.IsToggled = (handProfile != null) ? handProfile.EnableHandJointVisualization : false;
34+
handMeshButton.IsToggled = handProfile != null && handProfile.EnableHandMeshVisualization;
35+
handJointsButton.IsToggled = handProfile != null && handProfile.EnableHandJointVisualization;
3736
}
3837
}
3938
}

‎Assets/MRTK/SDK/StandardAssets/Prefabs/ArticulatedHandMesh.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ MeshRenderer:
5757
m_RenderingLayerMask: 4294967295
5858
m_RendererPriority: 0
5959
m_Materials:
60-
- {fileID: 2100000, guid: 8898ca407d928454d876a616ba1be32e, type: 2}
60+
- {fileID: 2100000, guid: 45082b98567b3d44ca3bdbe39f46041a, type: 2}
6161
m_StaticBatchInfo:
6262
firstSubMesh: 0
6363
subMeshCount: 0

0 commit comments

Comments
 (0)