Skip to content
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

fix: character trigger area + avatar modifier area #2859

Merged
merged 9 commits into from
Nov 29, 2024
Merged

fix: character trigger area + avatar modifier area #2859

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
782b215
replaced cached position with real transform position
fcolarich Nov 21, 2024
2f03a8b
Added proper parenting instead of copying transform position
fcolarich Nov 22, 2024
e9edd2f
Fixed failing test
fcolarich Nov 22, 2024
beef66f
Merge branch 'dev' into fix/character_trigger_area_incorrect_position
fcolarich Nov 22, 2024
c3176df
fixed character trigger area colliders not being re-enabled
pravusjif Nov 28, 2024
ff7bdae
Merge branch 'dev' into fix/character_trigger_area_incorrect_position
pravusjif Nov 28, 2024
fb46c97
minor change to fix tests
pravusjif Nov 28, 2024
73e5cdf
fixed avatar modifier area
pravusjif Nov 29, 2024
7e691ec
Merge branch 'dev' into fix/character_trigger_area_incorrect_position
pravusjif Nov 29, 2024
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
29 changes: 11 additions & 18 deletions Explorer/Assets/DCL/CharacterTriggerArea/Components/CharacterTriggerAreaComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public CharacterTriggerAreaComponent(Vector3 areaSize, bool targetOnlyMainPlayer
IsDirty = true;
}

public void TryAssignArea(IComponentPool<CharacterTriggerArea> pool, Transform mainPlayerTransform)
public void TryAssignArea(IComponentPool<CharacterTriggerArea> pool, Transform mainPlayerTransform, TransformComponent transformComponent)
{
if (IsDirty == false) return;

Expand All @@ -49,9 +49,19 @@ public void TryAssignArea(IComponentPool<CharacterTriggerArea> pool, Transform m

if (targetOnlyMainPlayer)
monoBehaviour!.TargetTransform = mainPlayerTransform;

Transform triggerAreaTransform = monoBehaviour.transform;

triggerAreaTransform.SetParent(transformComponent.Transform);
triggerAreaTransform.localPosition = Vector3.zero;
triggerAreaTransform.localRotation = Quaternion.identity;
}

monoBehaviour!.BoxCollider.size = AreaSize;

if (!monoBehaviour.BoxCollider.enabled)
monoBehaviour.BoxCollider.enabled = true;

}

public void UpdateAreaSize(Vector3 size)
Expand All @@ -60,23 +70,6 @@ public void UpdateAreaSize(Vector3 size)
IsDirty = true;
}

public readonly void TryUpdateTransform(ref TransformComponent transformComponent)
{
if (monoBehaviour == null)
return;

Transform triggerAreaTransform = monoBehaviour.transform;

if (transformComponent.Cached.WorldPosition != triggerAreaTransform.position)
triggerAreaTransform.position = transformComponent.Cached.WorldPosition;

if (transformComponent.Cached.WorldRotation != triggerAreaTransform.rotation)
triggerAreaTransform.rotation = transformComponent.Cached.WorldRotation;

if (!monoBehaviour.BoxCollider.enabled)
monoBehaviour.BoxCollider.enabled = true;
}

public void TryRelease(IComponentPool<CharacterTriggerArea> pool)
{
if (monoBehaviour != null)
Expand Down
3 changes: 1 addition & 2 deletions Explorer/Assets/DCL/CharacterTriggerArea/Systems/CharacterTriggerAreaHandlerSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ private void UpdateCharacterTriggerArea(ref TransformComponent transformComponen
if (triggerAreaComponent.TryDispose(sceneStateProvider))
return;

triggerAreaComponent.TryAssignArea(poolRegistry, mainPlayerTransform);
triggerAreaComponent.TryUpdateTransform(ref transformComponent);
triggerAreaComponent.TryAssignArea(poolRegistry, mainPlayerTransform, transformComponent);
}
}
}
Loading