Core compatibility restored (#39)

Co-authored-by: Simon (Darkside) Jackson <[email protected]>
realitycollective · May 7, 2024 · 44e4d60 · 44e4d60
1 parent fd270d2
commit 44e4d60
Show file tree

Hide file tree

Showing 24 changed files with 101 additions and 30 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.metaplatform.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/BuildPipeline/AssemblyInfo.cs b/Editor/BuildPipeline/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.metaplatform.editor.buildpipeline")]
+[assembly: AssemblyCompany("Reality Collective")]
+[assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")]
diff --git a/Editor/BuildPipeline/AssemblyInfo.cs.meta b/Editor/BuildPipeline/AssemblyInfo.cs.meta
diff --git a/Editor/MetaHandControllerServiceModuleProfileInspector.cs b/Editor/MetaHandControllerServiceModuleProfileInspector.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.Editor.Profiles.Input.Controllers;
 using RealityToolkit.MetaPlatform.InputService.Profiles;
 using RealityToolkit.MetaPlatform.Plugins;

diff --git a/Editor/MetaPackageInstaller.cs b/Editor/MetaPackageInstaller.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.MetaPlatform.Editor
     [InitializeOnLoad]
     internal static class MetaPackageInstaller
     {
-        private static readonly string destinationPath = $"{RealityToolkitPreferences.ProfileGenerationPath}Meta";
+        private static readonly string destinationPath = Path.Combine(RealityToolkitEditorSettings.Instance.AssetImportPath, "Meta");
         private static readonly string sourcePath = Path.GetFullPath($"{PathFinderUtility.ResolvePath<IPathFinder>(typeof(MetaPackagePathFinder)).BackSlashes()}{Path.DirectorySeparatorChar}{RealityToolkitPreferences.HIDDEN_PACKAGE_ASSETS_PATH}");
 
         static MetaPackageInstaller()

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

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.metaplatform")]
+[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/BaseMetaController.cs b/Runtime/InputService/BaseMetaController.cs
@@ -1,10 +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 RealityToolkit.Definitions.Controllers;
 using RealityToolkit.Definitions.Devices;
 using RealityToolkit.Input.Controllers;
+using RealityToolkit.Input.Definitions;
 using RealityToolkit.Input.Extensions;
 using RealityToolkit.Input.Interfaces.Modules;
 using RealityToolkit.MetaPlatform.Plugins;

diff --git a/Runtime/InputService/Extensions/HandednessExtensions.cs b/Runtime/InputService/Extensions/HandednessExtensions.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.Definitions.Utilities;
+using RealityToolkit.Input.Definitions;
 using RealityToolkit.MetaPlatform.Plugins;
 using UnityEngine;
 
@@ -10,7 +10,7 @@ namespace RealityToolkit.MetaPlatform.InputService.Extensions
     public static class HandednessExtensions
     {
         /// <summary>
-        /// Converts an <see cref="OculusApi.Controller"/> mask to a XRTK <see cref="Handedness"/>.
+        /// Converts an <see cref="OculusApi.Controller"/> mask to a Reality Toolkit <see cref="Handedness"/>.
         /// </summary>
         /// <param name="controller">Controller mask.</param>
         /// <returns>Handedness.</returns>

diff --git a/Runtime/InputService/MetaHandControllerServiceModule.cs b/Runtime/InputService/MetaHandControllerServiceModule.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.Services;
 using RealityToolkit.Definitions.Devices;

diff --git a/Runtime/InputService/MetaRemoteController.cs b/Runtime/InputService/MetaRemoteController.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.Interfaces.Modules;
 using RealityToolkit.MetaPlatform.Plugins;
 

diff --git a/Runtime/InputService/MetaTouchController.cs b/Runtime/InputService/MetaTouchController.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.Interfaces.Modules;
 using RealityToolkit.MetaPlatform.Plugins;
 

diff --git a/Runtime/InputService/Profiles/MetaControllerServiceModuleProfile.cs b/Runtime/InputService/Profiles/MetaControllerServiceModuleProfile.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using RealityToolkit.Definitions.Controllers;
-using RealityCollective.Definitions.Utilities;
+using RealityToolkit.Input.Definitions;
 
 namespace RealityToolkit.MetaPlatform.InputService.Profiles
 {

diff --git a/Runtime/InputService/Utilities/MetaHandDataConverter.cs b/Runtime/InputService/Utilities/MetaHandDataConverter.cs
@@ -1,15 +1,15 @@
 // 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.ServiceFramework.Services;
+using RealityCollective.Utilities.Extensions;
 using RealityToolkit.Definitions.Devices;
+using RealityToolkit.Input.Definitions;
 using RealityToolkit.Input.Hands;
 using RealityToolkit.Input.Hands.Utilities;
 using RealityToolkit.MetaPlatform.InputService.Extensions;
 using RealityToolkit.MetaPlatform.Plugins;
-using RealityToolkit.Player.Interfaces;
+using RealityToolkit.Player;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
@@ -153,7 +153,7 @@ private Pose[] GetJointPoses(Handedness handedness)
         private Pose GetJointPose(Handedness handedness, OculusApi.Bone bone)
         {
             // The Pinky/Thumb 1+ bones depend on the Pinky/Thumb 0 bone
-            // to be available, which the XRTK hand tracking does not use. We still have to compute them to
+            // to be available, which the Reality Toolkit hand tracking does not use. We still have to compute them to
             // be able to resolve pose relation dependencies.
             if (bone.Id == OculusApi.BoneId.Hand_Thumb1)
             {

diff --git a/Runtime/MetaPlatform.cs b/Runtime/MetaPlatform.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.Extensions;
 using RealityCollective.ServiceFramework.Definitions.Platforms;
 using RealityCollective.ServiceFramework.Interfaces;
+using RealityCollective.Utilities.Extensions;
 using RealityToolkit.MetaPlatform.Plugins;
 using System.Linq;
 using Unity.XR.Oculus;

diff --git a/Runtime/PlayerService.meta → Runtime/Player.meta b/Runtime/PlayerService.meta → Runtime/Player.meta
diff --git a/Runtime/Player/Rigs.meta b/Runtime/Player/Rigs.meta
diff --git a/...yerService/IMetaPlayerRigServiceModule.cs → ...layer/Rigs/IMetaPlayerRigServiceModule.cs b/...yerService/IMetaPlayerRigServiceModule.cs → ...layer/Rigs/IMetaPlayerRigServiceModule.cs
@@ -1,9 +1,9 @@
-// Copyright (c) Reality Collective. All rights reserved.
+// Copyright (c) Reality Collective. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using RealityToolkit.Player.Interfaces;
+using RealityToolkit.Player.Rigs;
 
-namespace RealityToolkit.MetaPlatform.PlayerService
+namespace RealityToolkit.MetaPlatform.Player.Rigs
 {
     /// <summary>
     /// Fully qualifies the <see cref="MetaPlatform"/> specific implementation of <see cref="IPlayerRigServiceModule"/>.

diff --git a/...rvice/IMetaPlayerRigServiceModule.cs.meta → .../Rigs/IMetaPlayerRigServiceModule.cs.meta b/...rvice/IMetaPlayerRigServiceModule.cs.meta → .../Rigs/IMetaPlayerRigServiceModule.cs.meta
diff --git a/...ayerService/MetaPlayerRigServiceModule.cs → ...Player/Rigs/MetaPlayerRigServiceModule.cs b/...ayerService/MetaPlayerRigServiceModule.cs → ...Player/Rigs/MetaPlayerRigServiceModule.cs
@@ -3,11 +3,10 @@
 
 using RealityCollective.ServiceFramework.Attributes;
 using RealityToolkit.MetaPlatform.Plugins;
-using RealityToolkit.Player.Definitions;
-using RealityToolkit.Player.Interfaces;
-using RealityToolkit.Player.Modules;
+using RealityToolkit.Player;
+using RealityToolkit.Player.Rigs;
 
-namespace RealityToolkit.MetaPlatform.PlayerService
+namespace RealityToolkit.MetaPlatform.Player.Rigs
 {
     [RuntimePlatform(typeof(MetaPlatform))]
     [System.Runtime.InteropServices.Guid("83EFF552-ADF4-47C8-AD53-DF7406856D3F")]

diff --git a/...ervice/MetaPlayerRigServiceModule.cs.meta → ...r/Rigs/MetaPlayerRigServiceModule.cs.meta b/...ervice/MetaPlayerRigServiceModule.cs.meta → ...r/Rigs/MetaPlayerRigServiceModule.cs.meta
diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
   "name": "com.realitytoolkit.metaplatform",
   "displayName": "RealityToolkit.MetaPlatform",
   "description": "The Meta platform module for the Reality Toolkit by the Reality Collective.",
+  "version": "1.0.0-pre.13",
   "documentationUrl": "https://www.realitytoolkit.io/",
   "changelogUrl": "https://github.com/realitycollective/com.realitytoolkit.metaplatform/releases",
   "licensesUrl": "https://github.com/realitycollective/com.realitytoolkit.metaplatform/blob/main/LICENSE.md",
@@ -17,11 +18,10 @@
     "oculus",
     "quest"
   ],
-  "version": "1.0.0-pre.13",
   "unity": "2022.3",
-  "homepage": "https://github.com/realitycollective",
+  "homepage": "https://realitytoolkit.io",
   "bugs": {
-    "url": "https://github.com/realitycollective/realitytoolkit.dev/issues"
+    "url": "https://github.com/realitycollective/com.realitytoolkit.metaplatform/issues"
   },
   "license": "MIT",
   "repository": {
@@ -33,9 +33,12 @@
     "email": "[email protected]",
     "url": "https://github.com/realitycollective"
   },
+  "publishConfig": {
+    "registry": "https://package.openupm.com"
+  },
   "dependencies": {
-    "com.realitytoolkit.core": "1.0.0-pre.47",
-    "com.realitytoolkit.player": "1.0.4-pre.3",
+    "com.realitytoolkit.core": "1.0.0-pre.48",
+    "com.realitytoolkit.player": "1.0.4",
     "com.realitytoolkit.boundary": "1.0.0-pre.2",
     "com.unity.xr.oculus": "4.2.0"
   },
@@ -45,4 +48,4 @@
       "path": "Assets~/"
     }
   ]
-}
+}