space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix collidable already registered spam

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-01-18 12:04:43 +01:00
parent 6d9a1a4e43
commit 8d58ad304a
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
SS14.Client/GameObjects/Components/Collidable/CollidableComponent.cs
View File

@@ -13,10 +13,8 @@ namespace SS14.Client.GameObjects
{
public class CollidableComponent : Component, ICollidableComponent
{
private bool _collisionIsActuallyEnabled;
private bool _collisionEnabled;
private bool _isHardCollidable;
private int _collisionLayer; //bitfield
private int _collisionMask; //bitfield
/// <inheritdoc />
public override string Name => "Collidable";
@@ -57,29 +55,33 @@ namespace SS14.Client.GameObjects
public bool CollisionEnabled
{
get => _collisionEnabled;
set => _collisionEnabled = value;
set
{
if (value == _collisionEnabled)
{
return;
}
_collisionEnabled = value;
if (value)
{
EnableCollision();
}
else
{
DisableCollision();
}
}
}
/// <inheritdoc />
public bool IsHardCollidable
{
get => _isHardCollidable;
set => _isHardCollidable = value;
}
public bool IsHardCollidable { get; set; }
/// <inheritdoc />
public int CollisionLayer
{
get => _collisionLayer;
set => _collisionLayer = value;
}
public int CollisionLayer { get; set; }
/// <inheritdoc />
public int CollisionMask
{
get => _collisionMask;
set => _collisionMask = value;
}
public int CollisionMask { get; set; }
/// <summary>
/// gets the AABB from the sprite component and sends it to the CollisionManager.
@@ -88,10 +90,11 @@ namespace SS14.Client.GameObjects
{
base.Initialize();
if (_collisionEnabled)
if (_collisionEnabled && !_collisionIsActuallyEnabled)
{
var cm = IoCManager.Resolve<IPhysicsManager>();
cm.AddCollidable(this);
_collisionIsActuallyEnabled = true;
}
}
@@ -136,6 +139,7 @@ namespace SS14.Client.GameObjects
private void EnableCollision()
{
_collisionEnabled = true;
_collisionIsActuallyEnabled = true;
var cm = IoCManager.Resolve<IPhysicsManager>();
cm.AddCollidable(this);
}
@@ -146,6 +150,7 @@ namespace SS14.Client.GameObjects
private void DisableCollision()
{
_collisionEnabled = false;
_collisionIsActuallyEnabled = false;
var cm = IoCManager.Resolve<IPhysicsManager>();
cm.RemoveCollidable(this);
}