From c5fd21c246110abce8425dad7ec662a534d917b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Tue, 7 May 2024 21:46:42 +0200 Subject: [PATCH] Update manifest --- Editor/AssemblyInfo.cs | 9 +++++++++ Editor/AssemblyInfo.cs.meta | 11 ++++++++++ Editor/DeviceSimulationPackageInstaller.cs | 7 ++++--- ...lityToolkit.DeviceSimulation.Editor.asmdef | 3 ++- ...ControllerServiceModuleProfileInspector.cs | 2 +- ...ControllerServiceModuleProfileInspector.cs | 2 +- Runtime/AssemblyInfo.cs | 9 +++++++++ Runtime/AssemblyInfo.cs.meta | 11 ++++++++++ .../BaseSimulatedControllerServiceModule.cs | 5 ++--- .../HandTracking/SimulatedHandController.cs | 2 +- .../SimulatedHandControllerServiceModule.cs | 1 - ...latedHandControllerServiceModuleProfile.cs | 2 +- .../SimulatedHandDataConverter.cs | 4 ++-- package.json | 20 ++++++++++++------- 14 files changed, 67 insertions(+), 21 deletions(-) create mode 100644 Editor/AssemblyInfo.cs create mode 100644 Editor/AssemblyInfo.cs.meta create mode 100644 Runtime/AssemblyInfo.cs create mode 100644 Runtime/AssemblyInfo.cs.meta diff --git a/Editor/AssemblyInfo.cs b/Editor/AssemblyInfo.cs new file mode 100644 index 0000000..29c79d2 --- /dev/null +++ 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 new file mode 100644 index 0000000..2a865d9 --- /dev/null +++ b/Editor/AssemblyInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e6987b8cd01a58a41b8ce609929c96f0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/DeviceSimulationPackageInstaller.cs b/Editor/DeviceSimulationPackageInstaller.cs index 14d4589..6dadaf2 100644 --- 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(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 index 6123d83..bd777c4 100644 --- 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 index feb467f..1997305 100644 --- 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 index 095b4bf..7f2d378 100644 --- 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 new file mode 100644 index 0000000..4cc51d4 --- /dev/null +++ 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 new file mode 100644 index 0000000..9f6f510 --- /dev/null +++ b/Runtime/AssemblyInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bf0f99c0e6e0f90419e73ecb5655a4d8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/InputService/BaseSimulatedControllerServiceModule.cs b/Runtime/InputService/BaseSimulatedControllerServiceModule.cs index a439b16..5d51863 100644 --- 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 index df86853..1678fe4 100644 --- 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 index ecc8f5c..77633e4 100644 --- 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 index 3c5d631..e978289 100644 --- 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 index 1a4f98b..a6c375e 100644 --- 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 index d92654a..d8c0dc2 100644 --- 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,9 +27,12 @@ "email": "realitycollectivedev@gmail.com", "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": [ { @@ -34,4 +40,4 @@ "path": "Assets~/" } ] -} +} \ No newline at end of file