Rename m_skyEntities to m_entities for consistency

All other systems just use m_entities.
yowshi · May 17, 2013 · d54c4c8 · d54c4c8
1 parent 43c16da
commit d54c4c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/ogre/sky_system.cpp b/src/ogre/sky_system.cpp
@@ -77,7 +77,7 @@ struct SkySystem::Implementation {
 
     EntityFilter<
         Optional<SkyPlaneComponent>
-    > m_skyEntities;
+    > m_entities;
 };
 
 
@@ -99,13 +99,13 @@ SkySystem::init(
     OgreEngine* ogreEngine = dynamic_cast<OgreEngine*>(engine);
     assert(ogreEngine != nullptr && "System requires an OgreEngine");
     m_impl->m_sceneManager = ogreEngine->sceneManager();
-    m_impl->m_skyEntities.setEngine(engine);
+    m_impl->m_entities.setEngine(engine);
 }
 
 
 void
 SkySystem::shutdown() {
-    m_impl->m_skyEntities.setEngine(nullptr);
+    m_impl->m_entities.setEngine(nullptr);
     m_impl->m_sceneManager->setSkyBoxEnabled(false);
     m_impl->m_sceneManager->setSkyDomeEnabled(false);
     m_impl->m_sceneManager->setSkyPlaneEnabled(false);
@@ -116,7 +116,7 @@ SkySystem::shutdown() {
 
 void
 SkySystem::update(int) {
-    for (auto& value : m_impl->m_skyEntities) {
+    for (auto& value : m_impl->m_entities) {
         SkyPlaneComponent* plane = std::get<0>(value.second);
         if (plane and plane->m_properties.hasChanges()) {
             const SkyPlaneComponent::Properties& properties = plane->m_properties.stable();

diff --git a/src/ogre/sky_system.h b/src/ogre/sky_system.h
@@ -8,9 +8,6 @@
 #include <OgrePlane.h>
 #include <OgreResourceGroupManager.h>
 
-
-#include <iostream>
-
 namespace luabind {
 class scope;
 }