From 11cf85cc7346f6e189e513c9204b3a79e07096b9 Mon Sep 17 00:00:00 2001
From: William Moberg <william.moberg@live.se>
Date: Mon, 8 Feb 2016 14:17:19 +0100
Subject: [PATCH] Renamed CollidableOctreeSystem to FillOctreeSystem.

---
 .../{CollidableOctreeSystem.h => FillOctreeSystem.h}        | 6 +++---
 .../{CollidableOctreeSystem.cpp => FillOctreeSystem.cpp}    | 6 +++---
 src/Game/Game.cpp                                           | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename include/Engine/Collision/{CollidableOctreeSystem.h => FillOctreeSystem.h} (66%)
 rename src/Engine/Collision/{CollidableOctreeSystem.cpp => FillOctreeSystem.cpp} (64%)

diff --git a/include/Engine/Collision/CollidableOctreeSystem.h b/include/Engine/Collision/FillOctreeSystem.h
similarity index 66%
rename from include/Engine/Collision/CollidableOctreeSystem.h
rename to include/Engine/Collision/FillOctreeSystem.h
index 0aa01d2e..9fd87b94 100644
--- a/include/Engine/Collision/CollidableOctreeSystem.h
+++ b/include/Engine/Collision/FillOctreeSystem.h
@@ -6,12 +6,12 @@
 #include "Collision.h"
 #include "EntityAABB.h"
 
-class CollidableOctreeSystem : public ImpureSystem, public PureSystem
+class FillOctreeSystem : public ImpureSystem, public PureSystem
 {
 public:
-    CollidableOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree, const std::string& componentType)
+    FillOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree, const std::string& fillComponentType)
         : System(world, eventBroker)
-        , PureSystem(componentType)
+        , PureSystem(fillComponentType)
         , m_Octree(octree)
     { }
 
diff --git a/src/Engine/Collision/CollidableOctreeSystem.cpp b/src/Engine/Collision/FillOctreeSystem.cpp
similarity index 64%
rename from src/Engine/Collision/CollidableOctreeSystem.cpp
rename to src/Engine/Collision/FillOctreeSystem.cpp
index 476414dd..d69319de 100644
--- a/src/Engine/Collision/CollidableOctreeSystem.cpp
+++ b/src/Engine/Collision/FillOctreeSystem.cpp
@@ -1,11 +1,11 @@
-#include "Collision/CollidableOctreeSystem.h"
+#include "Collision/FillOctreeSystem.h"
 
-void CollidableOctreeSystem::Update(double dt)
+void FillOctreeSystem::Update(double dt)
 {
     m_Octree->ClearDynamicObjects();
 }
 
-void CollidableOctreeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
+void FillOctreeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
 {
     if (entity.HasComponent("AABB")) {
         boost::optional<EntityAABB> absoluteAABB = Collision::EntityAbsoluteAABB(entity);
diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp
index f5afcaeb..157ea5ab 100644
--- a/src/Game/Game.cpp
+++ b/src/Game/Game.cpp
@@ -1,5 +1,5 @@
 #include "Game.h"
-#include "Collision/CollidableOctreeSystem.h"
+#include "Collision/FillOctreeSystem.h"
 #include "Collision/EntityAABB.h"
 #include "Collision/TriggerSystem.h"
 #include "Collision/CollisionSystem.h"
@@ -93,8 +93,8 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
-    m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
-    m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
+    m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
+    m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
     m_SystemPipeline->AddSystem<PlayerHUD>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel);