Skip to content

Commit 767de43

Browse files
dbirmandbirman
committed
fix: fixing a race condition in ReferenceCoord
Also clarified messages in loading screens
1 parent 61d05c6 commit 767de43

File tree

3 files changed

+40
-25
lines changed

3 files changed

+40
-25
lines changed

‎Assets/Scenes/TrajectoryPlanner.unity‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3052,15 +3052,15 @@ PrefabInstance:
30523052
objectReference: {fileID: 1703646459}
30533053
- target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
30543054
propertyPath: m_AnchorMax.y
3055-
value: 1
3055+
value: 0
30563056
objectReference: {fileID: 0}
30573057
- target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
30583058
propertyPath: m_AnchorMin.y
3059-
value: 1
3059+
value: 0
30603060
objectReference: {fileID: 0}
30613061
- target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
30623062
propertyPath: m_AnchoredPosition.x
3063-
value: 169.88
3063+
value: 0
30643064
objectReference: {fileID: 0}
30653065
- target: {fileID: 341190943836276264, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
30663066
propertyPath: m_IsOn
@@ -3196,19 +3196,19 @@ PrefabInstance:
31963196
objectReference: {fileID: 0}
31973197
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
31983198
propertyPath: m_AnchorMax.y
3199-
value: 1
3199+
value: 0
32003200
objectReference: {fileID: 0}
32013201
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
32023202
propertyPath: m_AnchorMin.y
3203-
value: 1
3203+
value: 0
32043204
objectReference: {fileID: 0}
32053205
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
32063206
propertyPath: m_AnchoredPosition.x
3207-
value: 354.84
3207+
value: 0
32083208
objectReference: {fileID: 0}
32093209
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
32103210
propertyPath: m_AnchoredPosition.y
3211-
value: -15
3211+
value: 0
32123212
objectReference: {fileID: 0}
32133213
- target: {fileID: 341190944071593138, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
32143214
propertyPath: m_AnchorMax.x
@@ -3488,19 +3488,19 @@ PrefabInstance:
34883488
objectReference: {fileID: 0}
34893489
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
34903490
propertyPath: m_AnchorMax.y
3491-
value: 1
3491+
value: 0
34923492
objectReference: {fileID: 0}
34933493
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
34943494
propertyPath: m_AnchorMin.y
3495-
value: 1
3495+
value: 0
34963496
objectReference: {fileID: 0}
34973497
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
34983498
propertyPath: m_AnchoredPosition.x
3499-
value: 384.91998
3499+
value: 0
35003500
objectReference: {fileID: 0}
35013501
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
35023502
propertyPath: m_AnchoredPosition.y
3503-
value: -15
3503+
value: 0
35043504
objectReference: {fileID: 0}
35053505
- target: {fileID: 341190944411999430, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
35063506
propertyPath: m_AnchorMax.y
@@ -10689,7 +10689,7 @@ PrefabInstance:
1068910689
objectReference: {fileID: 0}
1069010690
- target: {fileID: 8016510558008620343, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
1069110691
propertyPath: StartupEvent_Complete.m_PersistentCalls.m_Calls.Array.size
10692-
value: 2
10692+
value: 3
1069310693
objectReference: {fileID: 0}
1069410694
- target: {fileID: 8016510558008620343, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
1069510695
propertyPath: StartupEvent_MetaLoaded.m_PersistentCalls.m_Calls.Array.size
@@ -10766,7 +10766,7 @@ PrefabInstance:
1076610766
- target: {fileID: 8016510558008620343, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
1076710767
propertyPath: StartupEvent_Complete.m_PersistentCalls.m_Calls.Array.data[2].m_Target
1076810768
value:
10769-
objectReference: {fileID: 2108153968}
10769+
objectReference: {fileID: 1452920056}
1077010770
- target: {fileID: 8016510558008620343, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
1077110771
propertyPath: StartupEvent_MetaLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
1077210772
value: 1
@@ -10909,7 +10909,7 @@ PrefabInstance:
1090910909
objectReference: {fileID: 0}
1091010910
- target: {fileID: 8016510558008620343, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
1091110911
propertyPath: StartupEvent_Complete.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
10912-
value: ResetTransformDropdownIndex
10912+
value: DelayedStart
1091310913
objectReference: {fileID: 0}
1091410914
- target: {fileID: 8016510558008620343, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
1091510915
propertyPath: StartupEvent_RefAtlasLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
@@ -11105,7 +11105,7 @@ PrefabInstance:
1110511105
objectReference: {fileID: 0}
1110611106
- target: {fileID: 8016510558008620343, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
1110711107
propertyPath: StartupEvent_Complete.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName
11108-
value: PinpointAtlasManager, trajectoryplanner.core
11108+
value: ReferenceCoordBehavior, pinpoint.brain
1110911109
objectReference: {fileID: 0}
1111011110
- target: {fileID: 8016510558008620343, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
1111111111
propertyPath: StartupEvent_AnnotationTextureLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_CallState

‎Assets/Scripts/Brain/ReferenceCoordBehavior.cs‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,20 @@ public class ReferenceCoordBehavior : MonoBehaviour
1212

1313
private bool _started;
1414

15-
private void Start()
15+
/// <summary>
16+
/// Triggered from StartupComplete event on TPM
17+
/// </summary>
18+
public void DelayedStart()
1619
{
20+
UpdateReferenceCoordinate();
21+
UpdateAxisDirections();
22+
1723
_started = true;
1824
}
1925

2026
private void OnEnable()
2127
{
22-
if (_started)
28+
if (_started == true)
2329
{
2430
UpdateReferenceCoordinate();
2531
UpdateAxisDirections();
@@ -48,11 +54,20 @@ public void UpdateAxisDirections()
4854

4955
private void SetAxisDirections(Vector3 apDir, Vector3 mlDir, Vector3 dvDir)
5056
{
51-
_apLine.SetPosition(0, transform.position);
52-
_mlLine.SetPosition(0, transform.position);
53-
_dvLine.SetPosition(0, transform.position);
54-
_apLine.SetPosition(1, transform.position + apDir);
55-
_mlLine.SetPosition(1, transform.position + mlDir);
56-
_dvLine.SetPosition(1, transform.position + dvDir);
57+
if (_apLine != null)
58+
{
59+
_apLine.SetPosition(0, transform.position);
60+
_apLine.SetPosition(1, transform.position + apDir);
61+
}
62+
if (_mlLine != null)
63+
{
64+
_mlLine.SetPosition(0, transform.position);
65+
_mlLine.SetPosition(1, transform.position + mlDir);
66+
}
67+
if (_dvLine != null)
68+
{
69+
_dvLine.SetPosition(0, transform.position);
70+
_dvLine.SetPosition(1, transform.position + dvDir);
71+
}
5772
}
5873
}

‎Assets/Scripts/Pinpoint/UI/LoadingUI.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ private void Awake()
1818

1919
public void MetaLoaded()
2020
{
21-
_loadingText.text = $"{baseString}acquiring 3D mesh files";
21+
_loadingText.text = $"{baseString}acquiring and transforming 3D mesh files";
2222
}
2323

2424
public void AtlasLoaded()
@@ -33,7 +33,7 @@ public void AnnotationsLoaded()
3333

3434
public void SceneLoaded()
3535
{
36-
_loadingText.text = $"{baseString}let's go!";
36+
_loadingText.text = $"{baseString}loading settings and launching app!";
3737
}
3838

3939
public void Complete()

0 commit comments

Comments
 (0)