From 642122d785e24d4b16cf061aa6b3e2645e903b68 Mon Sep 17 00:00:00 2001 From: Raphiiko Date: Wed, 21 Aug 2024 21:13:28 +0200 Subject: [PATCH] Rename overlay sidecar --- overlay-sidecar.sln => oyasumivr-overlay-sidecar.sln | 2 +- src-core/src/overlay_sidecar/mod.rs | 2 +- src-overlay-sidecar/Overlays/DashboardOverlay.cs | 2 +- src-overlay-sidecar/Overlays/Helpers/OverlayPointer.cs | 4 ++-- src-overlay-sidecar/Overlays/MicMuteIndicatorOverlay.cs | 6 +++--- src-overlay-sidecar/Overlays/NotificationOverlay.cs | 2 +- src-overlay-sidecar/Overlays/SplashOverlay.cs | 2 +- src-overlay-sidecar/Overlays/TooltipOverlay.cs | 2 +- src-overlay-sidecar/Program.cs | 4 ++-- ...rlay-sidecar.csproj => oyasumivr-overlay-sidecar.csproj} | 1 + 10 files changed, 14 insertions(+), 13 deletions(-) rename overlay-sidecar.sln => oyasumivr-overlay-sidecar.sln (78%) rename src-overlay-sidecar/{overlay-sidecar.csproj => oyasumivr-overlay-sidecar.csproj} (97%) diff --git a/overlay-sidecar.sln b/oyasumivr-overlay-sidecar.sln similarity index 78% rename from overlay-sidecar.sln rename to oyasumivr-overlay-sidecar.sln index 3fd2f60d..94ee195d 100644 --- a/overlay-sidecar.sln +++ b/oyasumivr-overlay-sidecar.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "overlay-sidecar", "src-overlay-sidecar\overlay-sidecar.csproj", "{659368EE-58C9-4858-B35B-82B5F0CF6AFA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "oyasumivr-overlay-sidecar", "src-overlay-sidecar\oyasumivr-overlay-sidecar.csproj", "{659368EE-58C9-4858-B35B-82B5F0CF6AFA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src-core/src/overlay_sidecar/mod.rs b/src-core/src/overlay_sidecar/mod.rs index 059e9c87..fa5d43a2 100644 --- a/src-core/src/overlay_sidecar/mod.rs +++ b/src-core/src/overlay_sidecar/mod.rs @@ -21,7 +21,7 @@ pub async fn init() { *SIDECAR_MANAGER.lock().await = Some(SidecarManager::new( "OVERLAY".to_string(), "resources/dotnet-sidecars/".to_string(), - "overlay-sidecar.exe".to_string(), + "oyasumivr-overlay-sidecar.exe".to_string(), tx, true, vec![], diff --git a/src-overlay-sidecar/Overlays/DashboardOverlay.cs b/src-overlay-sidecar/Overlays/DashboardOverlay.cs index 3bb99efd..ebb57a7f 100644 --- a/src-overlay-sidecar/Overlays/DashboardOverlay.cs +++ b/src-overlay-sidecar/Overlays/DashboardOverlay.cs @@ -17,7 +17,7 @@ public class DashboardOverlay : BaseWebOverlay { public event Action? OnClose; public DashboardOverlay() : - base("/dashboard", 1024, "co.raphii.oyasumi:DashboardOverlay_" + Guid.NewGuid(), "OyasumiVR Dashboard Overlay") + base("/dashboard", 1024, "co.raphii.oyasumivr:DashboardOverlay_" + Guid.NewGuid(), "OyasumiVR Dashboard Overlay") { Browser!.JavascriptObjectRepository.Register("OyasumiIPCOut_Dashboard", this); _tooltipOverlay = new TooltipOverlay(); diff --git a/src-overlay-sidecar/Overlays/Helpers/OverlayPointer.cs b/src-overlay-sidecar/Overlays/Helpers/OverlayPointer.cs index 8b415076..9308e4a0 100644 --- a/src-overlay-sidecar/Overlays/Helpers/OverlayPointer.cs +++ b/src-overlay-sidecar/Overlays/Helpers/OverlayPointer.cs @@ -23,14 +23,14 @@ public OverlayPointer() LastUvPosition = Vector2.Zero }; OpenVR.Overlay.CreateOverlay( - "co.raphii.oyasumi:PointerRight", "OyasumiVR Right Pointer", ref _rightPointer.OverlayHandle); + "co.raphii.oyasumivr:PointerRight", "OyasumiVR Right Pointer", ref _rightPointer.OverlayHandle); OpenVR.Overlay.SetOverlayWidthInMeters(_rightPointer.OverlayHandle, 0.02f); _leftPointer = new PointerData() { LastUvPosition = Vector2.Zero }; OpenVR.Overlay.CreateOverlay( - "co.raphii.oyasumi:PointerLeft", "OyasumiVR Left Pointer", ref _leftPointer.OverlayHandle); + "co.raphii.oyasumivr:PointerLeft", "OyasumiVR Left Pointer", ref _leftPointer.OverlayHandle); OpenVR.Overlay.SetOverlayWidthInMeters(_leftPointer.OverlayHandle, 0.02f); // Set sort order for pointer overlays OpenVR.Overlay.SetOverlaySortOrder(_leftPointer.OverlayHandle, 150); diff --git a/src-overlay-sidecar/Overlays/MicMuteIndicatorOverlay.cs b/src-overlay-sidecar/Overlays/MicMuteIndicatorOverlay.cs index 65b0b0e8..2ba66e8f 100644 --- a/src-overlay-sidecar/Overlays/MicMuteIndicatorOverlay.cs +++ b/src-overlay-sidecar/Overlays/MicMuteIndicatorOverlay.cs @@ -29,12 +29,12 @@ public MicMuteIndicatorOverlay() { // Load image resources _muteImage = - Utils.ConvertPngToRgba(Utils.LoadEmbeddedFile("overlay-sidecar.Resources.mic_mute.png")); + Utils.ConvertPngToRgba(Utils.LoadEmbeddedFile("oyasumi-overlay-sidecar.Resources.mic_mute.png")); _unmuteImage = - Utils.ConvertPngToRgba(Utils.LoadEmbeddedFile("overlay-sidecar.Resources.mic_unmute.png")); + Utils.ConvertPngToRgba(Utils.LoadEmbeddedFile("oyasumi-overlay-sidecar.Resources.mic_unmute.png")); _textureWriter = new TextureWriter(512); // Create the overlay - OpenVR.Overlay.CreateOverlay("co.raphii.oyasumi:MicMuteIndicatorOverlay", "OyasumiVR Mic Mute Indicator Overlay", + OpenVR.Overlay.CreateOverlay("co.raphii.oyasumivr:MicMuteIndicatorOverlay", "OyasumiVR Mic Mute Indicator Overlay", ref _overlayHandle); Init(); } diff --git a/src-overlay-sidecar/Overlays/NotificationOverlay.cs b/src-overlay-sidecar/Overlays/NotificationOverlay.cs index 4f08d95d..59496503 100644 --- a/src-overlay-sidecar/Overlays/NotificationOverlay.cs +++ b/src-overlay-sidecar/Overlays/NotificationOverlay.cs @@ -10,7 +10,7 @@ public class NotificationOverlay : BaseWebOverlay { private bool _updatedPositionOnce; public NotificationOverlay() : - base("/notifications", 1024, "co.raphii.oyasumi:NotificationOverlay", "OyasumiVR Notification Overlay") + base("/notifications", 1024, "co.raphii.oyasumivr:NotificationOverlay", "OyasumiVR Notification Overlay") { OpenVR.Overlay.SetOverlayWidthInMeters(OverlayHandle, 0.35f); OpenVR.Overlay.SetOverlaySortOrder(OverlayHandle, 150); diff --git a/src-overlay-sidecar/Overlays/SplashOverlay.cs b/src-overlay-sidecar/Overlays/SplashOverlay.cs index a34e3344..2e07b6a1 100644 --- a/src-overlay-sidecar/Overlays/SplashOverlay.cs +++ b/src-overlay-sidecar/Overlays/SplashOverlay.cs @@ -8,7 +8,7 @@ public class SplashOverlay : BaseWebOverlay { private bool _updatedPositionOnce; public SplashOverlay() : - base("/splash", 1024, "co.raphii.oyasumi:SplashOverlay", "OyasumiVR Splash Overlay") + base("/splash", 1024, "co.raphii.oyasumivr:SplashOverlay", "OyasumiVR Splash Overlay") { OpenVR.Overlay.SetOverlayWidthInMeters(OverlayHandle, 0.35f); OpenVR.Overlay.SetOverlaySortOrder(OverlayHandle, 150); diff --git a/src-overlay-sidecar/Overlays/TooltipOverlay.cs b/src-overlay-sidecar/Overlays/TooltipOverlay.cs index 3fb7aca3..e6bb9098 100644 --- a/src-overlay-sidecar/Overlays/TooltipOverlay.cs +++ b/src-overlay-sidecar/Overlays/TooltipOverlay.cs @@ -14,7 +14,7 @@ public class TooltipOverlay : BaseWebOverlay { private string? _text = ""; public TooltipOverlay() : - base("/tooltip", 512, "co.raphii.oyasumi:TooltipOverlay_" + Guid.NewGuid(), "OyasumiVR Tooltip Overlay") + base("/tooltip", 512, "co.raphii.oyasumivr:TooltipOverlay_" + Guid.NewGuid(), "OyasumiVR Tooltip Overlay") { OpenVR.Overlay.SetOverlayWidthInMeters(OverlayHandle, 0.35f); OpenVR.Overlay.SetOverlaySortOrder(OverlayHandle, 150); diff --git a/src-overlay-sidecar/Program.cs b/src-overlay-sidecar/Program.cs index 7dbdb864..8d1d934b 100644 --- a/src-overlay-sidecar/Program.cs +++ b/src-overlay-sidecar/Program.cs @@ -30,13 +30,13 @@ public static void Main(string[] args) { if (args.Length < 1 || !int.TryParse(args[0], out coreGrpcPort)) { - Log.Error("Usage: overlay-sidecar.exe "); + Log.Error("Usage: oyasumivr-overlay-sidecar.exe "); return; } if (args.Length < 2 || !int.TryParse(args[1], out mainProcessId)) { - Log.Error("Usage: overlay-sidecar.exe "); + Log.Error("Usage: oyasumivr-overlay-sidecar.exe "); return; } } diff --git a/src-overlay-sidecar/overlay-sidecar.csproj b/src-overlay-sidecar/oyasumivr-overlay-sidecar.csproj similarity index 97% rename from src-overlay-sidecar/overlay-sidecar.csproj rename to src-overlay-sidecar/oyasumivr-overlay-sidecar.csproj index cec8524b..200cf63b 100644 --- a/src-overlay-sidecar/overlay-sidecar.csproj +++ b/src-overlay-sidecar/oyasumivr-overlay-sidecar.csproj @@ -11,6 +11,7 @@ true true true + oyasumivr-overlay-sidecar