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, 47 insertions, 116 deletions

diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.h b/source/gameengine/GamePlayer/common/GPC_RenderTools.h
index 9f70f67caf2..382956e73ea 100644
--- a/source/gameengine/GamePlayer/common/GPC_RenderTools.h
+++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.h
@@ -31,11 +31,11 @@
 #define __GPC_RENDERTOOLS_H
 
 #ifdef WIN32
-	#include <windows.h>
+// don't show stl-warnings
+#pragma warning (disable:4786)
+#include <windows.h>
 #endif // WIN32
 
-#include "GL/glew.h"
-
 #include "RAS_IRenderTools.h"
 
 #include "BMF_Api.h"
@@ -43,100 +43,52 @@
 struct KX_ClientObjectInfo;
 class KX_RayCast;
 
+/* BlenderRenderTools are a set of tools to apply 2D/3D graphics effects, which
+ * are not part of the (polygon) Rasterizer. Effects like 2D text, 3D (polygon)
+ * text, lighting.
+ *
+ * Most of this code is duplicated in KX_BlenderRenderTools, so this should be
+ * moved to some common location to avoid duplication. */
+
 class GPC_RenderTools : public RAS_IRenderTools
 {
+	int		m_lastlightlayer;
+	bool	m_lastlighting;
+	static unsigned int m_numgllights;
+
+	BMF_Font* m_font;
+
 public:
-	GPC_RenderTools();
-	virtual ~GPC_RenderTools();
-
-	virtual void EndFrame(RAS_IRasterizer* rasty);
-	virtual void BeginFrame(RAS_IRasterizer* rasty);
-
-	void DisableOpenGLLights()
-	{
-		glDisable(GL_LIGHTING);
-		glDisable(GL_COLOR_MATERIAL);
-	}
-
-	void EnableOpenGLLights();
-
-	int ProcessLighting(int layer);
-
-	void Perspective(int a, int width, int height, float mat[4][4], float viewmat[4][4])
-	{
-		if(a== 0)
-		{
-			glMatrixMode(GL_PROJECTION);
-			glMatrixMode(GL_MODELVIEW);
-			glLoadIdentity();
-		}
-		else
-		{
-			if(a== 1)
-			{
-				glMatrixMode(GL_PROJECTION);
-				glMatrixMode(GL_MODELVIEW);
-			}
-		}
-	}
-
-	/**
-	 * @attention mode is ignored here
-	 */
-	virtual void RenderText2D(
-					RAS_TEXT_RENDER_MODE mode,
-					const char* text,
-					int xco,
-					int yco,
-					int width,
-					int height);
-
-	/**
-	 * Renders text into a (series of) polygon(s), using a texture font,
-	 * Each character consists of one polygon (one quad or two triangles)
-	 */
-	virtual void RenderText(
-					int mode,
-					RAS_IPolyMaterial* polymat,
-					float v1[3],
-					float v2[3],
-					float v3[3],
-					float v4[3]);
-
-	void Render(RAS_IRasterizer* rasty,double* oglmatrix,int objectdrawmode)
-	{
-		glPopMatrix();
-		glPushMatrix();
-		glMultMatrixd(oglmatrix);
-	}
-
-	void applyTransform(RAS_IRasterizer* rasty, double* oglmatrix, int objectdrawmode);
-
-	virtual void PushMatrix()
-	{
-		glPushMatrix();
-	}
-
-	virtual void PopMatrix()
-	{
-		glPopMatrix();
-	}
-
-	virtual class RAS_IPolyMaterial* 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);
-
-	int applyLights(int objectlayer);
+						GPC_RenderTools();
+	virtual				~GPC_RenderTools();
+
+	void				EndFrame(RAS_IRasterizer* rasty);
+	void				BeginFrame(RAS_IRasterizer* rasty);
+
+	void				EnableOpenGLLights();
+	void				DisableOpenGLLights();
+	void				ProcessLighting(int layer, const MT_Transform& viewmat);
+
+	/* @attention mode is ignored here */
+	void			    RenderText2D(RAS_TEXT_RENDER_MODE mode,
+									 const char* text,
+									 int xco,
+									 int yco,
+									 int width,
+									 int height);
+	void				RenderText(int mode,
+								   class RAS_IPolyMaterial* polymat,
+								   float v1[3],
+								   float v2[3],
+								   float v3[3],
+								   float v4[3],
+								   int glattrib);
+
+	void				applyTransform(RAS_IRasterizer* rasty, double* oglmatrix, int objectdrawmode);
+	int					applyLights(int objectlayer, const MT_Transform& viewmat);
+
+	void				PushMatrix();
+	void				PopMatrix();
 
 	bool RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data);
 	bool NeedRayCast(KX_ClientObjectInfo* client) { return true; }
@@ -147,28 +99,7 @@ public:
 
 	virtual	void Render2DFilters(RAS_ICanvas* canvas);
 
-	virtual void SetClientObject(void* obj);
-
-protected:
-	/** 
-	 * Copied from KX_BlenderGL.cpp in KX_blenderhook
-	 */
-	void BL_RenderText(
-		int mode,
-		const char* textstr,
-		int textlen,
-		struct MTFace* tface,
-		unsigned int* col,
-		float v1[3],float v2[3],float v3[3],float v4[3]);
-	void BL_spack(unsigned int ucol)
-	{
-		char *cp = (char *)&ucol;		
-		glColor3ub(cp[3], cp[2], cp[1]);
-	}
-
-
-	BMF_Font* m_font;
-	static unsigned int m_numgllights;
+	virtual void SetClientObject(RAS_IRasterizer *rasty, void* obj);
 };
 
 #endif  // __GPC_RENDERTOOLS_H