Skip to content

Fixed issues 3 and 4 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zr3 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed issues 3 and 4 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions Assets/Editor.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Assets/Scripts/ThirdPersonCameraEditor.cs → Assets/Editor/ThirdPersonCameraEditor.cs
View file
Open in desktop
File renamed without changes.
0 ...s/Scripts/ThirdPersonCameraEditor.cs.meta → ...ts/Editor/ThirdPersonCameraEditor.cs.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Assets/Scripts/CharacterControllerLogic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ void FixedUpdate()
capCollider.height = capsuleHeight + (animator.GetFloat("CapsuleCurve") * 0.5f);
if (gamecam.CamState != ThirdPersonCamera.CamStates.Free)
{
gamecam.ParentRig.Translate(Vector3.up * (transform.position.y - oldY));
gamecam.transform.Translate(Vector3.up * (transform.position.y - oldY));
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion Assets/Scripts/ThirdPersonCamera.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@
/// </summary>
using UnityEngine;
using System.Collections;
using UnityEditor;

#if UNITY_EDITOR
using UnityEditor;
#endif

/// <summary>
/// Struct to hold data for aligning camera
Expand Down Expand Up @@ -233,6 +235,7 @@ void Update ()

}

#if UNITY_EDITOR
/// <summary>
/// Debugging information should be put here.
/// </summary>
Expand All @@ -243,6 +246,7 @@ void OnDrawGizmos ()
DebugDraw.DrawDebugFrustum(viewFrustum);
}
}
#endif

void LateUpdate()
{
Expand Down