Skip to content

Commit e889fc8

Browse files
committed
Update to include outline
1 parent ed45529 commit e889fc8

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/RiggedHand-InvertedShell.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Material:
4444
- _Metallic: 0
4545
- _OutlineExponent: 1
4646
- _OutlineSmoothing: 0.05
47-
- _OutlineThickness: 0.00001337
47+
- _OutlineThickness: 0.0012
4848
- _OutlineThreshold: 0.474
4949
- _PinchAmount: 0
5050
- _Radius_: 0.09

org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-InvertedShell.shader

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (Inverted Shell)" {
1313
Properties {
1414
_OutlineColor ("Outline Color", Color) = (1,1,1,1)
1515
_OutlineColorPinching ("Outline Color (Pinching)", Color) = (1,1,1,1)
16-
_OutlineThickness ("Outline Thickness", Range(0.0,0.00003)) = 0.000012
17-
_HandThickness ("Hand Thickness", Range(-0.0001,0.0001)) = 0.0
16+
_OutlineThickness ("Outline Thickness", Range(0.0,0.003)) = 0.0012
17+
_HandThickness ("Hand Thickness", Range(-0.01,0.01)) = 0.0
1818
[PerRendererData]_PinchAmount ("Pinch Amount", Float) = 0
1919
[PerRendererData]_FadeSphereCenter ("Fade Sphere Center", Vector) = (0,0,0,1)
2020
[PerRendererData]_FadeSphereRadius ("Fade Sphere Radius", Range(0,1)) = 0.05
@@ -65,7 +65,7 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (Inverted Shell)" {
6565
UNITY_INITIALIZE_OUTPUT(v2f, o);
6666
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
6767

68-
float4 objectPos = v.vertex + v.normal * (_HandThickness + _OutlineThickness);
68+
float4 objectPos = v.vertex + normalize(v.normal) * (_HandThickness + _OutlineThickness);
6969
o.normal = UnityObjectToWorldNormal(v.normal);
7070
o.vertex = UnityObjectToClipPos(objectPos);
7171
o.color = v.color;

org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-Main.shader

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Shader "Mixed Reality Toolkit/Transparent Outlined Hand (Main)" {
1313
Properties {
1414
_HandColor ("Hand Color", Color) = (1,1,1,1)
15-
_HandThickness ("Hand Thickness", Range(-0.0001,0.0001)) = 0.0
15+
_HandThickness ("Hand Thickness", Range(-0.01,0.01)) = 0.0
1616
_IlluminationExponent ("Illumination Exponent", Range(0,10)) = 1
1717
_IlluminationAmount ("Illumination Amount", Range(0,10)) = 1
1818
[PerRendererData]_FadeSphereCenter ("Fade Sphere Center", Vector) = (0,0,0,1)
@@ -62,7 +62,7 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (Main)" {
6262
UNITY_INITIALIZE_OUTPUT(v2f, o);
6363
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
6464

65-
float4 objectPos = v.vertex + v.normal * _HandThickness;
65+
float4 objectPos = v.vertex + normalize(v.normal) * _HandThickness;
6666
o.normal = UnityObjectToWorldNormal(v.normal);
6767
o.vertex = UnityObjectToClipPos(objectPos);
6868
o.color = v.color;

org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-PrepassZ.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (PrepassZ)" {
5050
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
5151

5252
// Inflate/deflate hand based on thickness.
53-
o.vertex = UnityObjectToClipPos(v.vertex + v.normal * _HandThickness);
53+
o.vertex = UnityObjectToClipPos(v.vertex + normalize(v.normal) * _HandThickness);
5454

5555
return o;
5656
}

0 commit comments

Comments
 (0)