From d54c4c83f7ca9558dcdb465507c51d47329cd499 Mon Sep 17 00:00:00 2001 From: Benjamin Kloster Date: Fri, 17 May 2013 21:38:51 +0200 Subject: [PATCH] Rename m_skyEntities to m_entities for consistency All other systems just use m_entities. --- src/ogre/sky_system.cpp | 8 ++++---- src/ogre/sky_system.h | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/ogre/sky_system.cpp b/src/ogre/sky_system.cpp index d7713b43a95..84b50f7946a 100644 --- a/src/ogre/sky_system.cpp +++ b/src/ogre/sky_system.cpp @@ -77,7 +77,7 @@ struct SkySystem::Implementation { EntityFilter< Optional - > m_skyEntities; + > m_entities; }; @@ -99,13 +99,13 @@ SkySystem::init( OgreEngine* ogreEngine = dynamic_cast(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 index b7481fba1a5..cf59944e5e8 100644 --- a/src/ogre/sky_system.h +++ b/src/ogre/sky_system.h @@ -8,9 +8,6 @@ #include #include - -#include - namespace luabind { class scope; }