775 re add ump 3 (#776)

* Update Rider plugin

* Bump version number

* Migrate to unified Sensapex uMp

* Bump Ephys Link

* Version bump

Author: kjy5

Assets/Prefabs/UI/SettingsMenu/Menus/EphysLinkMenu.prefab

@@ -218,18 +218,12 @@ MonoBehaviour:
   m_MultiSelect: 0
   m_Options:
     m_Options:
-    - m_Text: Sensapex uMp-4
-      m_Image: {fileID: 0}
-      m_Color: {r: 1, g: 1, b: 1, a: 1}
-    - m_Text: Sensapex uMp-3
+    - m_Text: Sensapex uMp
       m_Image: {fileID: 0}
       m_Color: {r: 1, g: 1, b: 1, a: 1}
     - m_Text: New Scale Pathfinder MPM Control v2.8.8+
       m_Image: {fileID: 0}
       m_Color: {r: 1, g: 1, b: 1, a: 1}
-    - m_Text: New Scale M3-USB-3:1-EP
-      m_Image: {fileID: 0}
-      m_Color: {r: 1, g: 1, b: 1, a: 1}
     - m_Text: Local Server
       m_Image: {fileID: 0}
       m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1581,7 +1575,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 8665175951857608260}
   m_HandleRect: {fileID: 2259807623879296756}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -5943,7 +5937,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Sensapex uMp-4
+  m_text: Sensapex uMp
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

Assets/Scripts/EphysLink/CommunicationManager.cs

@@ -22,7 +22,7 @@ public class CommunicationManager : MonoBehaviour
 
         #region Properties
 
-        private static readonly int[] EPHYS_LINK_MIN_VERSION = { 2, 0, 0 };
+        private static readonly int[] EPHYS_LINK_MIN_VERSION = { 2, 1, 0 };
 
         public static readonly string EPHYS_LINK_MIN_VERSION_STRING =
             $"≥ v{string.Join(".", EPHYS_LINK_MIN_VERSION)}";

Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs

@@ -20,7 +20,7 @@ public class EphysLinkSettings : MonoBehaviour
     {
         #region Constants
 
-        private const string EPHYS_LINK_NAME = "EphysLink-v2.0.2";
+        private const string EPHYS_LINK_NAME = "EphysLink-v2.1.0b1";
 
         private static string EphysLinkExePath =>
             Path.Combine(
@@ -109,15 +109,14 @@ private void OnDestroy()
 
         public void OnTypeChanged(int type)
         {
-            print("Type changed to " + type);
             // Show/hide extra groups based on connection type
             _existingServerGroup.SetActive(type == _manipulatorTypeDropdown.options.Count - 2);
             _proxyServerGroup.SetActive(type == _manipulatorTypeDropdown.options.Count - 1);
             _connectButton.SetActive(type >= _manipulatorTypeDropdown.options.Count - 2);
             _launchEphysLinkButton.gameObject.SetActive(
                 type < _manipulatorTypeDropdown.options.Count - 2
             );
-            _pathfinderPortInputField.gameObject.SetActive(type == 2);
+            _pathfinderPortInputField.gameObject.SetActive(type == 1);
 
             // Save settings
             Settings.EphysLinkManipulatorType = type;
@@ -225,14 +224,8 @@ var manipulatorPanel in _manipulatorIdToManipulatorConnectionSettingsPanel.Value
         /// </summary>
         public void OnLaunchEphysLinkPressed()
         {
-            // Parse manipulator type string arg (invariant: custom connection should never happen).
-            var manipulatorTypeString = _manipulatorTypeDropdown.value switch
-            {
-                1 => "ump-3",
-                2 => "pathfinder-mpm",
-                3 => "new-scale",
-                _ => "ump-4"
-            };
+            // Parse manipulator type string arg.
+            var manipulatorTypeString = _manipulatorTypeDropdown.value == 0 ? "ump" : "pathfinder-mpm";
 
             // Make args string (ignore updates, select type).
             var args = $"-i -t {manipulatorTypeString}";

Packages/manifest.json

@@ -3,7 +3,7 @@
     "com.unity.addressables": "2.2.2",
     "com.unity.ai.navigation": "2.0.5",
     "com.unity.animation.rigging": "1.3.0",
-    "com.unity.ide.rider": "3.0.35",
+    "com.unity.ide.rider": "3.0.36",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.inputsystem": "1.11.2",
     "com.unity.memoryprofiler": "1.1.1",

Packages/packages-lock.json

@@ -71,7 +71,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.35",
+      "version": "3.0.36",
       "depth": 0,
       "source": "registry",
       "dependencies": {

ProjectSettings/ProjectSettings.asset

@@ -49,6 +49,7 @@ PlayerSettings:
   m_StereoRenderingPath: 0
   m_ActiveColorSpace: 0
   unsupportedMSAAFallback: 0
+  m_SpriteBatchMaxVertexCount: 65535
   m_SpriteBatchVertexThreshold: 300
   m_MTRendering: 1
   mipStripping: 0
@@ -139,7 +140,7 @@ PlayerSettings:
   loadStoreDebugModeEnabled: 0
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
-  bundleVersion: 2.0
+  bundleVersion: 2.0.1b0
   preloadedAssets:
   - {fileID: 11400000, guid: 6057f25234ce83a4bbb3ae618a501907, type: 2}
   metroInputSource: 0
@@ -433,6 +434,7 @@ PlayerSettings:
   playModeTestRunnerEnabled: 0
   runPlayModeTestAsEditModeTest: 0
   actionOnDotNetUnhandledException: 1
+  editorGfxJobOverride: 1
   enableInternalProfiler: 0
   logObjCUncaughtExceptions: 1
   enableCrashReportAPI: 0
@@ -742,7 +744,7 @@ PlayerSettings:
   apiCompatibilityLevelPerPlatform:
     Standalone: 3
     WebGL: 3
-  editorAssembliesCompatibilityLevel: 1
+  editorAssembliesCompatibilityLevel: 2
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: Template3D