Skip to content

Commit

Permalink
Merge pull request #2 from beardordie/master
Browse files Browse the repository at this point in the history 
Virtual methods, protected fields and methods for Inheritance
  • Loading branch information
@VeryHotShark
VeryHotShark committed Jun 15, 2019
2 parents 428217c + e1cbcd5 commit 45e9ca2
Show file tree
Hide file tree
Showing 10 changed files with 151 additions and 152 deletions.
38 changes: 19 additions & 19 deletions FirstPersonController/Assets/Scripts/Camera_Controller/CamerZoom.cs
View file
Expand Up @@ -22,30 +22,30 @@ public class CamerZoom
#endregion

#region Private
float m_initFOV;
CameraInputData m_camInputData;
MovementInputData m_movementInputData;
protected float m_initFOV;
protected CameraInputData m_camInputData;
protected MovementInputData m_movementInputData;

#region Components
Camera m_cam;
protected Camera m_cam;
#endregion
#region Reference/Cache
IEnumerator m_ChangeFOVRoutine;
IEnumerator m_ChangeRunFOVRoutine;
protected IEnumerator m_ChangeFOVRoutine;
protected IEnumerator m_ChangeRunFOVRoutine;
#endregion
#endregion
#endregion

#region Custom Methods
public void Init(Camera _cam, CameraInputData _data)
public virtual void Init(Camera _cam, CameraInputData _data)
{
m_camInputData = _data;

m_cam = _cam;
m_initFOV = m_cam.fieldOfView;
}

public void ChangeFOV(MonoBehaviour _mono)
public virtual void ChangeFOV(MonoBehaviour _mono)
{
if(m_ChangeFOVRoutine != null)
_mono.StopCoroutine(m_ChangeFOVRoutine);
Expand All @@ -54,7 +54,16 @@ public void ChangeFOV(MonoBehaviour _mono)
_mono.StartCoroutine(m_ChangeFOVRoutine);
}

IEnumerator ChangeFOVRoutine()
public virtual void ChangeRunFOV(bool _returning,MonoBehaviour _mono)
{
if(m_ChangeRunFOVRoutine != null)
_mono.StopCoroutine(m_ChangeRunFOVRoutine);

m_ChangeRunFOVRoutine = ChangeRunFOVRoutine(_returning);
_mono.StartCoroutine(m_ChangeRunFOVRoutine);
}

protected virtual IEnumerator ChangeFOVRoutine()
{
float _percent = 0f;
float _smoothPercent = 0f;
Expand All @@ -75,16 +84,7 @@ IEnumerator ChangeFOVRoutine()
}
}

public void ChangeRunFOV(bool _returning,MonoBehaviour _mono)
{
if(m_ChangeRunFOVRoutine != null)
_mono.StopCoroutine(m_ChangeRunFOVRoutine);

m_ChangeRunFOVRoutine = ChangeRunFOVRoutine(_returning);
_mono.StartCoroutine(m_ChangeRunFOVRoutine);
}

IEnumerator ChangeRunFOVRoutine(bool _returning)
protected virtual IEnumerator ChangeRunFOVRoutine(bool _returning)
{
float _percent = 0f;
float _smoothPercent = 0f;
Expand Down
10 changes: 5 additions & 5 deletions FirstPersonController/Assets/Scripts/Camera_Controller/CameraBreathing.cs
View file
Expand Up @@ -12,19 +12,19 @@ public class CameraBreathing : MonoBehaviour
[BoxGroup("Axis")] public bool y = true;
[BoxGroup("Axis")] public bool z = true;

PerlinNoiseScroller m_perlinNoiseScroller;
Vector3 m_finalRot;
Vector3 m_finalPos;
protected PerlinNoiseScroller m_perlinNoiseScroller;
protected Vector3 m_finalRot;
protected Vector3 m_finalPos;
#endregion

#region BuiltIn Methods

void Start()
protected virtual void Start()
{
m_perlinNoiseScroller = new PerlinNoiseScroller(data);
}

void LateUpdate()
protected virtual void LateUpdate()
{
if(data != null)
{
Expand Down
52 changes: 26 additions & 26 deletions FirstPersonController/Assets/Scripts/Camera_Controller/CameraController.cs
View file
Expand Up @@ -11,7 +11,6 @@ public class CameraController : MonoBehaviour

[BoxGroup("Custom Classes")] public CamerZoom cameraZoom;
[BoxGroup("Custom Classes")] public CameraSwaying cameraSway;

#endregion

#region Settings
Expand All @@ -22,29 +21,29 @@ public class CameraController : MonoBehaviour
#endregion

#region Private
float m_yaw;
float m_pitch;
protected float m_yaw;
protected float m_pitch;

float m_desiredYaw;
float m_desiredPitch;
protected float m_desiredYaw;
protected float m_desiredPitch;

#region Components
Transform m_pitchTranform;
Camera m_cam;
protected Transform m_pitchTranform;
protected Camera m_cam;
#endregion
#endregion

#endregion

#region BuiltIn Methods
void Start()
protected virtual void Start()
{
GetComponents();
InitComponents();
ChangeCursorState();
}

void LateUpdate()
protected virtual void LateUpdate()
{
CalculateRotation();
SmoothRotation();
Expand All @@ -54,60 +53,61 @@ void LateUpdate()
#endregion

#region Custom Methods
void GetComponents()
protected virtual void GetComponents()
{
m_pitchTranform = transform.GetChild(0).transform;
m_cam = GetComponentInChildren<Camera>();
}

void InitComponents()
protected virtual void InitComponents()
{
cameraZoom.Init(m_cam, camInputData);
cameraSway.Init(m_cam.transform);
}

void CalculateRotation()
protected virtual void CalculateRotation()
{
m_desiredYaw += camInputData.InputVector.x * sensitivity.x * Time.deltaTime;
m_desiredPitch -= camInputData.InputVector.y * sensitivity.y * Time.deltaTime;

m_desiredPitch = Mathf.Clamp(m_desiredPitch,lookAngleMinMax.x,lookAngleMinMax.y);
}

void SmoothRotation()
protected virtual void SmoothRotation()
{
m_yaw = Mathf.Lerp(m_yaw,m_desiredYaw, smoothAmount.x * Time.deltaTime);
m_pitch = Mathf.Lerp(m_pitch,m_desiredPitch, smoothAmount.y * Time.deltaTime);
}

void ApplyRotation()
protected virtual void ApplyRotation()
{
transform.eulerAngles = new Vector3(0f,m_yaw,0f);
m_pitchTranform.localEulerAngles = new Vector3(m_pitch,0f,0f);
}

public void HandleSway(Vector3 _inputVector,float _rawXInput)
{
cameraSway.SwayPlayer(_inputVector,_rawXInput);
}

void HandleZoom()
protected virtual void HandleZoom()
{
if(camInputData.ZoomClicked || camInputData.ZoomReleased)
cameraZoom.ChangeFOV(this);
}

protected virtual void ChangeCursorState()
{
Cursor.lockState = CursorLockMode.Locked;
Cursor.visible = false;
}

public void ChangeRunFOV(bool _returning)
public virtual void HandleSway(Vector3 _inputVector,float _rawXInput)
{
cameraZoom.ChangeRunFOV(_returning,this);
cameraSway.SwayPlayer(_inputVector,_rawXInput);
}

void ChangeCursorState()

public virtual void ChangeRunFOV(bool _returning)
{
Cursor.lockState = CursorLockMode.Locked;
Cursor.visible = false;
cameraZoom.ChangeRunFOV(_returning,this);
}

#endregion
}
}
}
17 changes: 8 additions & 9 deletions FirstPersonController/Assets/Scripts/Camera_Controller/CameraSwaying.cs
View file
Expand Up @@ -15,23 +15,23 @@ public class CameraSwaying
[BoxGroup("Sway Settings")] public AnimationCurve swayCurve;

#region Private
Transform m_camTransform;
float _scrollSpeed;
protected Transform m_camTransform;
protected float _scrollSpeed;

float m_xAmountThisFrame;
float m_xAmountPreviousFrame;
protected float m_xAmountThisFrame;
protected float m_xAmountPreviousFrame;

bool m_diffrentDirection;
protected bool m_diffrentDirection;
#endregion
#endregion

#region Custom Methods
public void Init(Transform _cam)
public virtual void Init(Transform _cam)
{
m_camTransform = _cam;
}

public void SwayPlayer(Vector3 _inputVector, float _rawXInput)
public virtual void SwayPlayer(Vector3 _inputVector, float _rawXInput)
{
float _xAmount = _inputVector.x;

Expand All @@ -55,7 +55,6 @@ public void SwayPlayer(Vector3 _inputVector, float _rawXInput)
}

_scrollSpeed = Mathf.Clamp(_scrollSpeed,-1f,1f);
//Debug.Log(_scrollSpeed);

float _swayFinalAmount;

Expand All @@ -73,4 +72,4 @@ public void SwayPlayer(Vector3 _inputVector, float _rawXInput)
}
#endregion
}
}
}

0 comments on commit 45e9ca2

Please sign in to comment.