From 385defd8e61128532213b29bc602bfcee2313b45 Mon Sep 17 00:00:00 2001 From: Syntriax Date: Thu, 25 Jan 2024 12:42:16 +0300 Subject: [PATCH] refactor: Possible Bugs --- Engine.Physics2D/Collider2DCircleBehaviour.cs | 8 +++----- Engine.Physics2D/Collider2DShapeBehaviour.cs | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Engine.Physics2D/Collider2DCircleBehaviour.cs b/Engine.Physics2D/Collider2DCircleBehaviour.cs index 7a68e68..8607e44 100644 --- a/Engine.Physics2D/Collider2DCircleBehaviour.cs +++ b/Engine.Physics2D/Collider2DCircleBehaviour.cs @@ -12,17 +12,15 @@ public class Collider2DCircleBehaviour : BehaviourOverride, ICircleCollider2D public Action? OnCollisionPreResolve { get; set; } = null; public Action? OnCollisionResolved { get; set; } = null; - public Action? OnTransformAssigned { get; set; } = null; - public Circle CircleWorld { get; protected set; } = new(Vector2D.Zero, 1f); public Circle CircleLocal { get; set; } = new(Vector2D.Zero, 1f); public IRigidBody2D? RigidBody2D { get; set; } = null; - ITransform IAssignableTransform.Transform => GameObject.Transform; - - public bool Assign(ITransform transform) => GameObject.Assign(transform); + ITransform IAssignableTransform.Transform => Transform; + Action? IAssignableTransform.OnTransformAssigned { get => GameObject.OnTransformAssigned; set => GameObject.OnTransformAssigned = value; } + bool IAssignableTransform.Assign(ITransform transform) => GameObject.Assign(transform); public virtual void Recalculate() => CircleWorld = Transform.TransformCircle(CircleLocal).Displace(Transform.Position); } diff --git a/Engine.Physics2D/Collider2DShapeBehaviour.cs b/Engine.Physics2D/Collider2DShapeBehaviour.cs index 159fa02..13c0cff 100644 --- a/Engine.Physics2D/Collider2DShapeBehaviour.cs +++ b/Engine.Physics2D/Collider2DShapeBehaviour.cs @@ -12,8 +12,6 @@ public class Collider2DShapeBehaviour : BehaviourOverride, IShapeCollider2D public Action? OnCollisionPreResolve { get; set; } = null; public Action? OnCollisionResolved { get; set; } = null; - public Action? OnTransformAssigned { get; set; } = null; - public Shape ShapeWorld => _shapeWorld; public Shape ShapeLocal { get; set; } = new([new(1f, 1f), new(-1f, 1f), new(-1f, -1f), new(1f, -1f)]); @@ -21,9 +19,9 @@ public class Collider2DShapeBehaviour : BehaviourOverride, IShapeCollider2D protected Shape _shapeWorld = new([new(1f, 1f), new(-1f, 1f), new(-1f, -1f), new(1f, -1f)]); - ITransform IAssignableTransform.Transform => GameObject.Transform; - - public bool Assign(ITransform transform) => GameObject.Assign(transform); + ITransform IAssignableTransform.Transform => Transform; + Action? IAssignableTransform.OnTransformAssigned { get => GameObject.OnTransformAssigned; set => GameObject.OnTransformAssigned = value; } + bool IAssignableTransform.Assign(ITransform transform) => GameObject.Assign(transform); public virtual void Recalculate() => Transform.TransformShape(ShapeLocal, ref _shapeWorld); }