Skip to content

FollowCamera: Use the cached TargetCollider / Detect if TargetCollider was removed from TargetEntity #698

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FollowCamera: Use the cached TargetCollider / Detect if TargetCollider was removed from TargetEntity #698

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
12 changes: 9 additions & 3 deletions Nez.Portable/ECS/Components/FollowCamera.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,15 @@ void UpdateFollow()
}
else
{
// make sure we have a targetCollider for CameraWindow. If we dont bail out.
if (_targetCollider == null)
// make sure we have a targetCollider for CameraWindow attached to this Entity. If we dont bail out.
if (_targetCollider == null || _targetCollider.Entity != _targetEntity)
{
_targetCollider = _targetEntity.GetComponent<Collider>();
if (_targetCollider == null)
return;
}

var targetBounds = _targetEntity.GetComponent<Collider>().Bounds;
var targetBounds = _targetCollider.Bounds;
if (!_worldSpaceDeadzone.Contains(targetBounds))
{
// x-axis
Expand All @@ -188,6 +188,12 @@ void UpdateFollow()

public void Follow(Entity targetEntity, CameraStyle cameraStyle = CameraStyle.CameraWindow)
{
if (targetEntity != _targetEntity)
{
// new entity -> invalidate cached collider
_targetCollider = null;
}

_targetEntity = targetEntity;
_cameraStyle = cameraStyle;
var cameraBounds = Camera.Bounds;
Expand Down