Merge pull request #13 from realitycollective/feature/core-compat

realitycollective · May 7, 2024 · 790b12a · 790b12a
2 parents b78f2da + c5fd21c
commit 790b12a
Show file tree

Hide file tree

Showing 14 changed files with 67 additions and 21 deletions.
diff --git a/Editor/AssemblyInfo.cs b/Editor/AssemblyInfo.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Reality Collective. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System.Reflection;
+
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyTitle("com.realitytoolkit.devicesimulation.editor")]
+[assembly: AssemblyCompany("Reality Collective")]
+[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")]
diff --git a/Editor/AssemblyInfo.cs.meta b/Editor/AssemblyInfo.cs.meta
diff --git a/Editor/DeviceSimulationPackageInstaller.cs b/Editor/DeviceSimulationPackageInstaller.cs
@@ -1,11 +1,12 @@
 // Copyright (c) Reality Collective. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using RealityCollective.Editor.Utilities;
-using RealityCollective.Extensions;
 using RealityCollective.ServiceFramework.Editor;
 using RealityCollective.ServiceFramework.Editor.Packages;
+using RealityCollective.Utilities.Editor;
+using RealityCollective.Utilities.Extensions;
 using RealityToolkit.Editor;
+using RealityToolkit.Editor.Settings;
 using System.IO;
 using UnityEditor;
 
@@ -14,7 +15,7 @@ namespace RealityToolkit.DeviceSimulation.Editor
     [InitializeOnLoad]
     internal static class DeviceSimulationPackageInstaller
     {
-        private static readonly string destinationPath = $"{RealityToolkitPreferences.ProfileGenerationPath}DeviceSimulation";
+        private static readonly string destinationPath = Path.Combine(RealityToolkitEditorSettings.Instance.AssetImportPath, "DeviceSimulation");
         private static readonly string sourcePath = Path.GetFullPath($"{PathFinderUtility.ResolvePath<IPathFinder>(typeof(DeviceSimulationPackagePathFinder)).BackSlashes()}{Path.DirectorySeparatorChar}{RealityToolkitPreferences.HIDDEN_PACKAGE_ASSETS_PATH}");
 
         static DeviceSimulationPackageInstaller()

diff --git a/Editor/RealityToolkit.DeviceSimulation.Editor.asmdef b/Editor/RealityToolkit.DeviceSimulation.Editor.asmdef
@@ -8,7 +8,8 @@
         "GUID:13703f41b24bb904cb2305abe6317e3d",
         "GUID:9753fcbb5b1feaf459f435ac95e51baa",
         "GUID:2a3f0ca4e21332c44bfdce311ea8943e",
-        "GUID:b2d046948d6452a4b8485efc9ce0f88c"
+        "GUID:b2d046948d6452a4b8485efc9ce0f88c",
+        "GUID:4ddd23ea56a3a40f0aa0036d1624a53e"
     ],
     "includePlatforms": [
         "Editor"

diff --git a/Editor/SimulatedControllerServiceModuleProfileInspector.cs b/Editor/SimulatedControllerServiceModuleProfileInspector.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Reality Collective. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using RealityCollective.Editor.Extensions;
+using RealityCollective.ServiceFramework.Editor.Utilities;
 using RealityToolkit.DeviceSimulation.InputService;
 using RealityToolkit.Editor.Profiles.Input.Controllers;
 using UnityEditor;

diff --git a/Editor/SimulatedHandControllerServiceModuleProfileInspector.cs b/Editor/SimulatedHandControllerServiceModuleProfileInspector.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Reality Collective. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using RealityCollective.Editor.Extensions;
+using RealityCollective.ServiceFramework.Editor.Utilities;
 using RealityToolkit.DeviceSimulation.InputService.HandTracking;
 using RealityToolkit.Input.Hands.Poses;
 using UnityEditor;

diff --git a/Runtime/AssemblyInfo.cs b/Runtime/AssemblyInfo.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Reality Collective. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System.Reflection;
+
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyTitle("com.realitytoolkit.devicesimulation")]
+[assembly: AssemblyCompany("Reality Collective")]
+[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")]
diff --git a/Runtime/AssemblyInfo.cs.meta b/Runtime/AssemblyInfo.cs.meta
diff --git a/Runtime/InputService/BaseSimulatedControllerServiceModule.cs b/Runtime/InputService/BaseSimulatedControllerServiceModule.cs
@@ -1,11 +1,10 @@
 // Copyright (c) Reality Collective. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using RealityCollective.Definitions.Utilities;
-using RealityCollective.Extensions;
+using RealityCollective.Utilities.Extensions;
 using RealityToolkit.Input.Controllers;
+using RealityToolkit.Input.Definitions;
 using RealityToolkit.Input.Interfaces;
-using RealityToolkit.Input.Interfaces.Modules;
 using RealityToolkit.Utilities;
 using System;
 using UnityEngine;

diff --git a/Runtime/InputService/HandTracking/SimulatedHandController.cs b/Runtime/InputService/HandTracking/SimulatedHandController.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Reality Collective. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using RealityCollective.Definitions.Utilities;
 using RealityToolkit.Definitions.Controllers;
 using RealityToolkit.Definitions.Devices;
+using RealityToolkit.Input.Definitions;
 using RealityToolkit.Input.Extensions;
 using RealityToolkit.Input.Hands;
 using RealityToolkit.Input.Interfaces.Modules;

diff --git a/Runtime/InputService/HandTracking/SimulatedHandControllerServiceModule.cs b/Runtime/InputService/HandTracking/SimulatedHandControllerServiceModule.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Reality Collective. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using RealityCollective.Definitions.Utilities;
 using RealityCollective.ServiceFramework.Attributes;
 using RealityCollective.ServiceFramework.Definitions.Platforms;
 using RealityCollective.ServiceFramework.Services;

diff --git a/Runtime/InputService/HandTracking/SimulatedHandControllerServiceModuleProfile.cs b/Runtime/InputService/HandTracking/SimulatedHandControllerServiceModuleProfile.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Reality Collective. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using RealityCollective.Definitions.Utilities;
 using RealityToolkit.Definitions.Controllers;
+using RealityToolkit.Input.Definitions;
 using RealityToolkit.Input.Hands;
 using RealityToolkit.Input.Hands.Poses;
 using System.Collections.Generic;

diff --git a/Runtime/InputService/HandTracking/SimulatedHandDataConverter.cs b/Runtime/InputService/HandTracking/SimulatedHandDataConverter.cs
@@ -1,12 +1,12 @@
 // Copyright (c) Reality Collective. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using RealityCollective.Definitions.Utilities;
 using RealityCollective.ServiceFramework.Services;
 using RealityToolkit.Definitions.Devices;
+using RealityToolkit.Input.Definitions;
 using RealityToolkit.Input.Hands;
 using RealityToolkit.Input.Hands.Poses;
-using RealityToolkit.Player.Interfaces;
+using RealityToolkit.Player;
 using RealityToolkit.Utilities;
 using System;
 using System.Collections.Generic;

diff --git a/package.json b/package.json
@@ -2,17 +2,20 @@
   "name": "com.realitytoolkit.devicesimulation",
   "displayName": "RealityToolkit.DeviceSimulation",
   "description": "Development extnsion for the Reality Toolkit implementing simulated controller devices and headsets for faster iteration.",
+  "version": "1.0.0-pre.9",
+  "documentationUrl": "https://realitytoolkit.io",
+  "changelogUrl": "https://github.com/realitycollective/com.realitytoolkit.devicesimulation/releases",
+  "licensesUrl": "https://github.com/realitycollective/com.realitytoolkit.devicesimulation/blob/main/LICENSE.md",
   "keywords": [
     "VR",
     "AR",
     "XR",
     "Mixed Reality"
   ],
-  "version": "1.0.0-pre.9",
-  "unity": "2021.3",
-  "homepage": "https://github.com/realitycollective",
+  "unity": "2022.3",
+  "homepage": "https://realitytoolkit.io",
   "bugs": {
-    "url": "https://github.com/realitycollective/realitytoolkit.dev/issues"
+    "url": "https://github.com/realitycollective/com.realitytoolkit.devicesimulation/issues"
   },
   "license": "MIT",
   "repository": {
@@ -24,14 +27,17 @@
     "email": "[email protected]",
     "url": "https://github.com/realitycollective"
   },
+  "publishConfig": {
+    "registry": "https://package.openupm.com"
+  },
   "dependencies": {
-    "com.realitytoolkit.core": "1.0.0-pre.37",
-    "com.realitytoolkit.player": "1.0.3-pre.1"
+    "com.realitytoolkit.core": "1.0.0-pre.48",
+    "com.realitytoolkit.player": "1.0.4"
   },
   "assets": [
     {
       "displayName": "Default Assets",
       "path": "Assets~/"
     }
   ]
-}
+}