Skip to content

Commit 5a934b3

Browse files
more cleanup / moved menus for bounds control configs into experimental section
1 parent 710003b commit 5a934b3

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/LinksConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
99
/// Configuration for <see cref="Links"/> used in <see cref="BoundsControl"/>
1010
/// This class provides all data members needed to create a link of a bounds control
1111
/// </summary>
12-
[CreateAssetMenu(fileName = "LinksConfiguration", menuName = "Mixed Reality Toolkit/Bounds Control/Links Configuration")]
12+
[CreateAssetMenu(fileName = "LinksConfiguration", menuName = "Mixed Reality Toolkit/Experimental/Bounds Control/Links Configuration")]
1313
public class LinksConfiguration : ScriptableObject
1414
{
1515
#region Serialized Properties

Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/RotationHandlesConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
77
/// Configuration for <see cref="RotationHandles"/> used in <see cref="BoundsControl"/>
88
/// This class provides all data members needed to create rotation handles for <see cref="BoundsControl"/>
99
/// </summary>
10-
[CreateAssetMenu(fileName = "RotationHandlesConfiguration", menuName = "Mixed Reality Toolkit/Bounds Control/Rotation Handles Configuration")]
10+
[CreateAssetMenu(fileName = "RotationHandlesConfiguration", menuName = "Mixed Reality Toolkit/Experimental/Bounds Control/Rotation Handles Configuration")]
1111
public class RotationHandlesConfiguration : HandlesBaseConfiguration
1212
{
1313

Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/ScaleHandlesConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
77
/// Configuration for <see cref="ScaleHandles"/> used in <see cref="BoundsControl"/>
88
/// This class provides all data members needed to create scale handles for <see cref="BoundsControl"/>
99
/// </summary>
10-
[CreateAssetMenu(fileName = "ScaleHandlesConfiguration", menuName = "Mixed Reality Toolkit/Bounds Control/Scale Handles Configuration")]
10+
[CreateAssetMenu(fileName = "ScaleHandlesConfiguration", menuName = "Mixed Reality Toolkit/Experimental/Bounds Control/Scale Handles Configuration")]
1111
public class ScaleHandlesConfiguration : HandlesBaseConfiguration
1212
{
1313
#region serialized fields

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void UpdateScaling(Vector3 boundsCenter, Vector3 boundsExtents)
148148
}
149149

150150
// Get the max radius possible of our current bounds and extent the range to include proximity scaled objects
151-
float squareMaxLength= boundsExtents.sqrMagnitude + (3 * config.ObjectMediumProximity * config.ObjectMediumProximity);
151+
float squareMaxLength = boundsExtents.sqrMagnitude + (3 * config.ObjectMediumProximity * config.ObjectMediumProximity);
152152

153153
// Grab points within sphere of influence from valid pointers
154154
foreach (var pointer in proximityPointers)
@@ -282,11 +282,11 @@ private bool IsPointWithinBounds(Vector3 position, Vector3 point, float radiusSq
282282
/// <returns>ProximityState for given distance</returns>
283283
private ProximityState GetProximityState(float sqrDistance)
284284
{
285-
if (sqrDistance <= (config.ObjectCloseProximity * config.ObjectCloseProximity))
285+
if (sqrDistance <= config.ObjectCloseProximity * config.ObjectCloseProximity)
286286
{
287287
return ProximityState.CloseProximity;
288288
}
289-
else if (sqrDistance <= (config.ObjectMediumProximity * config.ObjectMediumProximity))
289+
else if (sqrDistance <= config.ObjectMediumProximity * config.ObjectMediumProximity)
290290
{
291291
return ProximityState.MediumProximity;
292292
}

Assets/MixedRealityToolkit.Tests/PlayModeTests/Experimental/BoundsControlTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ public IEnumerator ProximityOnScaleHandles()
343343
var bbox = InstantiateSceneAndDefaultBbox();
344344
yield return VerifyInitialBoundsCorrect(bbox);
345345

346-
//--- 1. test no proximity scaling active per default
346+
// 1. test no proximity scaling active per default
347347
ScaleHandlesConfiguration scaleHandleConfig = bbox.ScaleHandlesConfiguration;
348348
Vector3 defaultHandleSize = Vector3.one * scaleHandleConfig.HandleSize;
349349

@@ -373,7 +373,7 @@ public IEnumerator ProximityOnScaleHandles()
373373
//// reset hand
374374
yield return hand.MoveTo(initialHandPosition);
375375

376-
//--- 2. enable proximity scaling and test defaults
376+
// 2. enable proximity scaling and test defaults
377377
ProximityEffectConfiguration proximityConfig = bbox.HandleProximityEffectConfiguration;
378378
proximityConfig.ProximityEffectActive = true;
379379
proximityConfig.CloseGrowRate = 1.0f;
@@ -386,7 +386,7 @@ public IEnumerator ProximityOnScaleHandles()
386386
// reset hand
387387
yield return hand.MoveTo(initialHandPosition);
388388

389-
//--- 3. now test custom configuration is applied during runtime
389+
// 3. now test custom configuration is applied during runtime
390390
proximityConfig.CloseScale = 4.0f;
391391
proximityConfig.MediumScale = 3.0f;
392392
proximityConfig.FarScale = 2.0f;

0 commit comments

Comments
 (0)