Skip to content

Commit a515adf

Browse files
committed
fix: preventing reference coordinate from starting at (0,0,0), correctly defaults now to the default
1 parent 556208c commit a515adf

File tree

3 files changed

+24
-16
lines changed

3 files changed

+24
-16
lines changed

Assets/Scenes/TrajectoryPlanner.unity

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3154,15 +3154,15 @@ PrefabInstance:
31543154
objectReference: {fileID: 1703646459}
31553155
- target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
31563156
propertyPath: m_AnchorMax.y
3157-
value: 1
3157+
value: 0
31583158
objectReference: {fileID: 0}
31593159
- target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
31603160
propertyPath: m_AnchorMin.y
3161-
value: 1
3161+
value: 0
31623162
objectReference: {fileID: 0}
31633163
- target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
31643164
propertyPath: m_AnchoredPosition.x
3165-
value: 169.88
3165+
value: 0
31663166
objectReference: {fileID: 0}
31673167
- target: {fileID: 341190943836276264, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
31683168
propertyPath: m_IsOn
@@ -3298,19 +3298,19 @@ PrefabInstance:
32983298
objectReference: {fileID: 0}
32993299
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
33003300
propertyPath: m_AnchorMax.y
3301-
value: 1
3301+
value: 0
33023302
objectReference: {fileID: 0}
33033303
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
33043304
propertyPath: m_AnchorMin.y
3305-
value: 1
3305+
value: 0
33063306
objectReference: {fileID: 0}
33073307
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
33083308
propertyPath: m_AnchoredPosition.x
3309-
value: 354.84
3309+
value: 0
33103310
objectReference: {fileID: 0}
33113311
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
33123312
propertyPath: m_AnchoredPosition.y
3313-
value: -15
3313+
value: 0
33143314
objectReference: {fileID: 0}
33153315
- target: {fileID: 341190944071593138, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
33163316
propertyPath: m_AnchorMax.x
@@ -3590,19 +3590,19 @@ PrefabInstance:
35903590
objectReference: {fileID: 0}
35913591
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
35923592
propertyPath: m_AnchorMax.y
3593-
value: 1
3593+
value: 0
35943594
objectReference: {fileID: 0}
35953595
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
35963596
propertyPath: m_AnchorMin.y
3597-
value: 1
3597+
value: 0
35983598
objectReference: {fileID: 0}
35993599
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
36003600
propertyPath: m_AnchoredPosition.x
3601-
value: 384.91998
3601+
value: 0
36023602
objectReference: {fileID: 0}
36033603
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
36043604
propertyPath: m_AnchoredPosition.y
3605-
value: -15
3605+
value: 0
36063606
objectReference: {fileID: 0}
36073607
- target: {fileID: 341190944411999430, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
36083608
propertyPath: m_AnchorMax.y
@@ -9378,7 +9378,7 @@ PrefabInstance:
93789378
objectReference: {fileID: 0}
93799379
- target: {fileID: 8016510558008620337, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
93809380
propertyPath: RelativeCoordinateChangedEvent.m_PersistentCalls.m_Calls.Array.size
9381-
value: 3
9381+
value: 4
93829382
objectReference: {fileID: 0}
93839383
- target: {fileID: 8016510558008620337, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
93849384
propertyPath: ShowAllProbePanelsChangedEvent.m_PersistentCalls.m_Calls.Array.size
@@ -9915,7 +9915,7 @@ PrefabInstance:
99159915
- target: {fileID: 8016510558008620337, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
99169916
propertyPath: RelativeCoordinateChangedEvent.m_PersistentCalls.m_Calls.Array.data[3].m_Target
99179917
value:
9918-
objectReference: {fileID: 1452920056}
9918+
objectReference: {fileID: 2108153954}
99199919
- target: {fileID: 8016510558008620337, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
99209920
propertyPath: ShowAllProbePanelsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target
99219921
value:
@@ -10046,7 +10046,7 @@ PrefabInstance:
1004610046
objectReference: {fileID: 0}
1004710047
- target: {fileID: 8016510558008620337, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
1004810048
propertyPath: RelativeCoordinateChangedEvent.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName
10049-
value: UpdateReferenceCoordinate
10049+
value: ResetReferenceCoordinate
1005010050
objectReference: {fileID: 0}
1005110051
- target: {fileID: 8016510558008620337, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
1005210052
propertyPath: ShowAllProbePanelsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
@@ -10218,7 +10218,7 @@ PrefabInstance:
1021810218
objectReference: {fileID: 0}
1021910219
- target: {fileID: 8016510558008620337, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
1022010220
propertyPath: RelativeCoordinateChangedEvent.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName
10221-
value: ReferenceCoordBehavior, pinpoint.brain
10221+
value: TrajectoryPlanner.TrajectoryPlannerManager, trajectoryplanner.core
1022210222
objectReference: {fileID: 0}
1022310223
- target: {fileID: 8016510558008620337, guid: 482bfae3ba88b424e96d7fcd669f7b73, type: 3}
1022410224
propertyPath: ShowAllProbePanelsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName

Assets/Scripts/Pinpoint/TrajectoryPlannerManager.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,6 +1110,14 @@ public void ChangeBLRatio(float blRatio)
11101110

11111111
#region Misc
11121112

1113+
public void ResetReferenceCoordinate()
1114+
{
1115+
if (float.IsNaN(Settings.ReferenceCoord.x))
1116+
{
1117+
Settings.ReferenceCoord = Utils.BregmaDefaults[BrainAtlasManager.ActiveReferenceAtlas.Name];
1118+
}
1119+
}
1120+
11131121
public void LinkToVBLSite()
11141122
{
11151123
Application.OpenURL("https://virtualbrainlab.org");

Assets/Scripts/Pinpoint/Utilities/Settings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ public static int Slice3DDropdownOption
313313
}
314314
}
315315

316-
private readonly Vector3 RELCOORD_DEFAULT = new Vector3(0f, 0f ,0f);
316+
private readonly Vector3 RELCOORD_DEFAULT = new Vector3(float.NaN, float.NaN, float.NaN);
317317
public UnityEvent<Vector3> RelativeCoordinateChangedEvent;
318318

319319
public static Vector3 ReferenceCoord

0 commit comments

Comments
 (0)