Fixed
This commit is contained in:
@@ -0,0 +1,75 @@
|
||||
using UnityEngine;
|
||||
|
||||
[DisallowMultipleComponent]
|
||||
public sealed class PlayerCameraShakeController : MonoBehaviour, IPlayerSystem
|
||||
{
|
||||
private Transform cameraTransform;
|
||||
private Vector3 baseLocalPosition;
|
||||
private float amplitude;
|
||||
private float frequency;
|
||||
private float seed;
|
||||
private float endsAt;
|
||||
private float startedAt;
|
||||
private float duration;
|
||||
|
||||
public bool IsShaking => cameraTransform != null && Time.time < endsAt;
|
||||
|
||||
public void Initialize(PlayerFacade facade)
|
||||
{
|
||||
FirstPersonCameraController cameraController =
|
||||
GetComponent<FirstPersonCameraController>();
|
||||
cameraTransform = cameraController != null && cameraController.PlayerCamera != null
|
||||
? cameraController.PlayerCamera.transform
|
||||
: GetComponentInChildren<Camera>(true)?.transform;
|
||||
|
||||
if (cameraTransform != null)
|
||||
baseLocalPosition = cameraTransform.localPosition;
|
||||
}
|
||||
|
||||
public void PlayShake(
|
||||
float newAmplitude,
|
||||
float newDuration,
|
||||
float newFrequency,
|
||||
float newSeed = 0f)
|
||||
{
|
||||
if (cameraTransform == null || newAmplitude <= 0f || newDuration <= 0f)
|
||||
return;
|
||||
|
||||
float remainingStrength = IsShaking
|
||||
? amplitude * Mathf.Clamp01((endsAt - Time.time) / Mathf.Max(0.01f, duration))
|
||||
: 0f;
|
||||
amplitude = Mathf.Max(remainingStrength, newAmplitude);
|
||||
duration = newDuration;
|
||||
frequency = Mathf.Max(0.1f, newFrequency);
|
||||
seed = newSeed;
|
||||
startedAt = Time.time;
|
||||
endsAt = Time.time + newDuration;
|
||||
}
|
||||
|
||||
private void LateUpdate()
|
||||
{
|
||||
if (cameraTransform == null)
|
||||
return;
|
||||
|
||||
if (!IsShaking)
|
||||
{
|
||||
cameraTransform.localPosition = baseLocalPosition;
|
||||
return;
|
||||
}
|
||||
|
||||
float normalizedTime = Mathf.Clamp01((Time.time - startedAt) / Mathf.Max(0.01f, duration));
|
||||
float strength = amplitude * (1f - normalizedTime) * (1f - normalizedTime);
|
||||
float sample = (Time.time - startedAt) * frequency;
|
||||
Vector3 noise = new(
|
||||
Mathf.PerlinNoise(seed, sample) * 2f - 1f,
|
||||
Mathf.PerlinNoise(seed + 17.31f, sample) * 2f - 1f,
|
||||
Mathf.PerlinNoise(seed + 39.77f, sample) * 2f - 1f);
|
||||
cameraTransform.localPosition = baseLocalPosition + noise * strength;
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
if (cameraTransform != null)
|
||||
cameraTransform.localPosition = baseLocalPosition;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b12d3c124e93b5f4f9c06c7e870d4068
|
||||
@@ -13,10 +13,16 @@ public sealed class PlayerController : NetworkBehaviour, IPlayerSystem
|
||||
[SerializeField, Min(0.1f)] private float jumpHeight = 1.4f;
|
||||
[SerializeField, Min(0.1f)] private float gravity = 20f;
|
||||
|
||||
[Header("External impulses")]
|
||||
[SerializeField, Min(0.1f)] private float impulseDamping = 9f;
|
||||
|
||||
private CharacterController characterController;
|
||||
private Vector3 verticalVelocity;
|
||||
private Vector3 externalImpulseVelocity;
|
||||
private bool isInitialized;
|
||||
|
||||
public Vector3 ExternalImpulseVelocity => externalImpulseVelocity;
|
||||
|
||||
public void Initialize(PlayerFacade facade)
|
||||
{
|
||||
characterController = GetComponent<CharacterController>();
|
||||
@@ -39,6 +45,14 @@ public sealed class PlayerController : NetworkBehaviour, IPlayerSystem
|
||||
transform.Rotate(0f, yawDelta, 0f, Space.Self);
|
||||
}
|
||||
|
||||
public void AddImpulse(Vector3 velocityChange)
|
||||
{
|
||||
if (!isInitialized || !IsOwner)
|
||||
return;
|
||||
|
||||
externalImpulseVelocity += velocityChange;
|
||||
}
|
||||
|
||||
private void SimulateMovement(Vector2 moveInput, bool wantsToSprint, bool wantsToJump)
|
||||
{
|
||||
if (moveInput.sqrMagnitude > 1f)
|
||||
@@ -54,6 +68,12 @@ public sealed class PlayerController : NetworkBehaviour, IPlayerSystem
|
||||
|
||||
float speed = wantsToSprint ? sprintSpeed : walkSpeed;
|
||||
Vector3 horizontalDirection = transform.right * moveInput.x + transform.forward * moveInput.y;
|
||||
characterController.Move((horizontalDirection * speed + verticalVelocity) * Time.deltaTime);
|
||||
characterController.Move(
|
||||
(horizontalDirection * speed + verticalVelocity + externalImpulseVelocity) *
|
||||
Time.deltaTime);
|
||||
externalImpulseVelocity = Vector3.MoveTowards(
|
||||
externalImpulseVelocity,
|
||||
Vector3.zero,
|
||||
impulseDamping * Time.deltaTime);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,6 +80,9 @@ public sealed class PlayerInteractionController : NetworkBehaviour, IPlayerSyste
|
||||
for (int hitIndex = 0; hitIndex < hitCount; hitIndex++)
|
||||
{
|
||||
RaycastHit hit = interactionHits[hitIndex];
|
||||
if (hit.collider != null && hit.collider.transform.IsChildOf(transform))
|
||||
continue;
|
||||
|
||||
IInteractable interactable = FindInteractable(hit.collider);
|
||||
if (interactable == null)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user