amacocian/MonoGame.Extended
1
0
Fork 0
mirror of https://github.com/AlexMacocian/MonoGame.Extended.git synced 2026-07-24 03:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed some bugs in the ecs

Browse Source
This commit is contained in:
Dylan Wilson
2018-01-24 21:27:57 +10:00
parent b856a36f38
commit c1391bbcd8
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MonoGame.Extended.Entities/Entity.cs
+9 -9
View File
@@ -104,15 +104,15 @@ namespace MonoGame.Extended.Entities
}
}
public string Group
{
get { return _group; }
set
{
_group = value;
Manager.AddEntityToGroup(value, this);
}
}
//public string Group
//{
// get { return _group; }
// set
// {
// _group = value;
// Manager.AddEntityToGroup(value, this);
// }
//}
IPoolable IPoolable.NextNode { get; set; }
IPoolable IPoolable.PreviousNode { get; set; }
Source/MonoGame.Extended.Entities/EntityManager.cs
+25 -25
View File
@@ -165,41 +165,41 @@ namespace MonoGame.Extended.Entities
return bag;
}
internal void AddEntityToGroup(string group, Entity entity)
{
Debug.Assert(entity != null);
//internal void AddEntityToGroup(string group, Entity entity)
//{
// Debug.Assert(entity != null);
if (string.IsNullOrEmpty(group))
return;
// if (string.IsNullOrEmpty(group))
// return;
RemoveEntityFromGroup(entity);
// RemoveEntityFromGroup(entity);
entity._group = group;
// entity._group = group;
Bag<Entity> entities;
// Bag<Entity> entities;
if (!_entitiesByGroup.TryGetValue(group, out entities))
{
entities = new Bag<Entity>();
_entitiesByGroup.Add(group, entities);
}
// if (!_entitiesByGroup.TryGetValue(group, out entities))
// {
// entities = new Bag<Entity>();
// _entitiesByGroup.Add(group, entities);
// }
entities.Add(entity);
}
// entities.Add(entity);
//}
internal void RemoveEntityFromGroup(Entity entity)
{
Bag<Entity> entities;
//internal void RemoveEntityFromGroup(Entity entity)
//{
// Bag<Entity> entities;
if (_entitiesByGroup.TryGetValue(entity._group, out entities))
entities.Remove(entity);
}
// if (_entitiesByGroup.TryGetValue(entity._group, out entities))
// entities.Remove(entity);
//}
internal void DestroyEntity(Entity entity)
{
Debug.Assert(entity != null);
RemoveEntityFromGroup(entity);
//RemoveEntityFromGroup(entity);
RemoveComponents(entity);
entity.Return();
}
@@ -405,6 +405,7 @@ namespace MonoGame.Extended.Entities
components.Remove(entity);
(component as IPoolable)?.Return();
(component as IDisposable)?.Dispose();
}
_componentsToRemove.Clear();
@@ -420,10 +421,9 @@ namespace MonoGame.Extended.Entities
{
var components = _entitiesToComponentsBag[i];
Debug.Assert(components != null);
object component;
if (!components.TryGetValue(entity, out component))
if (components == null || !components.TryGetValue(entity, out component))
continue;
components.Remove(entity);