Improved messaging system between Desktop and overlay. Add VXM Overla…

…y splash. Add Improved Left/Right hand buttons.
Soapwood · May 4, 2024 · 6e91885 · 6e91885
1 parent 4655945
commit 6e91885
Show file tree

Hide file tree

Showing 479 changed files with 949 additions and 538 deletions.
diff --git a/VXMusic/Overlay/VXMMessage.cs b/VXMusic/Overlay/VXMMessage.cs
@@ -2,6 +2,8 @@ namespace VXMusic.Overlay
 {
     public static class VXMMessage
     {
+        public const string VxMusicHeartbeatPipeName = "VXMusicHeartbeatMessagePipe";
+
         public const string CONNECTION_HEARTBEAT_REQUEST = "VX_HEARTBEAT_REQ";
         public const string CONNECTION_HEARTBEAT_ACKNOWLEDGE = "VX_HEARTBEAT_ACK";
 
@@ -14,7 +16,7 @@ public static class VXMMessage
         public const string RECOGNITION_REQUEST = "VX_RECOGNITION_REQ";
         public const string RECOGNITION_ACKNOWLEDGE = "VX_RECOGNITION_ACK";
         public const string RECOGNITION_FINISH = "VX_RECOGNITION_FIN";
-        
+
         public const string ENABLE_OVERLAY_ANCHOR_LEFTHAND_REQUEST = "VX_OVERLAY_ANCHOR_LEFTHAND_REQ";
         public const string ENABLE_OVERLAY_ANCHOR_LEFTHAND_ACKNOWLEDGE = "VX_OVERLAY_ANCHOR_LEFTHAND_ACK";
         public const string ENABLE_OVERLAY_ANCHOR_RIGHTHAND_REQUEST = "VX_OVERLAY_ANCHOR_RIGHTHAND_REQ";

diff --git a/VXMusic/Overlay/VXMusicOverlay.cs b/VXMusic/Overlay/VXMusicOverlay.cs
@@ -37,17 +37,6 @@ public void SendNotification(string title, string content, int timeout, string i
         {
             vxMusicOverlay.SendNotificationInternal(title, content, timeout, image);
         }
-        public void SetLeftOverlayTrackedDevice()
-        {
-            _logger.LogInformation("Setting Overlay tracked device to: Left Hand");
-            vxMusicOverlay.SetOverlayTrackedDeviceInternal(TrackedDeviceRole.LeftHand);
-        }
-
-        public void SetRightHandOverlayTrackedDevice()
-        {
-            _logger.LogInformation("Setting Overlay tracked device to: Right Hand");
-            vxMusicOverlay.SetOverlayTrackedDeviceInternal(TrackedDeviceRole.RightHand);
-        }
 
         public TrackedDeviceRole GetOverlayTrackedDevice()
         {
@@ -158,19 +147,6 @@ public void SendNotificationInternal(string title, string content, int timeout,
             //Marshal.FreeHGlobal(finalBitmap); //TODO NEED THIS
         }
 
-        public void SetOverlayTrackedDeviceInternal(TrackedDeviceRole trackedDeviceRole)
-        {
-            try
-            {
-                TrackedDevice = trackedDeviceRole;
-            }
-            catch (Exception e)
-            {
-                _logger.LogWarning("VR Device was not found, are any controllers turned on?");
-                return;
-            }
-        }
-
         public static NotificationBitmap_t NotificationBitmapFromBitmap(Bitmap bmp, bool flipRnB = true)
         {
             return NotificationBitmapFromBitmapData(BitmapDataFromBitmap(bmp, flipRnB));

diff --git a/VXMusic/VXMusic.csproj b/VXMusic/VXMusic.csproj
@@ -10,6 +10,7 @@
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
       <DebugType>none</DebugType>
+      <PlatformTarget>x64</PlatformTarget>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/VXMusicDesktop/App.xaml.cs b/VXMusicDesktop/App.xaml.cs
@@ -107,9 +107,7 @@ public App() : base()
             Logger.LogTrace($"Booting VXMusic Desktop Client...");
 
             VXMusicSession.Initialise();
-
-            VXMusicOverlayInterface.StartVXMusicDesktopEventListener();
-
+
             VXMusicSession.NotificationClient.SendNotification("Welcome to VXMusic!", "", 5);
         }
 

diff --git a/VXMusicDesktop/Images/LeftHandIconDisabled.png b/VXMusicDesktop/Images/LeftHandIconDisabled.png
diff --git a/VXMusicDesktop/Images/LeftHandIconEnabled.png b/VXMusicDesktop/Images/LeftHandIconEnabled.png
diff --git a/VXMusicDesktop/Images/RightHandIconDisabled.png b/VXMusicDesktop/Images/RightHandIconDisabled.png
diff --git a/VXMusicDesktop/Images/RightHandIconEnabled.png b/VXMusicDesktop/Images/RightHandIconEnabled.png
diff --git a/VXMusicDesktop/MVVM/ViewModel/OverlayViewModel.cs b/VXMusicDesktop/MVVM/ViewModel/OverlayViewModel.cs
@@ -95,17 +95,11 @@ public void SetEnableOverlayOnLeftHand(object commandParameter)
         {
             VXMusicOverlayInterface.SendOverlayAnchorUpdateRequest(
                 VXMMessage.ENABLE_OVERLAY_ANCHOR_LEFTHAND_REQUEST);
-
-            VXUserSettings.Overlay.SetOverlayAnchor(VXMusicOverlayAnchor.LeftHand);
-            App.VXMusicSession.OverlaySettings.OverlayAnchor = VXMusicOverlayAnchor.LeftHand;
         }
 
         public void SetEnableOverlayOnRightHand(object commandParameter)
         {
             VXMusicOverlayInterface.SendOverlayAnchorUpdateRequest(VXMMessage.ENABLE_OVERLAY_ANCHOR_RIGHTHAND_REQUEST);
-
-            VXUserSettings.Overlay.SetOverlayAnchor(VXMusicOverlayAnchor.RightHand);
-            App.VXMusicSession.OverlaySettings.OverlayAnchor = VXMusicOverlayAnchor.RightHand;
         }
     }
 }