Merge branch 'development' of https://github.com/realitycollective/co…

…m.realitytoolkit.devtools into feature/tmpro
realitycollective · Jan 23, 2024 · d81fcca · d81fcca
2 parents 0edd333 + ff6aac5
commit d81fcca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Editor/DevToolsPackageModulesInstaller.cs b/Editor/DevToolsPackageModulesInstaller.cs
@@ -55,7 +55,7 @@ public bool Install(ServiceConfiguration serviceConfiguration)
                 return false;
             }
 
-            if (!ServiceManager.Instance.TryGetServiceProfile<IDiagnosticsService, DiagnosticsServiceProfile>(out var cameraServiceProfile))
+            if (!ServiceManager.Instance.TryGetServiceProfile<IDiagnosticsService, DiagnosticsServiceProfile>(out var PlayerServiceProfile))
             {
                 UnityEngine.Debug.LogWarning($"Could not install {serviceConfiguration.InstancedType.Type.Name}.{nameof(DiagnosticsServiceProfile)} not found.");
                 return false;
@@ -65,14 +65,14 @@ public bool Install(ServiceConfiguration serviceConfiguration)
             var typedServiceConfiguration = new ServiceConfiguration<IDiagnosticsServiceModule>(serviceConfiguration.InstancedType.Type, serviceConfiguration.Name, serviceConfiguration.Priority, serviceConfiguration.RuntimePlatforms, serviceConfiguration.Profile);
 
             // Make sure it's not already in the target profile.
-            if (cameraServiceProfile.ServiceConfigurations.All(sc => sc.InstancedType.Type != serviceConfiguration.InstancedType.Type))
+            if (PlayerServiceProfile.ServiceConfigurations.All(sc => sc.InstancedType.Type != serviceConfiguration.InstancedType.Type))
             {
-                cameraServiceProfile.AddConfiguration(typedServiceConfiguration);
-                UnityEngine.Debug.Log($"Successfully installed the {serviceConfiguration.InstancedType.Type.Name} to {cameraServiceProfile.name}.");
+                PlayerServiceProfile.AddConfiguration(typedServiceConfiguration);
+                UnityEngine.Debug.Log($"Successfully installed the {serviceConfiguration.InstancedType.Type.Name} to {PlayerServiceProfile.name}.");
             }
             else
             {
-                UnityEngine.Debug.Log($"Skipped installing the {serviceConfiguration.InstancedType.Type.Name} to {cameraServiceProfile.name}. Already installed.");
+                UnityEngine.Debug.Log($"Skipped installing the {serviceConfiguration.InstancedType.Type.Name} to {PlayerServiceProfile.name}. Already installed.");
             }
 
             return true;

diff --git a/Runtime/DiagnosticsService.cs b/Runtime/DiagnosticsService.cs
@@ -6,7 +6,7 @@
 using RealityCollective.ServiceFramework.Attributes;
 using RealityCollective.ServiceFramework.Definitions.Platforms;
 using RealityCollective.ServiceFramework.Services;
-using RealityToolkit.CameraService.Interfaces;
+using RealityToolkit.PlayerService.Interfaces;
 using RealityToolkit.DevTools.ConsoleDiagnostics;
 using RealityToolkit.DevTools.FrameDiagnostics;
 using RealityToolkit.DevTools.MemoryDiagnostics;
@@ -47,8 +47,8 @@ private Transform RigTransform
             {
                 if (rigTransform == null)
                 {
-                    rigTransform = ServiceManager.Instance.TryGetService<ICameraService>(out var cameraSystem)
-                        ? cameraSystem.CameraRig.RigTransform
+                    rigTransform = ServiceManager.Instance.TryGetService<IPlayerService>(out var playerService)
+                        ? playerService.PlayerRig.RigTransform
                         : Camera.main.transform.parent;
                 }
                 return rigTransform;

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "XR",
     "Mixed Reality"
   ],
-  "version": "1.0.0-pre.3",
+  "version": "1.0.0-pre.4",
   "unity": "2020.3",
   "homepage": "https://github.com/realitycollective",
   "bugs": {