Merge of first part of changes from the apricot branch, especially

the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:

* GLSL support in the viewport and game engine, enable in the game
  menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
  gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
  storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.

* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
  An extra texture slot shows up once the last slot is used.

* Memory limit for undo, not enabled by default yet because it
  needs the .B.blend to be changed.
* Multiple undo for image painting.

* An offset for dupligroups, so not all objects in a group have to
  be at the origin.

1 files changed, 103 insertions, 148 deletions

diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
index dafc2599850..1797d6c1a0f 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
@@ -26,8 +26,6 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "KX_BlenderRenderTools.h"
-
 #include "GL/glew.h"
 
 #include "RAS_IRenderTools.h"
@@ -36,23 +34,22 @@
 #include "RAS_ICanvas.h"
 #include "RAS_GLExtensionManager.h"
 
-// next two includes/dependencies come from the shadow feature
-// it needs the gameobject and the sumo physics scene for a raycast
 #include "KX_GameObject.h"
-
 #include "KX_PolygonMaterial.h"
 #include "KX_BlenderMaterial.h"
+#include "KX_RayCast.h"
+#include "KX_IPhysicsController.h"
 
-#include "Value.h"
+#include "PHY_IPhysicsEnvironment.h"
 
-#include "KX_BlenderGL.h" // for text printing
 #include "STR_String.h"
-#include "RAS_BucketManager.h" // for polymaterial (needed for textprinting)
 
-#include "KX_RayCast.h"
-#include "KX_IPhysicsController.h"
-#include "PHY_IPhysicsEnvironment.h"
-#include "KX_Scene.h"
+#include "GPU_draw.h"
+
+#include "KX_BlenderGL.h" // for text printing
+#include "KX_BlenderRenderTools.h"
+
+unsigned int KX_BlenderRenderTools::m_numgllights;
 
 KX_BlenderRenderTools::KX_BlenderRenderTools()
 {
@@ -61,73 +58,90 @@ KX_BlenderRenderTools::KX_BlenderRenderTools()
 		m_numgllights = 8;
 }
 
-/**
-ProcessLighting performs lighting on objects. the layer is a bitfield that contains layer information.
-There are 20 'official' layers in blender.
-A light is applied on an object only when they are in the same layer.
-OpenGL has a maximum of 8 lights (simultaneous), so 20 * 8 lights are possible in a scene.
-*/
+KX_BlenderRenderTools::~KX_BlenderRenderTools()
+{
+}
 
-int	KX_BlenderRenderTools::ProcessLighting(int layer) 
+void KX_BlenderRenderTools::BeginFrame(RAS_IRasterizer* rasty)
 {
-	
-	int result = false;
+	m_clientobject = NULL;
+	m_lastlightlayer = -1;
+	m_lastlighting = false;
+	DisableOpenGLLights();
+}
 
-	if (layer < 0)
-	{
-		DisableOpenGLLights();
-		result = false;
-	} else
+void KX_BlenderRenderTools::EndFrame(RAS_IRasterizer* rasty)
+{
+}
+
+/* ProcessLighting performs lighting on objects. the layer is a bitfield that
+ * contains layer information. There are 20 'official' layers in blender. A
+ * light is applied on an object only when they are in the same layer. OpenGL
+ * has a maximum of 8 lights (simultaneous), so 20 * 8 lights are possible in
+ * a scene. */
+
+void KX_BlenderRenderTools::ProcessLighting(int layer, const MT_Transform& viewmat)
+{
+	if(m_lastlightlayer == layer)
+		return;
+
+	m_lastlightlayer = layer;
+
+	bool enable = false;
+
+	if (layer >= 0)
 	{
 		if (m_clientobject)
 		{
 			if (layer == RAS_LIGHT_OBJECT_LAYER)
-			{
 				layer = static_cast<KX_GameObject*>(m_clientobject)->GetLayer();
-			}
-			if (applyLights(layer))
-			{
-				EnableOpenGLLights();
-				result = true;
-			} else
-			{
-				DisableOpenGLLights();
-				result = false;
-			}			
+
+			enable = applyLights(layer, viewmat);
 		}
 	}
-	return result;
-	
-	
+
+	if(enable)
+		EnableOpenGLLights();
+	else
+		DisableOpenGLLights();
 }
 
+void KX_BlenderRenderTools::EnableOpenGLLights()
+{
+	if(m_lastlighting == true)
+		return;
 
-void KX_BlenderRenderTools::BeginFrame(RAS_IRasterizer* rasty)
+	glEnable(GL_LIGHTING);
+	glEnable(GL_COLOR_MATERIAL);
+
+	glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+	glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, true);
+	if (GLEW_EXT_separate_specular_color || GLEW_VERSION_1_2)
+		glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
+	
+	m_lastlighting = true;
+}
+
+void KX_BlenderRenderTools::DisableOpenGLLights()
 {
-	m_clientobject = NULL;
-	m_lastblenderobject = NULL;
-	m_lastblenderlights = false;
-	m_lastlayer = -1;
-	m_lastlighting = false;
-	m_modified = true;
-	DisableOpenGLLights();
+	if(m_lastlighting == false)
+		return;
 
+	glDisable(GL_LIGHTING);
+	glDisable(GL_COLOR_MATERIAL);
 
+	m_lastlighting = false;
 }
 
-void KX_BlenderRenderTools::SetClientObject(void* obj)
+
+void KX_BlenderRenderTools::SetClientObject(RAS_IRasterizer *rasty, void* obj)
 {
 	if (m_clientobject != obj)
 	{
-		if (obj == NULL || !((KX_GameObject*)obj)->IsNegativeScaling())
-		{
-			glFrontFace(GL_CCW);
-		} else 
-		{
-			glFrontFace(GL_CW);
-		}
+		bool ccw = (obj == NULL || !((KX_GameObject*)obj)->IsNegativeScaling());
+		rasty->SetFrontFace(ccw);
+
 		m_clientobject = obj;
-		m_modified = true;
 	}
 }
 
@@ -182,7 +196,7 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat
 		MT_Vector3 dir = (campos - objpos).safe_normalized();
 		MT_Vector3 up(0,0,1.0);
 
-		KX_GameObject* gameobj = (KX_GameObject*) this->m_clientobject;
+		KX_GameObject* gameobj = (KX_GameObject*)m_clientobject;
 		// get scaling of halo object
 		MT_Vector3  size = gameobj->GetSGNode()->GetLocalScale();
 		
@@ -218,7 +232,7 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat
 		{
 			// shadow must be cast to the ground, physics system needed here!
 			MT_Point3 frompoint(oglmatrix[12],oglmatrix[13],oglmatrix[14]);
-			KX_GameObject *gameobj = (KX_GameObject*) this->m_clientobject;
+			KX_GameObject *gameobj = (KX_GameObject*)m_clientobject;
 			MT_Vector3 direction = MT_Vector3(0,0,-1);
 
 			direction.normalize();
@@ -252,13 +266,29 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat
 }
 
 
-/**
-Render Text renders text into a (series of) polygon, using a texture font,
-Each character consists of one polygon (one quad or two triangles)
-*/
-void	KX_BlenderRenderTools::RenderText(int mode,RAS_IPolyMaterial* polymat,float v1[3],float v2[3],float v3[3],float v4[3])
+void KX_BlenderRenderTools::RenderText2D(RAS_TEXT_RENDER_MODE mode,
+										 const char* text,
+										 int xco,
+										 int yco,									 
+										 int width,
+										 int height)
+{
+	STR_String tmpstr(text);
+
+	if(mode == RAS_IRenderTools::RAS_TEXT_PADDED)
+		BL_print_gamedebug_line_padded(tmpstr.Ptr(), xco, yco, width, height);
+	else
+		BL_print_gamedebug_line(tmpstr.Ptr(), xco, yco, width, height);
+}
+
+/* Render Text renders text into a (series of) polygon, using a texture font,
+ * Each character consists of one polygon (one quad or two triangles) */
+
+void KX_BlenderRenderTools::RenderText(
+	int mode,
+	RAS_IPolyMaterial* polymat,
+	float v1[3], float v2[3], float v3[3], float v4[3], int glattrib)
 {
-		
 	STR_String mytext = ((CValue*)m_clientobject)->GetPropertyText("Text");
 	
 	const unsigned int flag = polymat->GetFlag();
@@ -275,67 +305,9 @@ void	KX_BlenderRenderTools::RenderText(int mode,RAS_IPolyMaterial* polymat,float
 		col = blenderpoly->GetMCol();
 	}
 	
-	BL_RenderText( mode,mytext,mytext.Length(),tface,col,v1,v2,v3,v4);
-	
-}
-
-
-
-KX_BlenderRenderTools::~KX_BlenderRenderTools()
-{
-};
-	
-	
-void	KX_BlenderRenderTools::EndFrame(RAS_IRasterizer* rasty)
-{
+	GPU_render_text(tface, mode, mytext, mytext.Length(), col, v1, v2, v3, v4, glattrib);
 }
-	
 
-	
-void KX_BlenderRenderTools::DisableOpenGLLights()
-{
-	glDisable(GL_LIGHTING);
-	glDisable(GL_COLOR_MATERIAL);
-}
-
-	
-void KX_BlenderRenderTools::EnableOpenGLLights()
-{
-	glEnable(GL_LIGHTING);
-	
-	glEnable(GL_COLOR_MATERIAL);
-	glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
-	glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, true);
-	if (GLEW_EXT_separate_specular_color || GLEW_VERSION_1_2)
-		glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
-
-}
-	
-
-/**
- * Rendering text using 2D bitmap functionality.  
- */
-void KX_BlenderRenderTools::RenderText2D(RAS_TEXT_RENDER_MODE mode,
-										 const char* text,
-										 int xco,
-										 int yco,									 
-										 int width,
-										 int height)
-{
-	switch (mode) {
-	case RAS_IRenderTools::RAS_TEXT_PADDED: {
-		STR_String tmpstr(text);
-		BL_print_gamedebug_line_padded(tmpstr.Ptr(),xco,yco,width,height);
-		break;
-	}
-	default: {
-		STR_String tmpstr(text);
-		BL_print_gamedebug_line(tmpstr.Ptr(),xco,yco,width,height);
-	}
-	}
-}
-
-	
 
 void KX_BlenderRenderTools::PushMatrix()
 {
@@ -348,14 +320,13 @@ void KX_BlenderRenderTools::PopMatrix()
 }
 
 
-
-int	KX_BlenderRenderTools::applyLights(int objectlayer)
+int KX_BlenderRenderTools::applyLights(int objectlayer, const MT_Transform& viewmat)
 {
-// taken from blender source, incompatibility between Blender Object / GameObject	
-	
+	// taken from blender source, incompatibility between Blender Object / GameObject	
+	float glviewmat[16];
 	unsigned int count;
 	float vec[4];
-		
+
 	vec[3]= 1.0;
 	
 	for(count=0; count<m_numgllights; count++)
@@ -363,9 +334,11 @@ int	KX_BlenderRenderTools::applyLights(int objectlayer)
 	
 	//std::vector<struct	RAS_LightObject*> m_lights;
 	std::vector<struct	RAS_LightObject*>::iterator lit = m_lights.begin();
+
+	viewmat.getValue(glviewmat);
 	
 	glPushMatrix();
-	glLoadMatrixf(m_viewmat);
+	glLoadMatrixf(glviewmat);
 	for (lit = m_lights.begin(), count = 0; !(lit==m_lights.end()) && count < m_numgllights; ++lit)
 	{
 		RAS_LightObject* lightdata = (*lit);
@@ -433,7 +406,6 @@ int	KX_BlenderRenderTools::applyLights(int objectlayer)
 			glEnable((GLenum)(GL_LIGHT0+count));
 
 			count++;
-			
 		}
 	}
 	glPopMatrix();
@@ -442,22 +414,6 @@ int	KX_BlenderRenderTools::applyLights(int objectlayer)
 
 }
 
-
-
-RAS_IPolyMaterial* KX_BlenderRenderTools::CreateBlenderPolyMaterial(
-		const STR_String &texname,
-		bool ba,const STR_String& matname,int tile,int tilexrep,int tileyrep,int mode,bool transparant,bool zsort, int lightlayer
-		,bool bIsTriangle,void* clientobject,void* tface)
-{
-	assert(!"Deprecated");
-/*	return new KX_BlenderPolyMaterial(
-
-		texname,
-		ba,matname,tile,tilexrep,tileyrep,mode,transparant,zsort, lightlayer
-		,bIsTriangle,clientobject,(struct MTFace*)tface);*/
-	return NULL;
-}
-
 void KX_BlenderRenderTools::MotionBlur(RAS_IRasterizer* rasterizer)
 {
 	int state = rasterizer->GetMotionBlurState();
@@ -491,4 +447,3 @@ void KX_BlenderRenderTools::Render2DFilters(RAS_ICanvas* canvas)
 	m_filtermanager.RenderFilters(canvas);
 }
 
-unsigned int KX_BlenderRenderTools::m_numgllights;