BGE Rasterizer Cleanup: Removing RAS_IRenderTools and moving the functionality to RAS_IRasterizer. RAS_OpenGLRasterizer is a bit of a mess now with references to Ketsji and other modules it shouldn't be accessing.

2 files changed, 2 insertions, 19 deletions

diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index c74e3daf7b2..d8eb224d5f7 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -86,7 +86,6 @@ extern "C"
 #include "NG_LoopBackNetworkDeviceInterface.h"
 
 #include "GPC_MouseDevice.h"
-#include "GPC_RenderTools.h"
 #include "GPG_Canvas.h" 
 #include "GPG_KeyboardDevice.h"
 #include "GPG_System.h"
@@ -126,8 +125,7 @@ GPG_Application::GPG_Application(GHOST_ISystem* system)
 	  m_kxsystem(0), 
 	  m_keyboard(0), 
 	  m_mouse(0), 
-	  m_canvas(0), 
-	  m_rendertools(0), 
+	  m_canvas(0),
 	  m_rasterizer(0), 
 	  m_sceneconverter(0),
 	  m_networkdevice(0),
@@ -591,10 +589,6 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 		m_canvas->Init();
 		if (gm->flag & GAME_SHOW_MOUSE)
 			m_canvas->SetMouseState(RAS_ICanvas::MOUSE_NORMAL);
-
-		m_rendertools = new GPC_RenderTools();
-		if (!m_rendertools)
-			goto initFailed;
 		
 		//Don't use displaylists with VBOs
 		//If auto starts using VBOs, make sure to check for that here
@@ -639,7 +633,6 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 		m_ketsjiengine->SetMouseDevice(m_mouse);
 		m_ketsjiengine->SetNetworkDevice(m_networkdevice);
 		m_ketsjiengine->SetCanvas(m_canvas);
-		m_ketsjiengine->SetRenderTools(m_rendertools);
 		m_ketsjiengine->SetRasterizer(m_rasterizer);
 
 		KX_KetsjiEngine::SetExitKey(ConvertKeyCode(gm->exitkey));
@@ -667,10 +660,8 @@ initFailed:
 	delete m_mouse;
 	delete m_keyboard;
 	delete m_rasterizer;
-	delete m_rendertools;
 	delete m_canvas;
 	m_canvas = NULL;
-	m_rendertools = NULL;
 	m_rasterizer = NULL;
 	m_keyboard = NULL;
 	m_mouse = NULL;
@@ -752,7 +743,7 @@ bool GPG_Application::startEngine(void)
 #endif
 		m_sceneconverter->ConvertScene(
 			startscene,
-			m_rendertools,
+			m_rasterizer,
 			m_canvas);
 		m_ketsjiengine->AddScene(startscene);
 		
@@ -870,11 +861,6 @@ void GPG_Application::exitEngine()
 		delete m_rasterizer;
 		m_rasterizer = 0;
 	}
-	if (m_rendertools)
-	{
-		delete m_rendertools;
-		m_rendertools = 0;
-	}
 	if (m_canvas)
 	{
 		delete m_canvas;
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.h b/source/gameengine/GamePlayer/ghost/GPG_Application.h
index f141443e738..2d21b50e664 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.h
@@ -48,7 +48,6 @@ class GHOST_ISystem;
 class GHOST_ITimerTask;
 class GHOST_IWindow;
 class GPC_MouseDevice;
-class GPC_RenderTools;
 class GPG_Canvas;
 class GPG_KeyboardDevice;
 class GPG_System;
@@ -151,8 +150,6 @@ protected:
 	GPC_MouseDevice* m_mouse;
 	/** The game engine's canvas abstraction. */
 	GPG_Canvas* m_canvas;
-	/** The game engine's platform dependent render tools. */
-	GPC_RenderTools* m_rendertools;
 	/** the rasterizer */
 	RAS_IRasterizer* m_rasterizer;
 	/** Converts Blender data files. */