[Cleanup] Moved 'm_dof' to gEnv

RigsOfRods · Oct 15, 2016 · c787b9d · c787b9d
1 parent c38fd69
commit c787b9d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 16 deletions.
diff --git a/source/main/GlobalEnvironment.h b/source/main/GlobalEnvironment.h
@@ -30,6 +30,7 @@ class GlobalEnvironment
     GlobalEnvironment() :
           cameraManager(0)
         , collisions(0)
+        , dof(0)
         , mainCamera(0)
         , player(0)
         , sceneManager(0)
@@ -46,6 +47,7 @@ class GlobalEnvironment
     CameraManager*      cameraManager;
     Character*          player;
     Collisions*         collisions;
+    DOFManager*         dof;
     SurveyMapManager*   surveyMap;
     SkyManager*         sky;
     TerrainManager*     terrainManager;

diff --git a/source/main/MainThread.cpp b/source/main/MainThread.cpp
@@ -410,9 +410,11 @@ void MainThread::Go()
 	delete gEnv->cameraManager;
 	gEnv->cameraManager = nullptr;
 
+	delete gEnv->dof;
+	gEnv->dof = nullptr;
+
 	delete gEnv;
 	gEnv = nullptr;
-
 }
 
 bool MainThread::SetupGameplayLoop()
@@ -513,13 +515,14 @@ bool MainThread::SetupGameplayLoop()
 	// depth of field effect
 	if (BSETTING("DOF", false) && RoR::App::GetContentManager()->isLoaded(ContentManager::ResourcePack::DEPTH_OF_FIELD.mask))
 	{
-		m_frame_listener->m_dof = new DOFManager();
+		gEnv->dof = new DOFManager();
+		gEnv->dof->setFocusMode(DOFManager::Auto);
 	}
 
-	if (!m_base_resource_loaded)
+	if (gEnv->cameraManager == nullptr)
 	{
 		// init camera manager after mygui and after we have a character
-		gEnv->cameraManager = new CameraManager(m_frame_listener->m_dof);
+		gEnv->cameraManager = new CameraManager();
 	}
 
 	// ============================================================================

diff --git a/source/main/gameplay/RoRFrameListener.cpp b/source/main/gameplay/RoRFrameListener.cpp
@@ -152,7 +152,6 @@ void RoRFrameListener::updateForceFeedback(float dt)
 
 RoRFrameListener::RoRFrameListener() :
 	m_dir_arrow_pointed(Vector3::ZERO),
-	m_dof(0),
 	m_heathaze(0),
 	m_hide_gui(false),
 	m_is_dir_arrow_visible(false),

diff --git a/source/main/gameplay/RoRFrameListener.h b/source/main/gameplay/RoRFrameListener.h
@@ -68,7 +68,6 @@ class RoRFrameListener: public Ogre::FrameListener, public Ogre::WindowEventList
 
 	void updateForceFeedback(float dt);
 
-	DOFManager *m_dof;
 	RoR::ForceFeedback m_forcefeedback;
 	HeatHaze *m_heathaze;
 

diff --git a/source/main/gfx/camera/CameraManager.cpp b/source/main/gfx/camera/CameraManager.cpp
@@ -21,7 +21,6 @@ along with Rigs of Rods.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "Application.h"
 #include "BeamFactory.h"
-#include "DepthOfFieldEffect.h"
 #include "InputEngine.h"
 #include "Settings.h"
 #include "GUIManager.h"
@@ -42,7 +41,7 @@ along with Rigs of Rods.  If not, see <http://www.gnu.org/licenses/>.
 using namespace Ogre;
 using namespace RoR;
 
-CameraManager::CameraManager(DOFManager *dof) : 
+CameraManager::CameraManager() : 
 	  currentBehavior(nullptr)
 	, currentBehaviorID(-1)
 	, mTransScale(1.0f)
@@ -55,14 +54,8 @@ CameraManager::CameraManager(DOFManager *dof) :
 	createGlobalBehaviors();
 
 	ctx.mCurrTruck = 0;
-	ctx.mDof = dof;
 	ctx.mDebug = BSETTING("Camera Debug", false);
 
-	if ( ctx.mDof )
-	{
-		ctx.mDof->setFocusMode(DOFManager::Auto);
-	}
-
 	m_config_enter_vehicle_keep_fixedfreecam = BSETTING("Camera_EnterVehicle_KeepFixedFreeCam", true);
 	m_config_exit_vehicle_keep_fixedfreecam  = BSETTING("Camera_ExitVehicle_KeepFixedFreeCam",  false);
 }

diff --git a/source/main/gfx/camera/CameraManager.h b/source/main/gfx/camera/CameraManager.h
@@ -35,15 +35,14 @@ class CameraManager : public IBehaviorManager
 
 public:
 
-	CameraManager(DOFManager *dof);
+	CameraManager();
 	~CameraManager();
 
 	class CameraContext
 	{
 	public:
 
 		Beam *mCurrTruck;
-		DOFManager *mDof;
 		Ogre::Degree mRotScale;
 		Ogre::Real mDt;
 		Ogre::Real mTransScale;