Skip to content

Commit 74dc67d

Browse files
committed
moved OnScanDone event next to ScanStateChanged
1 parent e761ae3 commit 74dc67d

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstanding.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ public enum ScanStates
3636
[Tooltip("Update period used after the scanning process is completed")]
3737
public float UpdatePeriod_AfterScanning = 4.0f;
3838

39-
public event OnScanDoneDelegate OnScanDone;
40-
public delegate void OnScanDoneDelegate();
41-
4239
// Properties
4340
/// <summary>
4441
/// Switch used by the entire SpatialUnderstanding module to activate processing.
@@ -51,11 +48,6 @@ public bool AllowSpatialUnderstanding
5148
}
5249
}
5350

54-
/// <summary>
55-
/// Has any mesh sectors been scanned
56-
/// </summary>
57-
public bool HasMeshSectors { get { return UnderstandingCustomMesh.HasMeshSectors; } }
58-
5951
/// <summary>
6052
/// Reference to the SpatialUnderstandingDLL class (wraps the understanding dll functions).
6153
/// </summary>
@@ -106,7 +98,14 @@ public bool ScanStatsReportStillWorking
10698
}
10799
}
108100

101+
public delegate void OnScanDoneDelegate();
102+
109103
// Events
104+
/// <summary>
105+
/// Event indicating that the scan is done
106+
/// </summary>
107+
public event OnScanDoneDelegate OnScanDone;
108+
110109
/// <summary>
111110
/// Event indicating that the scan state has changed
112111
/// </summary>
@@ -265,7 +264,7 @@ private void Update_Scan(float deltaTime)
265264

266265
// Mark it
267266
ScanState = ScanStates.Done;
268-
OnScanDone.Invoke();
267+
if (OnScanDone != null) OnScanDone.Invoke();
269268
}
270269
}
271270
}

0 commit comments

Comments
 (0)