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, 8 deletions

diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp
index d83cd2dc6fd..68adb07b1f8 100644
--- a/source/gameengine/VideoTexture/ImageRender.cpp
+++ b/source/gameengine/VideoTexture/ImageRender.cpp
@@ -80,7 +80,6 @@ ImageRender::ImageRender (KX_Scene *scene, KX_Camera * camera) :
 	m_engine = KX_GetActiveEngine();
 	m_rasterizer = m_engine->GetRasterizer();
 	m_canvas = m_engine->GetCanvas();
-	m_rendertools = m_engine->GetRenderTools();
 }
 
 // destructor
@@ -200,9 +199,8 @@ void ImageRender::Render()
 	m_canvas->ClearColor(m_background[0], m_background[1], m_background[2], m_background[3]);
 	m_canvas->ClearBuffer(RAS_ICanvas::COLOR_BUFFER|RAS_ICanvas::DEPTH_BUFFER);
 	m_rasterizer->BeginFrame(RAS_IRasterizer::KX_TEXTURED,m_engine->GetClockTime());
-	m_rendertools->BeginFrame(m_rasterizer);
 	m_engine->SetWorldSettings(m_scene->GetWorldInfo());
-	m_rendertools->SetAuxilaryClientInfo(m_scene);
+	m_rasterizer->SetAuxilaryClientInfo(m_scene);
 	m_rasterizer->DisplayFog();
 	// matrix calculation, don't apply any of the stereo mode
 	m_rasterizer->SetStereoMode(RAS_IRasterizer::RAS_STEREO_NOSTEREO);
@@ -275,7 +273,7 @@ void ImageRender::Render()
 
 	m_scene->CalculateVisibleMeshes(m_rasterizer,m_camera);
 
-	m_scene->RenderBuckets(camtrans, m_rasterizer, m_rendertools);
+	m_scene->RenderBuckets(camtrans, m_rasterizer);
 
 	m_scene->RenderFonts();
 
@@ -595,7 +593,6 @@ ImageRender::ImageRender (KX_Scene *scene, KX_GameObject *observer, KX_GameObjec
 	m_engine = KX_GetActiveEngine();
 	m_rasterizer = m_engine->GetRasterizer();
 	m_canvas = m_engine->GetCanvas();
-	m_rendertools = m_engine->GetRenderTools();
 	// locate the vertex assigned to mat and do following calculation in mesh coordinates
 	for (int meshIndex = 0; meshIndex < mirror->GetMeshCount(); meshIndex++)
 	{
diff --git a/source/gameengine/VideoTexture/ImageRender.h b/source/gameengine/VideoTexture/ImageRender.h
index 680e1cc1d89..98dceeaafe1 100644
--- a/source/gameengine/VideoTexture/ImageRender.h
+++ b/source/gameengine/VideoTexture/ImageRender.h
@@ -39,7 +39,6 @@
 #include "DNA_screen_types.h"
 #include "RAS_ICanvas.h"
 #include "RAS_IRasterizer.h"
-#include "RAS_IRenderTools.h"
 
 #include "ImageViewport.h"
 
@@ -88,8 +87,6 @@ protected:
 	RAS_ICanvas* m_canvas;
 	/// rasterizer
 	RAS_IRasterizer* m_rasterizer;
-	/// render tools
-	RAS_IRenderTools* m_rendertools;
 	/// engine
 	KX_KetsjiEngine* m_engine;