CInstanceManager refactoring

 * removed classes managed by CInstanceManager
   except for CObject, CPyro, CBrain and CPhysics
   because of dependencies
 * refactored instance searching to use existing singleton instances of
   CApplication, CEngine and CRobotMain and calling their getter
   functions

1 files changed, 19 insertions, 15 deletions

diff --git a/src/graphics/engine/pyro.cpp b/src/graphics/engine/pyro.cpp
index e374d6c..1d80fea 100644
--- a/src/graphics/engine/pyro.cpp
+++ b/src/graphics/engine/pyro.cpp
@@ -18,6 +18,9 @@
 
 #include "graphics/engine/pyro.h"
 
+#include "app/app.h"
+
+#include "common/iman.h"
 #include "common/logger.h"
 
 #include "graphics/engine/lightman.h"
@@ -36,20 +39,19 @@
 namespace Gfx {
 
 
-CPyro::CPyro(CInstanceManager* iMan)
+CPyro::CPyro()
 {
-    m_iMan = iMan;
-    m_iMan->AddInstance(CLASS_PYRO, this, 100);
-
-    m_engine      = static_cast<CEngine*>(m_iMan->SearchInstance(CLASS_ENGINE));
-    m_terrain     = static_cast<CTerrain*>(m_iMan->SearchInstance(CLASS_TERRAIN));
-    m_camera      = static_cast<CCamera*>(m_iMan->SearchInstance(CLASS_CAMERA));
-    m_particle    = static_cast<CParticle*>(m_iMan->SearchInstance(CLASS_PARTICULE));
-    m_lightMan    = static_cast<CLightManager*>(m_iMan->SearchInstance(CLASS_LIGHT));
-    m_displayText = static_cast<Ui::CDisplayText*>(m_iMan->SearchInstance(CLASS_DISPLAYTEXT));
-    m_main        = static_cast<CRobotMain*>(m_iMan->SearchInstance(CLASS_MAIN));
-    m_sound       = static_cast<CSoundInterface*>(m_iMan->SearchInstance(CLASS_SOUND));
-    m_object = 0;
+    CInstanceManager::GetInstancePointer()->AddInstance(CLASS_PYRO, this, 100);
+
+    m_engine      = CEngine::GetInstancePointer();
+    m_main        = CRobotMain::GetInstancePointer();
+    m_terrain     = m_main->GetTerrain();
+    m_camera      = m_main->GetCamera();
+    m_particle    = m_engine->GetParticle();
+    m_lightMan    = m_engine->GetLightManager();
+    m_displayText = m_main->GetDisplayText();
+    m_sound       = CApplication::GetInstancePointer()->GetSound();
+    m_object      = nullptr;
 
     m_progress = 0.0f;
     m_speed = 0.0f;
@@ -60,7 +62,7 @@ CPyro::CPyro(CInstanceManager* iMan)
 
 CPyro::~CPyro()
 {
-    m_iMan->DeleteInstance(CLASS_PYRO, this);
+    CInstanceManager::GetInstancePointer()->DeleteInstance(CLASS_PYRO, this);
 }
 
 void CPyro::DeleteObject()
@@ -2183,9 +2185,11 @@ CObject* CPyro::FallSearchBeeExplo()
     float iRadius;
     m_object->GetCrashSphere(0, iPos, iRadius);
 
+    CInstanceManager* iMan = CInstanceManager::GetInstancePointer();
+
     for (int i = 0; i < 1000000; i++)
     {
-        CObject* pObj = static_cast<CObject*>(m_iMan->SearchInstance(CLASS_OBJECT, i));
+        CObject* pObj = static_cast<CObject*>(iMan->SearchInstance(CLASS_OBJECT, i));
         if ( pObj == 0 )  break;
 
         ObjectType oType = pObj->GetType();