Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-12-11 21:22:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

camera handling works, but needs improvements

Browse source
This commit is contained in:
in0finite 2020-03-25 01:22:41 +01:00
parent 42946f3a02
commit a9f665bc33
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Assets/Scripts/Behaviours/Ped/States/DriveByState.cs
View file

@ -11,7 +11,7 @@ namespace SanAndreasUnity.Behaviours.Peds.States
// - add real aim anims ? // - add real aim anims ?
// - drive-by exiting state - activated when going from drive-by to sitting state, or when trying to exit vehicle // - drive-by exiting state - activated when going from drive-by to sitting state, or when trying to exit vehicle
// - camera // - camera
// - weapon's gun flash should depend on last time when fired, not on anim time // - weapon's gun flash should depend on last time when fired, not on anim time - maybe don't change it, because we may play real aim anims
protected override void EnterVehicleInternal() protected override void EnterVehicleInternal()
@ -143,7 +143,30 @@ namespace SanAndreasUnity.Behaviours.Peds.States
m_ped.GetStateOrLogError<DriveByFireState>().EnterVehicle(this.CurrentVehicle, this.CurrentVehicleSeatAlignment); m_ped.GetStateOrLogError<DriveByFireState>().EnterVehicle(this.CurrentVehicle, this.CurrentVehicleSeatAlignment);
} }
// camera
public override void UpdateCameraZoom()
{
// ignore
}
public override void CheckCameraCollision()
{
BaseAimMovementState.CheckCameraCollision(m_ped, this.GetCameraFocusPos());
}
public override Vector3 GetCameraFocusPos()
{
var seat = m_ped.CurrentVehicleSeat;
if (seat != null && seat.Parent != null)
return seat.Parent.transform.position + Vector3.up * 1.5f - m_ped.Camera.transform.forward * 1.5f;
else
return base.GetCameraFocusPos();
//return m_ped.transform.position + Vector3.up * 0.5f;
//return m_ped.PlayerModel.Head.transform.position;
}
public override void OnAimButtonPressed() public override void OnAimButtonPressed()
{ {

2
Assets/Scripts/Behaviours/Ped/States/VehicleSittingState.cs
View file

@ -193,7 +193,7 @@ namespace SanAndreasUnity.Behaviours.Peds.States
m_ped.CameraDistanceVehicle); m_ped.CameraDistanceVehicle);
} }
public new Vector3 GetCameraFocusPos() public override Vector3 GetCameraFocusPos()
{ {
if (m_ped.CurrentVehicle != null) if (m_ped.CurrentVehicle != null)
return m_ped.CurrentVehicle.transform.position; return m_ped.CurrentVehicle.transform.position;