MoonsideGames
/
encompass-cs
4
0
Fork 0
Code Issues Pull Requests Releases 7 Wiki Activity

more cleanup
continuous-integration/drone/push Build is passing Details

pull/3/head
Evan Hemsley 2020-03-20 02:28:10 -07:00
parent 63e9ca63c0
commit b6ae9eaebc
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
encompass-cs/Collections/TypedComponentStore.cs
View File

@ -54,8 +54,7 @@ namespace Encompass
_indices[entityID] = _idManager.NextID(); _indices[entityID] = _idManager.NextID();
} }
var ptr = Unsafe.AsPointer(ref component); _components[_indices[entityID]] = Unsafe.AsRef<TComponent>(Unsafe.AsPointer(ref component));
_components[_indices[entityID]] = Unsafe.AsRef<TComponent>(ptr);
} }
public override bool Remove(int entityID, int priority) public override bool Remove(int entityID, int priority)
@ -63,9 +62,7 @@ namespace Encompass
if (!_priorities.ContainsKey(entityID) || priority < _priorities[entityID]) if (!_priorities.ContainsKey(entityID) || priority < _priorities[entityID])
{ {
_priorities[entityID] = priority; _priorities[entityID] = priority;
_indices.Remove(entityID); ForceRemove(entityID);
_priorities.Remove(entityID);
_idManager.Free(entityID);
return true; return true;
} }

18
encompass-cs/DrawLayerManager.cs
View File

@ -9,7 +9,7 @@ namespace Encompass
{ {
private readonly SortedList<int, int> _layerOrder = new SortedList<int, int>(); private readonly SortedList<int, int> _layerOrder = new SortedList<int, int>();
private readonly Dictionary<int, Dictionary<Type, HashSet<int>>> _layerIndexToComponentStore = new Dictionary<int, Dictionary<Type, HashSet<int>>>(); private readonly Dictionary<int, Dictionary<Type, HashSet<int>>> _layerIndexToTypeToID = new Dictionary<int, Dictionary<Type, HashSet<int>>>();
private readonly Dictionary<int, HashSet<GeneralRenderer>> _layerIndexToGeneralRenderers = new Dictionary<int, HashSet<GeneralRenderer>>(512); private readonly Dictionary<int, HashSet<GeneralRenderer>> _layerIndexToGeneralRenderers = new Dictionary<int, HashSet<GeneralRenderer>>(512);
private readonly Dictionary<Type, Dictionary<int, int>> _typeToEntityToLayer = new Dictionary<Type, Dictionary<int, int>>(512); private readonly Dictionary<Type, Dictionary<int, int>> _typeToEntityToLayer = new Dictionary<Type, Dictionary<int, int>>(512);
@ -22,11 +22,11 @@ namespace Encompass
public void RegisterDrawLayer(int layer) public void RegisterDrawLayer(int layer)
{ {
if (!_layerIndexToComponentStore.ContainsKey(layer)) if (!_layerIndexToTypeToID.ContainsKey(layer))
{ {
_layerOrder.Add(layer, layer); _layerOrder.Add(layer, layer);
_layerIndexToGeneralRenderers.Add(layer, new HashSet<GeneralRenderer>()); _layerIndexToGeneralRenderers.Add(layer, new HashSet<GeneralRenderer>());
_layerIndexToComponentStore.Add(layer, new Dictionary<Type, HashSet<int>>()); _layerIndexToTypeToID.Add(layer, new Dictionary<Type, HashSet<int>>());
} }
} }
@ -37,7 +37,7 @@ namespace Encompass
_typeToEntityToLayer.Add(typeof(TComponent), new Dictionary<int, int>(128)); _typeToEntityToLayer.Add(typeof(TComponent), new Dictionary<int, int>(128));
} }
foreach (var pair in _layerIndexToComponentStore) foreach (var pair in _layerIndexToTypeToID)
{ {
if (!pair.Value.ContainsKey(typeof(TComponent))) if (!pair.Value.ContainsKey(typeof(TComponent)))
{ {
@ -55,14 +55,14 @@ namespace Encompass
public void RegisterComponentWithLayer<TComponent>(int entityID, int layer) where TComponent : struct, IComponent public void RegisterComponentWithLayer<TComponent>(int entityID, int layer) where TComponent : struct, IComponent
{ {
if (!_layerIndexToComponentStore.ContainsKey(layer)) if (!_layerIndexToTypeToID.ContainsKey(layer))
{ {
throw new UndefinedLayerException("Layer {0} is not defined. Use WorldBuilder.RegisterDrawLayer to register the layer.", layer); throw new UndefinedLayerException("Layer {0} is not defined. Use WorldBuilder.RegisterDrawLayer to register the layer.", layer);
} }
if (_typeToEntityToLayer[typeof(TComponent)].ContainsKey(entityID)) { UnRegisterComponentWithLayer<TComponent>(entityID); } if (_typeToEntityToLayer[typeof(TComponent)].ContainsKey(entityID)) { UnRegisterComponentWithLayer<TComponent>(entityID); }
var set = _layerIndexToComponentStore[layer][typeof(TComponent)]; var set = _layerIndexToTypeToID[layer][typeof(TComponent)];
set.Add(entityID); set.Add(entityID);
_typeToEntityToLayer[typeof(TComponent)].Add(entityID, layer); _typeToEntityToLayer[typeof(TComponent)].Add(entityID, layer);
@ -75,14 +75,14 @@ namespace Encompass
if (_typeToEntityToLayer[typeof(TComponent)].ContainsKey(entityID)) if (_typeToEntityToLayer[typeof(TComponent)].ContainsKey(entityID))
{ {
var layer = _typeToEntityToLayer[typeof(TComponent)][entityID]; var layer = _typeToEntityToLayer[typeof(TComponent)][entityID];
_layerIndexToComponentStore[layer][typeof(TComponent)].Remove(entityID); _layerIndexToTypeToID[layer][typeof(TComponent)].Remove(entityID);
} }
_typeToEntityToLayer[typeof(TComponent)].Remove(entityID); _typeToEntityToLayer[typeof(TComponent)].Remove(entityID);
} }
public void UnRegisterEntityWithLayer(int entityID) public void UnRegisterEntityWithLayer(int entityID)
{ {
foreach (var store in _layerIndexToComponentStore.Values) foreach (var store in _layerIndexToTypeToID.Values)
{ {
foreach (var set in store.Values) foreach (var set in store.Values)
{ {
@ -100,7 +100,7 @@ namespace Encompass
public IEnumerable<(int, Type)> AllInLayer(int layer) public IEnumerable<(int, Type)> AllInLayer(int layer)
{ {
foreach (var kvp in _layerIndexToComponentStore[layer]) foreach (var kvp in _layerIndexToTypeToID[layer])
{ {
foreach (var id in kvp.Value) foreach (var id in kvp.Value)
{ {

2
encompass-cs/Interfaces/IDrawableComponent.cs
View File

@ -2,6 +2,6 @@ namespace Encompass
{ {
public interface IDrawableComponent public interface IDrawableComponent
{ {
int Layer { get; set; } int Layer { get; }
} }
} }