diff --git a/Viagg-io/Assets/Packages/MyBT/BTC/BTC.cs b/Viagg-io/Assets/Packages/MyBT/BTC/BTC.cs index e35bc5fa..49dcbd2c 100644 --- a/Viagg-io/Assets/Packages/MyBT/BTC/BTC.cs +++ b/Viagg-io/Assets/Packages/MyBT/BTC/BTC.cs @@ -1213,75 +1213,6 @@ public class BTC : MonoBehaviour { } #endregion - #region Oculus Input -#if OCULUSVR_AVAILABLE - [Task] - public void OVRInputGetDown (string buttonName) { - if (System.Enum.TryParse(buttonName, out OVRInput.Button button)) { - switch (Task.getState) { - case NodeState.FirstRun: - case NodeState.Running: - if (OVRInput.GetDown(button)) { - Task.SetSucceeded(); - return; - } - break; - case NodeState.Aborting: - case NodeState.NotRunning: - break; - } - } else { - Debug.LogError($"OVRInputGetDown: unknown button {buttonName}"); - Task.SetError(); - } - } - - [Task] - public void OVRInputGetUp (string buttonName) { - if (System.Enum.TryParse(buttonName, out OVRInput.Button button)) { - switch (Task.getState) { - case NodeState.FirstRun: - case NodeState.Running: - if (OVRInput.GetUp(button)) { - Task.SetSucceeded(); - return; - } - break; - case NodeState.Aborting: - case NodeState.NotRunning: - break; - } - } else { - Debug.LogError($"OVRInputGetUp: unknown button {buttonName}"); - Task.SetError(); - } - } - - [Task] - public void OVRInputGet (string buttonName) { - if (System.Enum.TryParse(buttonName, out OVRInput.Button button)) { - switch (Task.getState) { - case NodeState.FirstRun: - case NodeState.Running: - if (OVRInput.Get(button)) { - Task.SetSucceeded(); - return; - } else { - Task.SetFailed(); - return; - } - case NodeState.Aborting: - case NodeState.NotRunning: - break; - } - } else { - Debug.LogError($"OVRInputGet: unknown button {buttonName}"); - Task.SetError(); - } - } - #endif - #endregion - #region keyboard input [Task] diff --git a/Viagg-io/Assets/Resources/OVRBuildConfig.asset b/Viagg-io/Assets/Resources/OVRBuildConfig.asset deleted file mode 100644 index aa9329a4..00000000 --- a/Viagg-io/Assets/Resources/OVRBuildConfig.asset +++ /dev/null @@ -1,14 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 20553fac56ec59645857c0732b787431, type: 3} - m_Name: OVRBuildConfig - m_EditorClassIdentifier: diff --git a/Viagg-io/Assets/Resources/OVRBuildConfig.asset.meta b/Viagg-io/Assets/Resources/OVRBuildConfig.asset.meta deleted file mode 100644 index 264cae42..00000000 --- a/Viagg-io/Assets/Resources/OVRBuildConfig.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6b3dd958675134b7dab292582332fc34 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Viagg-io/Assets/Resources/OVRPlatformToolSettings.asset b/Viagg-io/Assets/Resources/OVRPlatformToolSettings.asset deleted file mode 100644 index 0ac2533d..00000000 --- a/Viagg-io/Assets/Resources/OVRPlatformToolSettings.asset +++ /dev/null @@ -1,22 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cd7bb81df5b74b34dadbf531f381a26b, type: 3} - m_Name: OVRPlatformToolSettings - m_EditorClassIdentifier: - riftRedistPackages: [] - languagePackDirectory: - assetConfigs: - - configList: [] - - configList: [] - - configList: [] - targetPlatform: 3 - runOvrLint: 1 diff --git a/Viagg-io/Assets/Resources/OVRPlatformToolSettings.asset.meta b/Viagg-io/Assets/Resources/OVRPlatformToolSettings.asset.meta deleted file mode 100644 index ed1016e5..00000000 --- a/Viagg-io/Assets/Resources/OVRPlatformToolSettings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c4b714204c3d47dbaa97478f38994a8 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Viagg-io/Assets/Resources/OculusRuntimeSettings.asset b/Viagg-io/Assets/Resources/OculusRuntimeSettings.asset deleted file mode 100644 index 452dc5c1..00000000 --- a/Viagg-io/Assets/Resources/OculusRuntimeSettings.asset +++ /dev/null @@ -1,23 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3863570e7e6387a40ae4f323d83291e5, type: 3} - m_Name: OculusRuntimeSettings - m_EditorClassIdentifier: - colorSpace: 7 - requestsVisualFaceTracking: 1 - requestsAudioFaceTracking: 1 - hasSentConsentEvent: 1 - hasSetTelemetryEnabled: 1 - telemetryEnabled: 0 - telemetryProjectGuid: 09bc1f3d-c25f-44e8-8052-00ce34e76d09 - bodyTrackingFidelity: 1 - bodyTrackingJointSet: 0 diff --git a/Viagg-io/Assets/Resources/OculusRuntimeSettings.asset.meta b/Viagg-io/Assets/Resources/OculusRuntimeSettings.asset.meta deleted file mode 100644 index 070bc931..00000000 --- a/Viagg-io/Assets/Resources/OculusRuntimeSettings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: be340e3c48769439d8d18a5a2bccd498 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Viagg-io/Assets/XR/Settings/OpenXR Package Settings.asset b/Viagg-io/Assets/XR/Settings/OpenXR Package Settings.asset index d924ccb1..f97de7f1 100644 --- a/Viagg-io/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Viagg-io/Assets/XR/Settings/OpenXR Package Settings.asset @@ -775,10 +775,6 @@ MonoBehaviour: - {fileID: -8267305833683693900} - {fileID: -8960643433864899106} - {fileID: 2573962593641122060} - - {fileID: 8385125057470453092} - - {fileID: 8916844383279402268} - - {fileID: 178613010803379144} - - {fileID: 789574339878409605} - {fileID: 3916031153604144883} - {fileID: -8573038508977813188} - {fileID: 4018191565679060901} @@ -912,10 +908,6 @@ MonoBehaviour: - {fileID: 5472988246120479344} - {fileID: -2976327503824836234} - {fileID: 4713676762930088383} - - {fileID: -1003800651466354103} - - {fileID: 824842227628677326} - - {fileID: -5994497538581048822} - - {fileID: -1331257277834515632} - {fileID: 1334536282075740144} - {fileID: 3755411275038678371} - {fileID: 7795885686008422532} diff --git a/Viagg-io/Assets/afca/ViaggioAI/Scripts/ViaggioAI/ControllerInputEventHandler.cs b/Viagg-io/Assets/afca/ViaggioAI/Scripts/ViaggioAI/ControllerInputEventHandler.cs old mode 100755 new mode 100644 index 84e7c569..384b7e1c --- a/Viagg-io/Assets/afca/ViaggioAI/Scripts/ViaggioAI/ControllerInputEventHandler.cs +++ b/Viagg-io/Assets/afca/ViaggioAI/Scripts/ViaggioAI/ControllerInputEventHandler.cs @@ -56,26 +56,7 @@ public class ControllerInputEventHandler : MonoBehaviour private void checkForInput() { - if (OVRInput.GetDown(OVRInput.RawButton.LIndexTrigger) || OVRInput.GetDown(OVRInput.RawButton.RIndexTrigger)) - { - this.onIndexTriggerPulled.Invoke(); - } - if (OVRInput.GetDown(OVRInput.RawButton.A)) - { - this.onAButtonPushed.Invoke(); - } - if (OVRInput.GetDown(OVRInput.RawButton.B)) - { - this.onBButtonPushed.Invoke(); - } - if (OVRInput.GetDown(OVRInput.RawButton.X)) - { - this.onXButtonPushed.Invoke(); - } - if (OVRInput.GetDown(OVRInput.RawButton.Y)) - { - this.onYButtonPushed.Invoke(); - } + return; } #endregion diff --git a/Viagg-io/Packages/manifest.json b/Viagg-io/Packages/manifest.json index bc06f39e..92c00dec 100644 --- a/Viagg-io/Packages/manifest.json +++ b/Viagg-io/Packages/manifest.json @@ -1,7 +1,5 @@ { "dependencies": { - "com.meta.xr.sdk.all": "60.0.0", - "com.meta.xr.sdk.core": "59.0.0", "com.unity.collab-proxy": "2.2.0", "com.unity.feature.development": "1.0.1", "com.unity.feature.vr": "1.0.0", @@ -9,6 +7,7 @@ "com.unity.learn.iet-framework": "3.1.3", "com.unity.memoryprofiler": "1.1.3", "com.unity.render-pipelines.universal": "14.0.9", + "com.unity.textmeshpro": "3.0.9", "com.unity.timeline": "1.7.6", "com.unity.visualscripting": "1.9.1", "com.unity.xr.hands": "1.3.0", diff --git a/Viagg-io/Packages/packages-lock.json b/Viagg-io/Packages/packages-lock.json index 6bfe12f5..d19f785c 100644 --- a/Viagg-io/Packages/packages-lock.json +++ b/Viagg-io/Packages/packages-lock.json @@ -7,141 +7,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.meta.xr.mrutilitykit": { - "version": "60.0.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.meta.xr.sdk.core": "60.0.0", - "com.unity.textmeshpro": "3.0.6", - "com.unity.ai.navigation": "1.1.4", - "com.meta.xr.sdk.interaction": "60.0.0", - "com.meta.xr.sdk.interaction.ovr": "60.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2" - }, - "url": "https://packages.unity.com" - }, - "com.meta.xr.sdk.all": { - "version": "60.0.0", - "depth": 0, - "source": "registry", - "dependencies": { - "com.meta.xr.sdk.core": "60.0.0", - "com.meta.xr.sdk.audio": "60.0.0", - "com.meta.xr.sdk.voice": "60.0.0", - "com.meta.xr.simulator": "60.0.0", - "com.meta.xr.sdk.haptics": "60.0.0", - "com.meta.xr.mrutilitykit": "60.0.0", - "com.meta.xr.sdk.platform": "60.0.0", - "com.meta.xr.sdk.interaction": "60.0.0", - "com.meta.xr.sdk.voice.composer": "60.0.0", - "com.meta.xr.sdk.interaction.ovr": "60.0.0", - "com.meta.xr.sdk.voice.dictation": "60.0.0", - "com.meta.xr.sdk.voice.telemetry": "60.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.meta.xr.sdk.audio": { - "version": "60.0.0", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.meta.xr.sdk.core": { - "version": "60.0.0", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.meta.xr.sdk.haptics": { - "version": "60.0.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.meta.xr.sdk.core": "60.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.meta.xr.sdk.interaction": { - "version": "60.0.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0", - "com.unity.textmeshpro": "3.0.6" - }, - "url": "https://packages.unity.com" - }, - "com.meta.xr.sdk.interaction.ovr": { - "version": "60.0.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.meta.xr.sdk.core": "60.0.0", - "com.meta.xr.sdk.interaction": "60.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.meta.xr.sdk.platform": { - "version": "60.0.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0", - "com.meta.xr.sdk.core": "60.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.meta.xr.sdk.voice": { - "version": "60.0.0", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.meta.xr.sdk.voice.composer": { - "version": "60.0.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.meta.xr.sdk.voice": "60.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.meta.xr.sdk.voice.dictation": { - "version": "60.0.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.meta.xr.sdk.voice": "60.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.meta.xr.sdk.voice.telemetry": { - "version": "60.0.0", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.meta.xr.simulator": { - "version": "60.0.0", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.ai.navigation": { - "version": "1.1.5", - "depth": 2, - "source": "registry", - "dependencies": { - "com.unity.modules.ai": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.burst": { "version": "1.8.11", "depth": 1, @@ -279,13 +144,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.nuget.newtonsoft-json": { - "version": "3.2.1", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.performance.profile-analyzer": { "version": "1.2.2", "depth": 1, @@ -376,8 +234,8 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.6", - "depth": 2, + "version": "3.0.9", + "depth": 0, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0" diff --git a/Viagg-io/ProjectSettings/AudioManager.asset b/Viagg-io/ProjectSettings/AudioManager.asset index 67b6aebf..6321f1ed 100644 --- a/Viagg-io/ProjectSettings/AudioManager.asset +++ b/Viagg-io/ProjectSettings/AudioManager.asset @@ -13,8 +13,8 @@ AudioManager: m_VirtualVoiceCount: 512 m_RealVoiceCount: 32 m_EnableOutputSuspension: 1 - m_SpatializerPlugin: Meta XR Audio - m_AmbisonicDecoderPlugin: Meta XR Audio + m_SpatializerPlugin: + m_AmbisonicDecoderPlugin: m_DisableAudio: 0 m_VirtualizeEffects: 1 m_RequestedDSPBufferSize: 1024 diff --git a/Viagg-io/ProjectSettings/ProjectSettings.asset b/Viagg-io/ProjectSettings/ProjectSettings.asset index 2426c7ca..8ffe8a39 100644 --- a/Viagg-io/ProjectSettings/ProjectSettings.asset +++ b/Viagg-io/ProjectSettings/ProjectSettings.asset @@ -145,10 +145,7 @@ PlayerSettings: preloadedAssets: - {fileID: 0} - {fileID: 0} - - {fileID: 11400000, guid: be340e3c48769439d8d18a5a2bccd498, type: 2} - - {fileID: -8196854396901781169, guid: 1a4c68ca72a83449f938d669337cb305, type: 2} - - {fileID: 7708199778347151547, guid: 0f4832b23b368b643bc8a91696fbb473, type: 2} - - {fileID: 11400000, guid: f794167165c214ad18ff9cc20bddcafb, type: 2} + - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1