Skip to content

Commit 75a44d0

Browse files
neogeekneogeek
committed
Formatted code.
1 parent 6f4dad4 commit 75a44d0

File tree

7 files changed

+56
-65
lines changed

7 files changed

+56
-65
lines changed

‎Scripts/ARDistanceFromPlane.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@ private void Start()
4646
private void Update()
4747
{
4848

49-
if (planeManager.enabled && DistanceUpdate != null)
49+
if (!planeManager.enabled || DistanceUpdate == null)
5050
{
51+
return;
52+
}
5153

52-
var planeVisible = ARFoundationExtensions.IsLookingAtPlane(sessionOrigin, planeManager, out var pose);
53-
54-
var distanceFromPlane = sessionOrigin.camera.transform.position - pose.position;
54+
var planeVisible = ARFoundationExtensions.IsLookingAtPlane(sessionOrigin, planeManager, out var pose);
5555

56-
DistanceUpdate?.Invoke(planeVisible, Mathf.Abs(distanceFromPlane.magnitude));
56+
var distanceFromPlane = sessionOrigin.camera.transform.position - pose.position;
5757

58-
}
58+
DistanceUpdate?.Invoke(planeVisible, Mathf.Abs(distanceFromPlane.magnitude));
5959

6060
}
6161

‎Scripts/ARFoundationExtensions.cs‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,18 @@ public static bool RaycastToPlane(Vector3 position, ARSessionOrigin sessionOrigi
2020

2121
plane = null;
2222

23-
if (sessionOrigin.Raycast(position, hits, TrackableType.PlaneWithinPolygon))
23+
if (!sessionOrigin.Raycast(position, hits, TrackableType.PlaneWithinPolygon))
2424
{
25+
return false;
26+
}
2527

26-
var hit = hits[0];
27-
28-
pose = hit.pose;
28+
var hit = hits[0];
2929

30-
plane = planeManager.TryGetPlane(hit.trackableId);
30+
pose = hit.pose;
3131

32-
return true;
32+
plane = planeManager.TryGetPlane(hit.trackableId);
3333

34-
}
35-
36-
return false;
34+
return true;
3735

3836
}
3937

@@ -65,21 +63,14 @@ public static bool HasTouchedPlane(ARSessionOrigin sessionOrigin, ARPlaneManager
6563

6664
plane = null;
6765

68-
if (Input.touchSupported && Input.touchCount > 0)
66+
if (!Input.touchSupported || Input.touchCount <= 0)
6967
{
70-
71-
var touch = Input.GetTouch(0);
72-
73-
if (touch.phase == TouchPhase.Began)
74-
{
75-
76-
return RaycastToPlane(touch.position, sessionOrigin, planeManager, out pose, out plane);
77-
78-
}
79-
68+
return false;
8069
}
8170

82-
return false;
71+
var touch = Input.GetTouch(0);
72+
73+
return touch.phase == TouchPhase.Began && RaycastToPlane(touch.position, sessionOrigin, planeManager, out pose, out plane);
8374

8475
}
8576

‎Scripts/ARPlaceObjectOnPlane.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ public void PlaceObjectOnPlane(Pose pose, ARPlane plane)
7272
private void OnEnable()
7373
{
7474

75-
if (objectToPlace && objectToPlace.scene.IsValid())
75+
if (!objectToPlace || !objectToPlace.scene.IsValid())
7676
{
77+
return;
78+
}
7779

78-
objectToPlaceActiveState = objectToPlace.activeSelf;
79-
80-
objectToPlace.SetActive(false);
80+
objectToPlaceActiveState = objectToPlace.activeSelf;
8181

82-
}
82+
objectToPlace.SetActive(false);
8383

8484
}
8585

‎Scripts/ARPlaneEvents.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,29 +57,29 @@ private void Start()
5757
private void Update()
5858
{
5959

60-
if (planeManager.enabled)
60+
if (!planeManager.enabled)
6161
{
62+
return;
63+
}
6264

63-
var planeVisible = ARFoundationExtensions.IsLookingAtPlane(sessionOrigin, planeManager, out var lookingAtPose, out var lookingAtPlane);
64-
65-
PlaneUpdated?.Invoke(planeVisible, lookingAtPose, lookingAtPlane);
66-
67-
if (InputManager.GetInputDown(out var currentFingerId) && EventSystem.current?.IsPointerOverGameObject(currentFingerId) != true)
68-
{
69-
70-
if (ARFoundationExtensions.HasTouchedPlane(sessionOrigin, planeManager, out var touchPose, out var touchPlane))
71-
{
65+
var planeVisible = ARFoundationExtensions.IsLookingAtPlane(sessionOrigin, planeManager, out var lookingAtPose, out var lookingAtPlane);
7266

73-
PlaneTouchedWithTouchPosition?.Invoke(touchPose, touchPlane);
67+
PlaneUpdated?.Invoke(planeVisible, lookingAtPose, lookingAtPlane);
7468

75-
}
69+
if (!InputManager.GetInputDown(out var currentFingerId) || EventSystem.current?.IsPointerOverGameObject(currentFingerId) == true)
70+
{
71+
return;
72+
}
7673

77-
PlaneTouchedWithLookingAtPosition?.Invoke(lookingAtPose, lookingAtPlane);
74+
if (ARFoundationExtensions.HasTouchedPlane(sessionOrigin, planeManager, out var touchPose, out var touchPlane))
75+
{
7876

79-
}
77+
PlaneTouchedWithTouchPosition?.Invoke(touchPose, touchPlane);
8078

8179
}
8280

81+
PlaneTouchedWithLookingAtPosition?.Invoke(lookingAtPose, lookingAtPlane);
82+
8383
}
8484

8585
}

‎Scripts/ARShowPlacementMarkerOnPlane.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,23 @@ public void ShowPlacementMarkerOnPlane(bool planeVisible, Pose pose, ARPlane pla
7979
private void SetupPlacementMarker()
8080
{
8181

82-
if (_placementMarker)
82+
if (!_placementMarker)
8383
{
84+
return;
85+
}
8486

85-
if (_placementMarker.scene.IsValid())
86-
{
87-
88-
placementMarkerActiveState = _placementMarker.activeSelf;
89-
90-
_placementMarker.SetActive(false);
87+
if (_placementMarker.scene.IsValid())
88+
{
9189

92-
}
90+
placementMarkerActiveState = _placementMarker.activeSelf;
9391

94-
placementMarkerGameObject = Instantiate(_placementMarker);
95-
placementMarkerGameObject.SetActive(false);
92+
_placementMarker.SetActive(false);
9693

9794
}
9895

96+
placementMarkerGameObject = Instantiate(_placementMarker);
97+
placementMarkerGameObject.SetActive(false);
98+
9999
}
100100

101101
private void CleanupPlacementMarker()

‎Scripts/CustomEditor/AutoPopulateScene.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private static void SetupARFoundationGameObjects()
4848

4949
}
5050

51-
var defaultPlanePrefabPath = "Assets/AR Default Plane.prefab";
51+
const string defaultPlanePrefabPath = "Assets/AR Default Plane.prefab";
5252

5353
var defaultPlanePrefab = AssetDatabase.LoadAssetAtPath<GameObject>(defaultPlanePrefabPath);
5454

@@ -83,7 +83,7 @@ private static void SetupARFoundationComponentsGameObjects()
8383

8484
UnityEventTools.AddPersistentListener(planeEvents.PlaneTouchedWithTouchPosition, placeObjectsOnPlane.PlaceObjectOnPlane);
8585

86-
var cubePrefabPath = "Assets/Cube.prefab";
86+
const string cubePrefabPath = "Assets/Cube.prefab";
8787

8888
var cubePrefab = AssetDatabase.LoadAssetAtPath<GameObject>(cubePrefabPath);
8989

‎Scripts/SetEnabledStateOfObjectsOnEvent.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ public void SetEnabledStateOfObjects(bool enabledState)
1414
foreach (var obj in objects)
1515
{
1616

17-
if (obj is MonoBehaviour)
17+
switch (obj)
1818
{
19+
case MonoBehaviour behaviour:
20+
behaviour.enabled = enabledState;
1921

20-
((MonoBehaviour)obj).enabled = enabledState;
22+
break;
2123

22-
}
23-
else if (obj is GameObject)
24-
{
25-
26-
((GameObject)obj).SetActive(enabledState);
24+
case GameObject o:
25+
o.SetActive(enabledState);
2726

27+
break;
2828
}
2929

3030
}

0 commit comments

Comments
 (0)