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, 26 insertions, 41 deletions

diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
index 8027136aa52..a7618462c9b 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
@@ -26,6 +26,7 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
+
 #ifndef __KX_BLENDERRENDERTOOLS
 #define __KX_BLENDERRENDERTOOLS
 
@@ -39,65 +40,50 @@
 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.
-*/
+/* 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 GPC_RenderTools, so this should be
+ * moved to some common location to avoid duplication. */
 
 class KX_BlenderRenderTools  : public RAS_IRenderTools
 {
-	bool	m_lastblenderlights;
-	void*	m_lastblenderobject;
-	int		m_lastlayer;
+	int		m_lastlightlayer;
 	bool	m_lastlighting;
 	static unsigned int m_numgllights;
-	
-	
+
 public:
-	
 						KX_BlenderRenderTools();
 	virtual				~KX_BlenderRenderTools();	
 
-	virtual void		EndFrame(class RAS_IRasterizer* rasty);
-	virtual void		BeginFrame(class RAS_IRasterizer* rasty);
-	void				DisableOpenGLLights();
+	void				EndFrame(RAS_IRasterizer* rasty);
+	void				BeginFrame(RAS_IRasterizer* rasty);
+
 	void				EnableOpenGLLights();
-	int					ProcessLighting(int layer);
+	void				DisableOpenGLLights();
+	void				ProcessLighting(int layer, const MT_Transform& viewmat);
 
-	virtual void	    RenderText2D(RAS_TEXT_RENDER_MODE mode,
+	void			    RenderText2D(RAS_TEXT_RENDER_MODE mode,
 									 const char* text,
 									 int xco,
 									 int yco,
 									 int width,
 									 int height);
-	virtual void		RenderText(int mode,
+	void				RenderText(int mode,
 								   class RAS_IPolyMaterial* polymat,
 								   float v1[3],
 								   float v2[3],
 								   float v3[3],
-								   float v4[3]);
-	void				applyTransform(class RAS_IRasterizer* rasty,
-									   double* oglmatrix,
-									   int objectdrawmode );
-	int					applyLights(int objectlayer);
-	virtual void		PushMatrix();
-	virtual void		PopMatrix();
-
-	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);
-	
+								   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, class KX_RayCast* result, void * const data);
 	bool NeedRayCast(KX_ClientObjectInfo*) { return true; }
 
@@ -107,8 +93,7 @@ public:
 
 	virtual	void Render2DFilters(RAS_ICanvas* canvas);
 
-	virtual void SetClientObject(void* obj);
-
+	virtual void SetClientObject(RAS_IRasterizer *rasty, void* obj);
 };
 
 #endif //__KX_BLENDERRENDERTOOLS