From 7ee3a5faedf2dd71808dbff11f94db5602d34881 Mon Sep 17 00:00:00 2001 From: Kenneth Yang Date: Wed, 16 Apr 2025 14:38:51 -0700 Subject: [PATCH 1/5] Update Rider plugin --- Packages/manifest.json | 2 +- Packages/packages-lock.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index f44fca34..94697d0d 100644 --- a/Packages/manifest.json +++ b/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", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 55921cbd..23efb627 100644 --- a/Packages/packages-lock.json +++ b/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": { From 2bded0dfe28e38c46d61e857b8852460cfc398b4 Mon Sep 17 00:00:00 2001 From: Kenneth Yang Date: Wed, 16 Apr 2025 15:31:54 -0700 Subject: [PATCH 2/5] Bump version number --- ProjectSettings/ProjectSettings.asset | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 82bb3095..d4522071 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/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.1 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 From 24ead99babe07688e047597f688e65fe05df7da9 Mon Sep 17 00:00:00 2001 From: Kenneth Yang Date: Wed, 16 Apr 2025 16:59:55 -0700 Subject: [PATCH 3/5] Migrate to unified Sensapex uMp --- .../UI/SettingsMenu/Menus/EphysLinkMenu.prefab | 12 +++--------- .../UI/EphysLinkSettings/EphysLinkSettings.cs | 13 +++---------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/Assets/Prefabs/UI/SettingsMenu/Menus/EphysLinkMenu.prefab b/Assets/Prefabs/UI/SettingsMenu/Menus/EphysLinkMenu.prefab index c0f54f00..354f1e47 100644 --- a/Assets/Prefabs/UI/SettingsMenu/Menus/EphysLinkMenu.prefab +++ b/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} diff --git a/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs b/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs index 0d4161c1..49252cfb 100644 --- a/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs +++ b/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs @@ -109,7 +109,6 @@ 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); @@ -117,7 +116,7 @@ public void OnTypeChanged(int type) _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 /// 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}"; From 65cba34b3ebc664b466b349e91bf72cdc26a050c Mon Sep 17 00:00:00 2001 From: Kenneth Yang Date: Wed, 16 Apr 2025 17:08:10 -0700 Subject: [PATCH 4/5] Bump Ephys Link --- Assets/Scripts/EphysLink/CommunicationManager.cs | 2 +- .../Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/EphysLink/CommunicationManager.cs b/Assets/Scripts/EphysLink/CommunicationManager.cs index 6794ce2a..93fc30a3 100644 --- a/Assets/Scripts/EphysLink/CommunicationManager.cs +++ b/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)}"; diff --git a/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs b/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs index 49252cfb..9d7b0a4d 100644 --- a/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs +++ b/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.0b0"; private static string EphysLinkExePath => Path.Combine( From fc29273ad3d26ffa350ad7e3a12ffecfb3a22fac Mon Sep 17 00:00:00 2001 From: Kenneth Yang Date: Thu, 17 Apr 2025 00:55:26 -0700 Subject: [PATCH 5/5] Version bump --- .../Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs | 2 +- ProjectSettings/ProjectSettings.asset | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs b/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs index 9d7b0a4d..f42dd036 100644 --- a/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs +++ b/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.1.0b0"; + private const string EPHYS_LINK_NAME = "EphysLink-v2.1.0b1"; private static string EphysLinkExePath => Path.Combine( diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d4522071..3420a5d2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 2.0.1 + bundleVersion: 2.0.1b0 preloadedAssets: - {fileID: 11400000, guid: 6057f25234ce83a4bbb3ae618a501907, type: 2} metroInputSource: 0