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

fix engine ordering issue with Spawner

pull/5/head
Evan Hemsley 2019-06-28 22:57:18 -07:00
parent dc99f58334
commit 8d39c27b7f
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
encompass-cs/WorldBuilder.cs
View File

@ -55,46 +55,38 @@ namespace Encompass
entityManager.RegisterEntityTracker(engine as IEntityTracker); entityManager.RegisterEntityTracker(engine as IEntityTracker);
} }
var emitMessageAttribute = engine.GetType().GetCustomAttribute<Emits>(false); foreach (var emitMessageType in engine.emitMessageTypes)
if (emitMessageAttribute != null)
{ {
foreach (var emitMessageType in engine.GetType().GetCustomAttribute<Emits>(false).emitMessageTypes) if (!messageTypeToEmitters.ContainsKey(emitMessageType))
{ {
if (!messageTypeToEmitters.ContainsKey(emitMessageType)) messageTypeToEmitters.Add(emitMessageType, new HashSet<Engine>());
{ }
messageTypeToEmitters.Add(emitMessageType, new HashSet<Engine>());
}
messageTypeToEmitters[emitMessageType].Add(engine); messageTypeToEmitters[emitMessageType].Add(engine);
if (messageTypeToReaders.ContainsKey(emitMessageType)) if (messageTypeToReaders.ContainsKey(emitMessageType))
{
foreach (var reader in messageTypeToReaders[emitMessageType])
{ {
foreach (var reader in messageTypeToReaders[emitMessageType]) engineGraph.AddEdge(engine, reader);
{
engineGraph.AddEdge(engine, reader);
}
} }
} }
} }
var readMessageAttribute = engine.GetType().GetCustomAttribute<Reads>(false); foreach (var readMessageType in engine.readMessageTypes)
if (readMessageAttribute != null)
{ {
foreach (var readMessageType in engine.GetType().GetCustomAttribute<Reads>(false).readMessageTypes) if (!messageTypeToReaders.ContainsKey(readMessageType))
{ {
if (!messageTypeToReaders.ContainsKey(readMessageType)) messageTypeToReaders.Add(readMessageType, new HashSet<Engine>());
{ }
messageTypeToReaders.Add(readMessageType, new HashSet<Engine>());
}
messageTypeToReaders[readMessageType].Add(engine); messageTypeToReaders[readMessageType].Add(engine);
if (messageTypeToEmitters.ContainsKey(readMessageType)) if (messageTypeToEmitters.ContainsKey(readMessageType))
{
foreach (var emitter in messageTypeToEmitters[readMessageType])
{ {
foreach (var emitter in messageTypeToEmitters[readMessageType]) engineGraph.AddEdge(emitter, engine);
{
engineGraph.AddEdge(emitter, engine);
}
} }
} }
} }

14
test/SpawnerTest.cs
View File

@ -14,6 +14,15 @@ namespace Tests
static Entity resultEntity; static Entity resultEntity;
[Emits(typeof(SpawnMessageA))]
class MessageEmitter : Engine
{
public override void Update(double dt)
{
EmitMessage(new SpawnMessageA());
}
}
class TestSpawner : Spawner<SpawnMessageA> class TestSpawner : Spawner<SpawnMessageA>
{ {
protected override void Spawn(SpawnMessageA message) protected override void Spawn(SpawnMessageA message)
@ -27,10 +36,9 @@ namespace Tests
public void RunsSpawnMethodOnMessageRead() public void RunsSpawnMethodOnMessageRead()
{ {
var worldBuilder = new WorldBuilder(); var worldBuilder = new WorldBuilder();
worldBuilder.AddEngine(new MessageEmitter());
worldBuilder.AddEngine(new TestSpawner()); worldBuilder.AddEngine(new TestSpawner());
worldBuilder.EmitMessage(new SpawnMessageA());
var world = worldBuilder.Build(); var world = worldBuilder.Build();
world.Update(0.01); world.Update(0.01);
@ -41,7 +49,7 @@ namespace Tests
world.Update(0.01); world.Update(0.01);
Assert.That(resultEntity.id, Is.EqualTo(id)); Assert.That(resultEntity.id, Is.Not.EqualTo(id));
} }
} }
} }