From 88248a962ce6193c33a17bbc6d463915b0984de6 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Fri, 21 Jun 2019 17:50:01 -0700 Subject: [PATCH] rename some engine methods for consistency --- encompass-cs/ComponentManager.cs | 10 +++++----- encompass-cs/Engine.cs | 8 ++++---- encompass-cs/RenderManager.cs | 2 +- test/EngineTest.cs | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/encompass-cs/ComponentManager.cs b/encompass-cs/ComponentManager.cs index 8d10ef6..8ba9fa6 100644 --- a/encompass-cs/ComponentManager.cs +++ b/encompass-cs/ComponentManager.cs @@ -144,14 +144,14 @@ namespace Encompass return componentIDToType[componentID]; } - internal Guid GetEntityIDFromComponentID(Guid componentID) + internal Guid GetEntityIDByComponentID(Guid componentID) { return componentIDToEntityID[componentID]; } internal void UpdateComponent(Guid componentID, TComponent newComponentValue) where TComponent : struct, IComponent { - var entityID = GetEntityIDFromComponentID(componentID); + var entityID = GetEntityIDByComponentID(componentID); IDToComponent[componentID] = newComponentValue; } @@ -169,7 +169,7 @@ namespace Encompass { componentsToActivate.Add(componentID); - var entityID = GetEntityIDFromComponentID(componentID); + var entityID = GetEntityIDByComponentID(componentID); entitiesWithAddedComponents.Add(entityID); } @@ -177,7 +177,7 @@ namespace Encompass { componentsToDeactivate.Add(componentID); - var entityID = GetEntityIDFromComponentID(componentID); + var entityID = GetEntityIDByComponentID(componentID); entitiesWithRemovedComponents.Add(entityID); } @@ -185,7 +185,7 @@ namespace Encompass { componentsToRemove.Add(componentID); - var entityID = GetEntityIDFromComponentID(componentID); + var entityID = GetEntityIDByComponentID(componentID); entitiesWithRemovedComponents.Add(entityID); } diff --git a/encompass-cs/Engine.cs b/encompass-cs/Engine.cs index 30cd58d..a93aae1 100644 --- a/encompass-cs/Engine.cs +++ b/encompass-cs/Engine.cs @@ -63,14 +63,14 @@ namespace Encompass return entityManager.GetEntity(entityID); } - protected Guid GetEntityIDFromComponentID(Guid componentID) + protected Guid GetEntityIDByComponentID(Guid componentID) { - return componentManager.GetEntityIDFromComponentID(componentID); + return componentManager.GetEntityIDByComponentID(componentID); } - protected Entity GetEntityFromComponentID(Guid componentID) + protected Entity GetEntityByComponentID(Guid componentID) { - return GetEntity(GetEntityIDFromComponentID(componentID)); + return GetEntity(GetEntityIDByComponentID(componentID)); } protected TComponent GetComponentByID(Guid componentID) where TComponent : struct, IComponent diff --git a/encompass-cs/RenderManager.cs b/encompass-cs/RenderManager.cs index 101bda6..093c5e1 100644 --- a/encompass-cs/RenderManager.cs +++ b/encompass-cs/RenderManager.cs @@ -52,7 +52,7 @@ namespace Encompass if (drawComponentTypeToEntityRenderer.ContainsKey(componentType)) { var renderer = drawComponentTypeToEntityRenderer[componentType]; - var entityID = componentManager.GetEntityIDFromComponentID(componentID); + var entityID = componentManager.GetEntityIDByComponentID(componentID); if (renderer.IsTracking(entityID)) { diff --git a/test/EngineTest.cs b/test/EngineTest.cs index c8d85d8..9220e52 100644 --- a/test/EngineTest.cs +++ b/test/EngineTest.cs @@ -392,7 +392,7 @@ namespace Tests foreach (var componentPair in componentPairs) { var componentID = componentPair.Key; - var entityID = GetEntityIDFromComponentID(componentID); + var entityID = GetEntityIDByComponentID(componentID); Destroy(entityID); } } @@ -442,7 +442,7 @@ namespace Tests public override void Update(float dt) { var componentID = ReadComponent().Key; - entityFromComponentIDResult = GetEntityFromComponentID(componentID); + entityFromComponentIDResult = GetEntityByComponentID(componentID); } }