[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61091] trunk/blender/source/gameengine: BGE Rasterizer Cleanup: Removing the need to reference KX_BlenderMaterial or KX_PolygonMaterial in RAS_OpenGLRasterizer .

[Mitchell Stokes]

Revision: 61091
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61091
Author:   moguri
Date:     2013-11-04 19:21:32 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
BGE Rasterizer Cleanup: Removing the need to reference KX_BlenderMaterial or KX_PolygonMaterial in RAS_OpenGLRasterizer.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
    trunk/blender/source/gameengine/Ketsji/KX_PolygonMaterial.h
    trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp	2013-11-04 19:21:25 UTC (rev 61090)
+++ trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp	2013-11-04 19:21:32 UTC (rev 61091)
@@ -129,13 +129,13 @@
 		OnExit();
 }
 
-MTFace* KX_BlenderMaterial::GetMTFace(void) const 
+MTFace* KX_BlenderMaterial::GetMTFace() const
 {
 	// fonts on polys
 	return &mMaterial->tface;
 }
 
-unsigned int* KX_BlenderMaterial::GetMCol(void) const 
+unsigned int* KX_BlenderMaterial::GetMCol() const
 {
 	// fonts on polys
 	return mMaterial->rgb;

Modified: trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h	2013-11-04 19:21:25 UTC (rev 61090)
+++ trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h	2013-11-04 19:21:32 UTC (rev 61091)
@@ -79,8 +79,8 @@
 
 	Material* GetBlenderMaterial() const;
 	Image* GetBlenderImage() const;
-	MTFace* GetMTFace(void) const;
-	unsigned int* GetMCol(void) const;
+	MTFace* GetMTFace() const;
+	unsigned int* GetMCol() const;
 	BL_Texture * getTex (unsigned int idx) { 
 		return (idx < MAXTEX) ? mTextures + idx : NULL; 
 	}

Modified: trunk/blender/source/gameengine/Ketsji/KX_PolygonMaterial.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PolygonMaterial.h	2013-11-04 19:21:25 UTC (rev 61090)
+++ trunk/blender/source/gameengine/Ketsji/KX_PolygonMaterial.h	2013-11-04 19:21:32 UTC (rev 61091)
@@ -118,12 +118,12 @@
 	 * Returns the Blender texture face structure that is used for this material.
 	 * \return The material's texture face.
 	 */
-	MTFace* GetMTFace(void) const
+	MTFace* GetMTFace() const
 	{
 		return &m_tface;
 	}
 
-	unsigned int* GetMCol(void) const
+	unsigned int* GetMCol() const
 	{
 		return &m_mcol;
 	}

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp	2013-11-04 19:21:25 UTC (rev 61090)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp	2013-11-04 19:21:32 UTC (rev 61091)
@@ -235,7 +235,16 @@
 {
 	return NULL;
 }
+MTFace *RAS_IPolyMaterial::GetMTFace() const
+{
+	return NULL;
+}
 
+unsigned int *RAS_IPolyMaterial::GetMCol() const
+{
+	return NULL;
+}
+
 Scene* RAS_IPolyMaterial::GetBlenderScene() const
 {
 	return NULL;

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h	2013-11-04 19:21:25 UTC (rev 61090)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h	2013-11-04 19:21:32 UTC (rev 61091)
@@ -167,6 +167,8 @@
 
 	virtual Material*   GetBlenderMaterial() const;
 	virtual Image*      GetBlenderImage() const;
+	virtual MTFace*		GetMTFace() const;
+	virtual unsigned int* GetMCol() const;
 	virtual Scene*		GetBlenderScene() const;
 	virtual void		ReleaseMaterial();
 	virtual void		GetMaterialRGBAColor(unsigned char *rgba) const;

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp	2013-11-04 19:21:25 UTC (rev 61090)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp	2013-11-04 19:21:32 UTC (rev 61091)
@@ -65,8 +65,6 @@
 
 // XXX Clean these up <<<
 #include "Value.h"
-#include "KX_BlenderMaterial.h"
-#include "KX_PolygonMaterial.h"
 #include "KX_Light.h"
 #include "KX_Scene.h"
 #include "KX_RayCast.h"
@@ -680,13 +678,9 @@
 	bool obcolor = ms.m_bObjectColor;
 	MT_Vector4& rgba = ms.m_RGBAcolor;
 	RAS_MeshSlot::iterator it;
-	struct MTFace* tface = 0;
 
 	const STR_String& mytext = ((CValue*)m_clientobject)->GetPropertyText("Text");
 
-	const unsigned int flag = polymat->GetFlag();
-	unsigned int *col = 0;
-
 	// handle object color
 	if (obcolor) {
 		glDisableClientState(GL_COLOR_ARRAY);
@@ -738,18 +732,8 @@
 						if (m_attrib[unit] == RAS_TEXCO_UV)
 							glattrib = unit;
 
-				if (flag & RAS_BLENDERMAT) {
-					KX_BlenderMaterial *bl_mat = static_cast<KX_BlenderMaterial*>(polymat);
-					tface = bl_mat->GetMTFace();
-					col = bl_mat->GetMCol();
-				} else {
-					KX_PolygonMaterial* blenderpoly = static_cast<KX_PolygonMaterial*>(polymat);
-					tface = blenderpoly->GetMTFace();
-					col = blenderpoly->GetMCol();
-				}
+				GPU_render_text(polymat->GetMTFace(), polymat->GetDrawingMode(), mytext, mytext.Length(), polymat->GetMCol(), v[1], v[2], v[3], v[4], glattrib);
 
-				GPU_render_text(tface, polymat->GetDrawingMode(), mytext, mytext.Length(), col, v[1], v[2], v[3], v[4], glattrib);
-
 				ClearCachingInfo();
 			}
 		}