Merge branch 'develop'

Author: dbirman

Assets/BuildConfig_Win64.buildconfiguration

@@ -6,7 +6,7 @@
             "$type": "Unity.Build.Classic.ClassicBuildProfile, Unity.Build.Classic",
             "$version": 1,
             "Platform": "StandaloneWindows64",
-            "Configuration": 2
+            "Configuration": 3
         },
         {
             "$type": "Unity.Build.Common.SceneList, Unity.Build",

Assets/Prefabs/ProbeQuickSettings.prefab

@@ -270,6 +270,136 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &305682428979672831
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4272272082124123619}
+  - component: {fileID: 5340671941520505319}
+  - component: {fileID: 6511953869910575511}
+  - component: {fileID: 4483219231175694285}
+  m_Layer: 5
+  m_Name: ColorChooser
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4272272082124123619
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 305682428979672831}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7780014941625537522}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 40, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5340671941520505319
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 305682428979672831}
+  m_CullTransparentMesh: 1
+--- !u!114 &6511953869910575511
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 305682428979672831}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Texture: {fileID: 10904, guid: 0000000000000000f000000000000000, type: 0}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+--- !u!114 &4483219231175694285
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 305682428979672831}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6511953869910575511}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 7780014940823821005}
+        m_TargetAssemblyTypeName: TrajectoryPlanner.TP_ProbeQuickSettings, trajectoryplanner.core
+        m_MethodName: ColorChooserCycle
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &478053828454814392
 GameObject:
   m_ObjectHideFlags: 0
@@ -283,7 +413,7 @@ GameObject:
   - component: {fileID: 2740718974103214447}
   - component: {fileID: 6216450312129986884}
   m_Layer: 5
-  m_Name: PhiField
+  m_Name: YawField
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -794,7 +924,7 @@ RectTransform:
   m_Children:
   - {fileID: 5483768808238476271}
   m_Father: {fileID: 7780014941625537522}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1201,7 +1331,7 @@ GameObject:
   - component: {fileID: 6429529014976784022}
   - component: {fileID: 3264174117162513665}
   m_Layer: 5
-  m_Name: SpinField
+  m_Name: RollField
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1825,7 +1955,7 @@ RectTransform:
   m_Children:
   - {fileID: 3196379057461547081}
   m_Father: {fileID: 7780014941625537522}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2082,7 +2212,7 @@ RectTransform:
   m_Children:
   - {fileID: 6717845257106624577}
   m_Father: {fileID: 7780014941625537522}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -3210,7 +3340,7 @@ GameObject:
   - component: {fileID: 2333059665297845773}
   - component: {fileID: 9130500160647048814}
   m_Layer: 5
-  m_Name: SpinText
+  m_Name: RollText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3264,7 +3394,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Roll (spin)
+  m_text: Roll
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -3345,7 +3475,7 @@ GameObject:
   - component: {fileID: 2432878716429543602}
   - component: {fileID: 1345061144091729390}
   m_Layer: 5
-  m_Name: ThetaText
+  m_Name: PitchText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3399,7 +3529,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Pitch (theta)
+  m_text: Pitch
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -3481,7 +3611,7 @@ GameObject:
   - component: {fileID: 6026584682281581957}
   - component: {fileID: 179280910081543160}
   m_Layer: 5
-  m_Name: ThetaField
+  m_Name: PitchField
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4002,7 +4132,7 @@ GameObject:
   - component: {fileID: 1880196881783108444}
   - component: {fileID: 9169877679920279510}
   m_Layer: 5
-  m_Name: PhiText
+  m_Name: YawText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4056,7 +4186,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Yaw (phi)
+  m_text: Yaw
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -4271,7 +4401,7 @@ GameObject:
   - component: {fileID: 6606885910327028956}
   - component: {fileID: 3649124345907682414}
   m_Layer: 5
-  m_Name: ProbeCoordText (1)
+  m_Name: ProbeAngleText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4370,7 +4500,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 271.77, y: 36.87}
+  m_SizeDelta: {x: 235.89, y: 36.87}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7780014939978196861
 CanvasRenderer:
@@ -4595,6 +4725,7 @@ MonoBehaviour:
   _positionFields: {fileID: 8158554547281336636}
   _angleFields: {fileID: 5353964328855063755}
   _lockBehavior: {fileID: 0}
+  _colorChooser: {fileID: 6511953869910575511}
 --- !u!225 &998422518680573451
 CanvasGroup:
   m_ObjectHideFlags: 0
@@ -4864,6 +4995,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7780014939978196859}
+  - {fileID: 4272272082124123619}
   - {fileID: 7605865586710686686}
   - {fileID: 4995972274990330997}
   - {fileID: 6069085482413551680}

…fabs/UI/AutomaticManipulatorControl.meta Assets/Prefabs/UI/EphysCopilot.metaAssets/Prefabs/UI/AutomaticManipulatorControl.meta renamed to Assets/Prefabs/UI/EphysCopilot.meta Assets/Prefabs/UI/AutomaticManipulatorControl.meta renamed to Assets/Prefabs/UI/EphysCopilot.meta

@@ -121,7 +121,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 8493615845065584824}
   m_HandleRect: {fileID: 8361295466311985757}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -580,7 +580,7 @@ GameObject:
   - component: {fileID: 1445278465348587323}
   - component: {fileID: 5483421187078802668}
   m_Layer: 5
-  m_Name: AutomaticManipulatorControlPanel
+  m_Name: EphysCopilotPanel
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -650,15 +650,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _zeroCoordinatePanel:
     ResetZeroCoordinatePanelPrefab: {fileID: 8263761920505935187, guid: 8e78152cb80513c45b3c35cb5a96432f, type: 3}
-    PanelScrollView: {fileID: 2904017589487271391}
     PanelScrollViewContent: {fileID: 7072317697882447797}
   _gotoPanel:
     InsertionSelectionPanelPrefab: {fileID: 4424500575015542408, guid: 3c4cf558240cec14abf3dd9882eba899, type: 3}
-    PanelScrollView: {fileID: 687500095747171540}
     PanelScrollViewContent: {fileID: 7125810125362052674}
   _duraOffsetPanel:
     ResetDuraOffsetPanelPrefab: {fileID: 8263761920505935187, guid: b9c529c14db0a5043baffd6a8baecaf4, type: 3}
-    PanelScrollView: {fileID: 6248915284573402155}
     PanelScrollViewContent: {fileID: 8370024288020303656}
   _drivePanel:
     DrivePanelPrefab: {fileID: 8263761920505935187, guid: 57f71b59395523648b1afe91354e6e46, type: 3}
@@ -986,7 +983,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 5041640443237617115}
   m_HandleRect: {fileID: 3068108255336848725}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -3002,7 +2999,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 5713203697382717340}
   m_HandleRect: {fileID: 538386439288270413}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged: