replaced locomotion controller with a rebuilt version

BasisVR · Feb 13, 2025 · fc1ee7a · fc1ee7a
1 parent 191f59d
commit fc1ee7a
Show file tree

Hide file tree

Showing 11 changed files with 1,911 additions and 1,774 deletions.
diff --git a/Basis/Assets/AddressableAssetsData/AssetGroups/Basis Foundation Assets.asset b/Basis/Assets/AddressableAssetsData/AssetGroups/Basis Foundation Assets.asset
@@ -40,6 +40,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 1a876a9e9a22e4643b0d03f0eb3d0c30
+    m_Address: Locomotion
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 1c4eb22ae1b895b4999f192628cd9cdb
     m_Address: oculus_cv1_controller_right
     m_ReadOnly: 0
@@ -145,11 +150,6 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 71c6687014327544c95558a736c226c7
-    m_Address: Locomotion
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 861fed068fe3fd4449deba6697749c16
     m_Address: UserNamePanel
     m_ReadOnly: 0

diff --git a/Basis/Packages/com.basis.framework/Device Management/Devices/Desktop/BasisAvatarEyeInput.cs b/Basis/Packages/com.basis.framework/Device Management/Devices/Desktop/BasisAvatarEyeInput.cs
@@ -1,10 +1,8 @@
-using System;
 using System.Collections.Generic;
 using Basis.Scripts.BasisSdk.Helpers;
 using Basis.Scripts.BasisSdk.Players;
 using Basis.Scripts.Drivers;
 using Basis.Scripts.TransformBinders.BoneControl;
-using Unity.Mathematics;
 using UnityEngine;
 using UnityEngine.InputSystem;
 namespace Basis.Scripts.Device_Management.Devices.Desktop
@@ -99,10 +97,6 @@ private void OnCursorStateChange(CursorLockMode cursor, bool newCursorVisible)
         }
         private void BasisLocalPlayer_OnPlayersHeightChanged()
         {
-            //   Vector3 Pos = new Vector3(0, BasisLocalPlayer.Instance.AvatarDriver.ActiveAvatarEyeHeight(), 0);
-            //  BasisLocalPlayer.Instance.AvatarDriver.GetWorldSpaceRotAndPos(() => Pos, out quaternion rot, out float3 position);
-            //  BasisLocalPlayer.Instance.PlayerEyeHeight = -position.y;
-          // float avatarHeight = BasisLocalPlayer.Instance.AvatarDriver?.ActiveAvatarEyeHeight() ?? 0;
             BasisLocalPlayer.Instance.PlayerEyeHeight = BasisLocalPlayer.Instance.AvatarEyeHeight;
         }
         public void PlayerInitialized()

diff --git a/Basis/Packages/com.basis.framework/Drivers/BasisHeightDriver.cs b/Basis/Packages/com.basis.framework/Drivers/BasisHeightDriver.cs
@@ -60,8 +60,8 @@ public static void CapturePlayerHeight()
         }
         else
         {
-            BasisDebug.LogWarning("No attached input found for BasisLockToInput. Using default player eye height.", BasisDebug.LogTag.Avatar);
-            BasisLocalPlayer.Instance.PlayerEyeHeight = BasisLocalPlayer.DefaultPlayerEyeHeight; // Set a reasonable default
+            BasisDebug.LogWarning("No attached input found for BasisLockToInput. Using the avatars height.", BasisDebug.LogTag.Avatar);
+            BasisLocalPlayer.Instance.PlayerEyeHeight = BasisLocalPlayer.Instance.AvatarEyeHeight; // Set a reasonable default
         }
     }
 

diff --git a/Basis/Packages/com.basis.framework/Players/BasisLocalPlayer.cs b/Basis/Packages/com.basis.framework/Players/BasisLocalPlayer.cs
@@ -1,17 +1,14 @@
 using System.Threading.Tasks;
 using UnityEngine;
-using UnityEngine.ResourceManagement.ResourceProviders;
 using UnityEngine.SceneManagement;
 using System;
 using Basis.Scripts.Drivers;
 using Basis.Scripts.BasisSdk.Helpers;
-using Basis.Scripts.Device_Management.Devices.Desktop;
 using Basis.Scripts.Device_Management;
 using Basis.Scripts.Avatar;
 using Basis.Scripts.Common;
 using System.Collections.Generic;
 using Basis.Scripts.UI.UI_Panels;
-using UnityEngine.SocialPlatforms;
 namespace Basis.Scripts.BasisSdk.Players
 {
     public class BasisLocalPlayer : BasisPlayer

diff --git a/Basis/Packages/com.basis.framework/UI/UI Panels/BasisDataStoreAvatarKeys.cs b/Basis/Packages/com.basis.framework/UI/UI Panels/BasisDataStoreAvatarKeys.cs
@@ -1,4 +1,4 @@
-using BasisSerializer.OdinSerializer;
+using BasisSerializer.OdinSerializer;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
@@ -14,7 +14,7 @@ public class AvatarKey
             public string Url;
             public string Pass;
         }
-        public static string FilePath = Path.Combine(Application.persistentDataPath, "VerySafePasswordStore.json");
+        public static string FilePath = Path.Combine(Application.persistentDataPath, "KeyStore.json");
 
         [SerializeField]
         private static List<AvatarKey> keys = new List<AvatarKey>();
@@ -85,4 +85,4 @@ public static List<AvatarKey> DisplayKeys()
             return keys;
         }
     }
-}
+}
diff --git a/Basis/Packages/com.basis.framework/UI/UI Panels/BasisUIAvatarSelection.cs b/Basis/Packages/com.basis.framework/UI/UI Panels/BasisUIAvatarSelection.cs
@@ -213,4 +213,4 @@ public override void DestroyEvent()
             BasisUINeedsVisibleTrackers.Instance.Remove(this);
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -213,4 +213,4 @@ public override void DestroyEvent() @@
                 BasisUINeedsVisibleTrackers.Instance.Remove(this);
             }
         }
-    }
+    }