Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public enum CameraPinSpace
OnInteractStartEvent += OnInteractDesktopTweak;
BasisDeviceManagement.OnBootModeChanged += OnBootModeChanged;

BasisLocalPlayer.OnPlayersHeightChangedNextFrame += OnHeightChanged;
BasisLocalHeight.OnHeightChangedNextFrame += OnHeightChanged;

// scale camera to avatar size
transform.localScale = new Vector3(cameraDefaultScale, cameraDefaultScale, cameraDefaultScale) *
Expand Down Expand Up @@ -623,7 +623,7 @@ public override void OnDestroy()
{
BasisDeviceManagement.OnBootModeChanged -= OnBootModeChanged;
OnInteractStartEvent -= OnInteractDesktopTweak;
BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= OnHeightChanged;
BasisLocalHeight.OnHeightChangedNextFrame -= OnHeightChanged;

BasisLocalPlayer.AfterFinalMove.RemoveAction(202, UpdateCamera);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void Initialization(BasisInput basisInput)
if (HasEvents == false)
{
BasisLocalPlayer.OnLocalAvatarChanged += UpdateVisualSizeAndOffset;
BasisLocalPlayer.OnPlayersHeightChangedNextFrame += UpdateVisualSizeAndOffset;
BasisLocalHeight.OnHeightChangedNextFrame += UpdateVisualSizeAndOffset;
HasEvents = true;
}

Expand All @@ -70,7 +70,7 @@ public void OnDestroy()
if (HasEvents)
{
BasisLocalPlayer.OnLocalAvatarChanged -= UpdateVisualSizeAndOffset;
BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= UpdateVisualSizeAndOffset;
BasisLocalHeight.OnHeightChangedNextFrame -= UpdateVisualSizeAndOffset;
HasEvents = false;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static class BasisHeightDriver
/// <remarks>
/// Establishes authoritative avatar metrics (eye height, arm span) first, then captures live player metrics.
/// Ensures nonzero defaults, computes scale ratios safely, picks the active ratio set for <paramref name="selectedHeightMode"/>,
/// and invokes <see cref="BasisLocalPlayer.OnPlayersHeightChangedNextFrame"/> via <see cref="BasisLocalPlayer.ExecuteNextFrame(System.Action)"/>.
/// and invokes <see cref="BasisLocalHeight.OnHeightChangedNextFrame"/> via <see cref="BasisLocalPlayer.ExecuteNextFrame(System.Action)"/>.
/// </remarks>
public static void ChangeEyeHeightMode(BasisLocalPlayer localPlayer, BasisSelectedHeightMode selectedHeightMode)
{
Expand Down Expand Up @@ -100,7 +100,7 @@ public static void ChangeEyeHeightMode(BasisLocalPlayer localPlayer, BasisSelect
// notify next frame
localPlayer.ExecuteNextFrame(() =>
{
BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke();
BasisLocalHeight.OnHeightChangedNextFrame?.Invoke();
});
}

Expand Down Expand Up @@ -254,7 +254,7 @@ public static void SetCustomPlayerHeight(float customHeight)

player.ExecuteNextFrame(() =>
{
BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke();
BasisLocalHeight.OnHeightChangedNextFrame?.Invoke();
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public void OnEnable()
RenderPipelineManager.endCameraRendering += EndCameraRendering;

BasisDeviceManagement.OnBootModeChanged += OnModeSwitch;
BasisLocalPlayer.OnPlayersHeightChangedNextFrame += UpdateCameraScale;
BasisLocalHeight.OnHeightChangedNextFrame += UpdateCameraScale;

InstanceExists?.Invoke();
HasEvents = true;
Expand Down Expand Up @@ -216,7 +216,7 @@ public void OnDestroy()
RenderPipelineManager.beginCameraRendering -= BeginCameraRendering;
RenderPipelineManager.endCameraRendering -= EndCameraRendering;
BasisDeviceManagement.OnBootModeChanged -= OnModeSwitch;
BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= UpdateCameraScale;
BasisLocalHeight.OnHeightChangedNextFrame -= UpdateCameraScale;
BasisLocalMicrophoneDriver.OnPausedAction -= microphoneIconDriver.OnPausedEvent;
HasEvents = false;
HasInstance = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public void Sit(BasisSeat seat)
GrabLatestTposeLocalScaleData();
if (hasEvent == false)
{
BasisLocalPlayer.OnPlayersHeightChangedNextFrame += GrabLatestTposeLocalScaleData;
BasisLocalHeight.OnHeightChangedNextFrame += GrabLatestTposeLocalScaleData;
hasEvent = true;
}
OnSimulate();
Expand Down Expand Up @@ -156,7 +156,7 @@ public void Stand()
GrabLatestTposeLocalScaleData();
if (hasEvent)
{
BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= GrabLatestTposeLocalScaleData;
BasisLocalHeight.OnHeightChangedNextFrame -= GrabLatestTposeLocalScaleData;
hasEvent = false;
}
_seat = null;
Expand Down Expand Up @@ -299,7 +299,6 @@ Quaternion rightLowerLegRot
Vector3 playerPelvisLocalPos = 0.5f * (BasisLocalBoneDriver.LeftUpperLegControl.TposeLocalScaled.position + BasisLocalBoneDriver.RightUpperLegControl.TposeLocalScaled.position);
Vector3 playerPos = pelvisWorldPos - playerRot * playerPelvisLocalPos;


LocalPlayer.transform.SetPositionAndRotation(playerPos, playerRot);
//dont need todo this LocalPlayer.AvatarTransform.SetPositionAndRotation(playerPos, playerRot);
LocalPlayer.LocalAnimatorDriver.HandleTeleport();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ public class BasisLocalHeight
/// </summary>
public string AvatarName;

/// <summary>
/// Fired on the frame after a player height change is requested.
/// </summary>
public static System.Action OnHeightChangedNextFrame;

/// <summary>
/// Fallback height (meters) used when no measurement is available.
/// not the total height but the eye height
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,6 @@ public class BasisLocalPlayer : BasisPlayer
/// </summary>
public static Action OnSpawnedEvent;

/// <summary>
/// Fired on the frame after a player height change is requested.
/// </summary>
public static Action OnPlayersHeightChangedNextFrame;

/// <summary>
/// Ordered delegate queue invoked after all movement and simulation have completed for the frame.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void Start()
}

ApplySize();
BasisLocalPlayer.OnPlayersHeightChangedNextFrame += ApplySize;
BasisLocalHeight.OnHeightChangedNextFrame += ApplySize;
if (BasisNetworkManagement.Instance != null)
{
LoadCurrentSettings();
Expand Down Expand Up @@ -110,7 +110,7 @@ public void OnDestroy()
AdvancedSettings.onClick.RemoveListener(ToggleAdvancedSettings);
UseLocalhost.onClick.RemoveListener(UseLocalHost);
}
BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= ApplySize;
BasisLocalHeight.OnHeightChangedNextFrame -= ApplySize;
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void DeInitalize()
BasisLocalPlayer.AfterFinalMove.RemoveAction(120, UpdateUIFollow);
}

BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= SetUILocation;
BasisLocalHeight.OnHeightChangedNextFrame -= SetUILocation;

if (hasLocalCreationEvent)
{
Expand All @@ -60,7 +60,7 @@ public void LocalPlayerGenerated()
{
BasisLocalPlayer.AfterFinalMove.AddAction(120, UpdateUIFollow);
}
BasisLocalPlayer.OnPlayersHeightChangedNextFrame += SetUILocation;
BasisLocalHeight.OnHeightChangedNextFrame += SetUILocation;
SetUILocation();
}
public void UpdateUIFollow()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void Start()
}
UseLocalhost.onClick.AddListener(UseLocalHost);
ApplySize();
BasisLocalPlayer.OnPlayersHeightChangedNextFrame += ApplySize;
BasisLocalHeight.OnHeightChangedNextFrame += ApplySize;
if (BasisNetworkManagement.Instance != null)
{
LoadCurrentSettings();
Expand All @@ -68,7 +68,7 @@ public void ApplySize()
}
public void OnDestroy()
{
BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= ApplySize;
BasisLocalHeight.OnHeightChangedNextFrame -= ApplySize;
UseLocalhost.onClick.RemoveListener(UseLocalHost);
}
public void UseHostMode(bool IsDown)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private void OnDisable()
}

BasisLocalPlayer.OnLocalAvatarChanged -= UpdateDelayedSetUI;
BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= UpdateDelayedSetUI;
BasisLocalHeight.OnHeightChangedNextFrame -= UpdateDelayedSetUI;

BasisLocalPlayer.AfterFinalMove.RemoveAction(101, UpdateUI);
}
Expand All @@ -59,7 +59,7 @@ private void OnDisable()
private void OnLocalPlayerGenerated()
{
BasisLocalPlayer.OnLocalAvatarChanged += UpdateDelayedSetUI;
BasisLocalPlayer.OnPlayersHeightChangedNextFrame += UpdateDelayedSetUI;
BasisLocalHeight.OnHeightChangedNextFrame += UpdateDelayedSetUI;
if (LocalPlayer.LocalBoneDriver.FindBone(out hand, BasisBoneTrackedRole.LeftHand))
{
}
Expand Down
4 changes: 2 additions & 2 deletions Basis/Packages/com.basis.framework/UI/BasisUIRaycast.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public void Initialize(BasisInput basisInput, BasisPointRaycaster pointRaycaster

HasLineRenderer = false;
HasRedicalRenderer = false;
BasisLocalPlayer.OnPlayersHeightChangedNextFrame += OnPlayersHeightChanged;
BasisLocalHeight.OnHeightChangedNextFrame += OnPlayersHeightChanged;
// Create the ray with the adjusted starting position and direction
if (basisInput.DeviceMatchSettings.HasRayCastVisual)
{
Expand Down Expand Up @@ -119,7 +119,7 @@ public void OnDeInitialize()
{
if (HasOnPlayersHeightChanged)
{
BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= OnPlayersHeightChanged;
BasisLocalHeight.OnHeightChangedNextFrame -= OnPlayersHeightChanged;
}
}

Expand Down
Loading