Apricot Branch

==============

* Made in game switching of GLSL options work. There is still
  a one frame flicker that needs to be fixed.
* Added access to the estimated average framerate in the game
  engine: GameLogic.getAverageFrameRate().
* Added acces to the blender build info from python:
  Blender.Get("buildinfo")
* Various GLSL optimizations to allow more constant folding in
  the glsl compiler, use glsl shadow functions to do shadow,
  instead of own code, and fix an issue with opengl texture
  color range.

9 files changed, 76 insertions, 19 deletions

diff --git a/source/gameengine/Ketsji/BL_BlenderShader.cpp b/source/gameengine/Ketsji/BL_BlenderShader.cpp
index e4072686fcc..fc1cd1824ab 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.cpp
+++ b/source/gameengine/Ketsji/BL_BlenderShader.cpp
@@ -12,6 +12,7 @@
 #include "GPU_extensions.h"
 #include "GPU_material.h"
 
+#include "RAS_BucketManager.h"
 #include "RAS_MeshObject.h"
 #include "RAS_IRasterizer.h"
  
@@ -35,14 +36,18 @@ const bool BL_BlenderShader::Ok()const
 
 BL_BlenderShader::BL_BlenderShader(KX_Scene *scene, struct Material *ma, int lightlayer)
 :
+	mScene(scene),
 	mMat(ma),
 	mGPUMat(NULL),
 	mBound(false),
 	mLightLayer(lightlayer)
 {
-	mScene = GetSceneForName(scene->GetName());
-	VerifyShader();
-	mModified = false;
+	mBlenderScene = GetSceneForName(scene->GetName());
+
+	if(mMat) {
+		GPU_material_from_blender(mBlenderScene, mMat);
+		mGPUMat = mMat->gpumaterial;
+	}
 }
 
 BL_BlenderShader::~BL_BlenderShader()
@@ -54,11 +59,16 @@ BL_BlenderShader::~BL_BlenderShader()
 bool BL_BlenderShader::VerifyShader()
 {
 	if(mMat && !mMat->gpumaterial)
-		GPU_material_from_blender(mScene, mMat);
+		GPU_material_from_blender(mBlenderScene, mMat);
 
 	if(mMat && mMat->gpumaterial != mGPUMat) {
 		mGPUMat = mMat->gpumaterial;
-		mModified = true;
+
+		/* this is shaky - display lists are wrong now after the
+		 * material changed, so we set all meshes as modified to
+		 * rebuild their display lists */
+		if(mScene->GetBucketManager())
+			mScene->GetBucketManager()->ReleaseDisplayLists();
 	}
 	
 	return (mMat && mGPUMat);
@@ -153,16 +163,6 @@ void BL_BlenderShader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty )
 
 	VerifyShader();
 
-	if(mModified) {
-#if 0
-		/* TODO: we need to free display lists, this isn't sufficient, it
-		 * doesn't set all meshes as modified, only the first one .. */
-		if(ms.m_mesh)
-			ms.m_mesh->SetMeshModified(true);
-#endif
-		mModified = false;
-	}
-
 	if(!mGPUMat || !mBound)
 		return;
 	
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.h b/source/gameengine/Ketsji/BL_BlenderShader.h
index 0b2ca3bd3ed..2729bc9b048 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.h
+++ b/source/gameengine/Ketsji/BL_BlenderShader.h
@@ -27,11 +27,11 @@ class BL_Material;
 class BL_BlenderShader
 {
 private:
-	struct Scene	*mScene;
+	KX_Scene		*mScene;
+	struct Scene	*mBlenderScene;
 	struct Material	*mMat;
 	GPUMaterial		*mGPUMat;
 	bool			mBound;
-	bool			mModified;
 	int				mLightLayer;
 
 	bool			VerifyShader();
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index db099d56b55..2baf3eaa43d 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -96,6 +96,7 @@ double KX_KetsjiEngine::m_ticrate = DEFAULT_LOGIC_TIC_RATE;
 double KX_KetsjiEngine::m_anim_framerate = 25.0;
 double KX_KetsjiEngine::m_suspendedtime = 0.0;
 double KX_KetsjiEngine::m_suspendeddelta = 0.0;
+double KX_KetsjiEngine::m_average_framerate = 0.0;
 
 
 /**
@@ -309,6 +310,12 @@ void KX_KetsjiEngine::EndFrame()
 	{
 		RenderDebugProperties();
 	}
+
+	m_average_framerate = m_logger->GetAverage();
+	if (m_average_framerate < 1e-6)
+		m_average_framerate = 1e-6;
+	m_average_framerate = 1.0/m_average_framerate;
+
 	// Go to next profiling measurement, time spend after this call is shown in the next frame.
 	m_logger->NextMeasurement(m_kxsystem->GetTimeInSeconds());
 
@@ -1441,6 +1448,11 @@ void KX_KetsjiEngine::SetAnimFrameRate(double framerate)
 	m_anim_framerate = framerate;
 }
 
+double KX_KetsjiEngine::GetAverageFrameRate()
+{
+	return m_average_framerate;
+}
+
 void KX_KetsjiEngine::SetTimingDisplay(bool frameRate, bool profile, bool properties)
 {
 	m_show_framerate = frameRate;
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
index 77b69ec2d9e..97458362f0f 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.h
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h
@@ -149,6 +149,8 @@ private:
 	
 	/** Labels for profiling display. */
 	static const char		m_profileLabels[tc_numCategories][15];
+	/** Last estimated framerate */
+	static double			m_average_framerate;
 	/** Show the framerate on the game display? */
 	bool					m_show_framerate;
 	/** Show profiling info on the game display? */
@@ -272,6 +274,11 @@ public:
 	static void SetAnimFrameRate(double framerate);
 
 	/**
+	 * Gets the last estimated average framerate
+	 */
+	static double GetAverageFrameRate();
+
+	/**
 	 * Activates or deactivates timing information display.
 	 * @param frameRate		Display for frame rate on or off.
 	 * @param profile		Display for individual components on or off.
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 61ed8b6a8e4..0e214641065 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -274,6 +274,12 @@ static PyObject* gPyGetPhysicsTicRate(PyObject*)
 	return PyFloat_FromDouble(PHY_GetActiveEnvironment()->getFixedTimeStep());
 }
 
+static PyObject* gPyGetAverageFrameRate(PyObject*)
+{
+	return PyFloat_FromDouble(KX_KetsjiEngine::GetAverageFrameRate());
+}
+
+
 static STR_String gPyGetCurrentScene_doc =  
 "getCurrentScene()\n"
 "Gets a reference to the current scene.\n";
@@ -374,6 +380,7 @@ static struct PyMethodDef game_methods[] = {
 	{"setLogicTicRate", (PyCFunction) gPySetLogicTicRate, METH_VARARGS, "Sets the logic tic rate"},
 	{"getPhysicsTicRate", (PyCFunction) gPyGetPhysicsTicRate, METH_NOARGS, "Gets the physics tic rate"},
 	{"setPhysicsTicRate", (PyCFunction) gPySetPhysicsTicRate, METH_VARARGS, "Sets the physics tic rate"},
+	{"getAverageFrameRate", (PyCFunction) gPyGetAverageFrameRate, METH_NOARGS, "Gets the estimated average frame rate"},
 	{"PrintGLInfo", (PyCFunction)pyPrintExt, METH_NOARGS, "Prints GL Extension Info"},
 	{NULL, (PyCFunction) NULL, 0, NULL }
 };
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 718bf4f93db..c14dc0aa257 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -1253,8 +1253,6 @@ void KX_Scene::RenderBuckets(const MT_Transform & cameratransform,
 	KX_BlenderMaterial::EndFrame();
 }
 
-
-
 void KX_Scene::UpdateObjectActivity(void) 
 {
 	if (m_activity_culling) {
diff --git a/source/gameengine/PyDoc/GameLogic.py b/source/gameengine/PyDoc/GameLogic.py
index 965c0522bd7..7e36a15c0f7 100644
--- a/source/gameengine/PyDoc/GameLogic.py
+++ b/source/gameengine/PyDoc/GameLogic.py
@@ -220,6 +220,13 @@ def setPhysicsTicRate(ticrate):
 	@param ticrate: The new update frequency (in Hz).
 	@type ticrate: float
 	"""
+def getAverageFrameRate():
+	"""
+	Gets the estimated average framerate
+	
+	@return: The estimed average framerate in frames per second
+	@rtype: float
+	"""
 
 def expandPath(path):
 	"""
diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.cpp b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
index b4492ca03a9..67c9b56a78c 100644
--- a/source/gameengine/Rasterizer/RAS_BucketManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
@@ -195,3 +195,28 @@ void RAS_BucketManager::RAS_BucketManagerClearAll()
 	m_MaterialBuckets.clear();
 	m_AlphaBuckets.clear();
 }
+
+void RAS_BucketManager::ReleaseDisplayLists()
+{
+	BucketList::iterator bit;
+	RAS_MaterialBucket::T_MeshSlotList::iterator mit;
+
+	for (bit = m_MaterialBuckets.begin(); bit != m_MaterialBuckets.end(); ++bit) {
+		for (mit = (*bit)->msBegin(); mit != (*bit)->msEnd(); ++mit) {
+			if(mit->m_DisplayList) {
+				mit->m_DisplayList->Release();
+				mit->m_DisplayList = NULL;
+			}
+		}
+	}
+	
+	for (bit = m_AlphaBuckets.begin(); bit != m_AlphaBuckets.end(); ++bit) {
+		for (mit = (*bit)->msBegin(); mit != (*bit)->msEnd(); ++mit) {
+			if(mit->m_DisplayList) {
+				mit->m_DisplayList->Release();
+				mit->m_DisplayList = NULL;
+			}
+		}
+	}
+}
+
diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.h b/source/gameengine/Rasterizer/RAS_BucketManager.h
index 010478b1d5b..b875512b464 100644
--- a/source/gameengine/Rasterizer/RAS_BucketManager.h
+++ b/source/gameengine/Rasterizer/RAS_BucketManager.h
@@ -60,6 +60,7 @@ public:
 
 	RAS_MaterialBucket* RAS_BucketManagerFindBucket(RAS_IPolyMaterial * material, bool &bucketCreated);
 	
+	void ReleaseDisplayLists();
 
 private:
 	void RAS_BucketManagerClearAll();