Skip to content

Commit 710003b

Browse files
more cleanup
1 parent f73e1aa commit 710003b

File tree

2 files changed

+9
-107
lines changed

2 files changed

+9
-107
lines changed

Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/ProximityEffect/ProximityEffectConfiguration.cs

Lines changed: 9 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,7 @@ public class ProximityEffectConfiguration : ScriptableObject
1818
/// <summary>
1919
/// Determines whether proximity feature (scaling and material toggling) is activated
2020
/// </summary>
21-
public bool ProximityEffectActive
22-
{
23-
get
24-
{
25-
return proximityEffectActive;
26-
}
27-
set
28-
{
29-
proximityEffectActive = value;
30-
}
31-
}
21+
public bool ProximityEffectActive { get => proximityEffectActive; set => proximityEffectActive = value; }
3222

3323
[SerializeField]
3424
[Tooltip("How far away should the hand be from an object before it starts scaling the object?")]
@@ -37,17 +27,7 @@ public bool ProximityEffectActive
3727
/// <summary>
3828
/// Distance the hand has to be in to start scaling objects.
3929
/// </summary>
40-
public float ObjectMediumProximity
41-
{
42-
get
43-
{
44-
return objectMediumProximity;
45-
}
46-
set
47-
{
48-
objectMediumProximity = value;
49-
}
50-
}
30+
public float ObjectMediumProximity { get => objectMediumProximity; set => objectMediumProximity = value; }
5131

5232
[SerializeField]
5333
[Tooltip("How far away should the hand be from an object before it activates the close-proximity scaling effect?")]
@@ -56,17 +36,7 @@ public float ObjectMediumProximity
5636
/// <summary>
5737
/// Distance the hand has to be in to start the close proximity scaling effect.
5838
/// </summary>
59-
public float ObjectCloseProximity
60-
{
61-
get
62-
{
63-
return objectCloseProximity;
64-
}
65-
set
66-
{
67-
objectCloseProximity = value;
68-
}
69-
}
39+
public float ObjectCloseProximity { get => objectCloseProximity; set => objectCloseProximity = value; }
7040

7141
[SerializeField]
7242
[Tooltip("A Proximity-enabled object scales by this amount when a hand moves out of range. Default is 0, invisible object.")]
@@ -75,17 +45,7 @@ public float ObjectCloseProximity
7545
/// <summary>
7646
/// A Proximity-enabled object scales by this amount when a hand moves out of range. Default is 0, invisible object.
7747
/// </summary>
78-
public float FarScale
79-
{
80-
get
81-
{
82-
return farScale;
83-
}
84-
set
85-
{
86-
farScale = value;
87-
}
88-
}
48+
public float FarScale { get => farScale; set => farScale = value; }
8949

9050
[SerializeField]
9151
[Tooltip("A Proximity-enabled object scales by this amount when a hand moves into the Medium Proximity range. Default is 1.0, original object size.")]
@@ -94,17 +54,7 @@ public float FarScale
9454
/// <summary>
9555
/// A Proximity-enabled object scales by this amount when a hand moves into the Medium Proximity range. Default is 1.0, original object size.
9656
/// </summary>
97-
public float MediumScale
98-
{
99-
get
100-
{
101-
return mediumScale;
102-
}
103-
set
104-
{
105-
mediumScale = value;
106-
}
107-
}
57+
public float MediumScale { get => mediumScale; set => mediumScale = value; }
10858

10959
[SerializeField]
11060
[Tooltip("A Proximity-enabled object scales by this amount when a hand moves into the Close Proximity range. Default is 1.5, larger object size.")]
@@ -113,17 +63,7 @@ public float MediumScale
11363
/// <summary>
11464
/// A Proximity-enabled object scales by this amount when a hand moves into the Close Proximity range. Default is 1.5, larger object size
11565
/// </summary>
116-
public float CloseScale
117-
{
118-
get
119-
{
120-
return closeScale;
121-
}
122-
set
123-
{
124-
closeScale = value;
125-
}
126-
}
66+
public float CloseScale { get => closeScale; set => closeScale = value; }
12767

12868
[SerializeField]
12969
[Tooltip("At what rate should a Proximity-scaled object scale when the Hand moves from Medium proximity to Far proximity?")]
@@ -132,17 +72,7 @@ public float CloseScale
13272
/// <summary>
13373
/// Rate a proximity scaled object scales when the hand moves from medium to far proximity.
13474
/// </summary>
135-
public float FarGrowRate
136-
{
137-
get
138-
{
139-
return farGrowRate;
140-
}
141-
set
142-
{
143-
farGrowRate = value;
144-
}
145-
}
75+
public float FarGrowRate { get => farGrowRate; set => farGrowRate = value; }
14676

14777
[SerializeField]
14878
[Tooltip("At what rate should a Proximity-scaled Object scale when the Hand moves to a distance that activates Medium Scale ?")]
@@ -151,17 +81,7 @@ public float FarGrowRate
15181
/// <summary>
15282
/// Rate a proximity scaled object scales when the hand moves from medium to close proximity.
15383
/// </summary>
154-
public float MediumGrowRate
155-
{
156-
get
157-
{
158-
return mediumGrowRate;
159-
}
160-
set
161-
{
162-
mediumGrowRate = value;
163-
}
164-
}
84+
public float MediumGrowRate { get => mediumGrowRate; set => mediumGrowRate = value; }
16585

16686
[SerializeField]
16787
[Tooltip("At what rate should a Proximity-scaled object scale when the Hand moves to a distance that activates Close Scale ?")]
@@ -170,16 +90,6 @@ public float MediumGrowRate
17090
/// <summary>
17191
/// Rate a proximity scaled object scales when the hand moves from close proximity to object center
17292
/// </summary>
173-
public float CloseGrowRate
174-
{
175-
get
176-
{
177-
return closeGrowRate;
178-
}
179-
set
180-
{
181-
closeGrowRate = value;
182-
}
183-
}
93+
public float CloseGrowRate { get => closeGrowRate; set => closeGrowRate = value; }
18494
}
18595
}

Assets/MixedRealityToolkit/Utilities/Debug.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)