From e7d06aebc3a743c8cc334072026e23a23464e52f Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Mon, 10 May 2010 19:51:53 +0000
Subject: [PATCH] commented out interpolation thread since it doesn't seem to
 improve anything.

---
 source/glest_game/graphics/renderer.cpp | 56 ++++++++++++-------------
 source/glest_game/graphics/renderer.h   | 12 +++---
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp
index de2f4e51..d452b15a 100644
--- a/source/glest_game/graphics/renderer.cpp
+++ b/source/glest_game/graphics/renderer.cpp
@@ -99,7 +99,7 @@ void MeshCallbackTeamColor::execute(const Mesh *mesh){
 // ===========================================================
 //	class InterpolateTaskThread
 // ===========================================================
-
+/*
 InterpolateTaskThread::InterpolateTaskThread(InterpolateTaskCallbackInterface *interpolateTaskInterface)
 : BaseThread() {
 	this->interpolateTaskInterface = interpolateTaskInterface;
@@ -182,7 +182,7 @@ void InterpolateTaskThread::execute() {
 	}
 	setRunningStatus(false);
 }
-
+*/
 // ===========================================================
 //	class Renderer
 // ===========================================================
@@ -250,18 +250,18 @@ Renderer::Renderer(){
 
 	allowRotateUnits = config.getBool("AllowRotateUnits","0");
 
-	interpolateThread = NULL;
+	//interpolateThread = NULL;
 	// Run interpolation calcs in a background thread if enabled
-	if(config.getBool("ThreadedInterpolation","false") == true) {
-		interpolateThread = new InterpolateTaskThread(this);
-		interpolateThread->start();
-	}
+	//if(config.getBool("ThreadedInterpolation","false") == true) {
+	//	interpolateThread = new InterpolateTaskThread(this);
+	//	interpolateThread->start();
+	//}
 }
 
 Renderer::~Renderer(){
-	BaseThread::shutdownAndWait(interpolateThread);
-	delete interpolateThread;
-	interpolateThread = NULL;
+	//BaseThread::shutdownAndWait(interpolateThread);
+	//delete interpolateThread;
+	//interpolateThread = NULL;
 
 	delete modelRenderer;
 	delete textRenderer;
@@ -1432,12 +1432,12 @@ void Renderer::renderObjectList(std::vector<RenderEntity> &vctEntity,const Vec3f
 	//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] vctEntity.size() = %d\n",__FILE__,__FUNCTION__,__LINE__,vctEntity.size());
 
 	// Run interpolation threaded if the thread is created
-	if(interpolateThread != NULL) {
-		interpolateThread->setTaskSignalled(&vctEntity);
-	}
-	else {
-		interpolateTask(vctEntity);
-	}
+	//if(interpolateThread != NULL) {
+	//	interpolateThread->setTaskSignalled(&vctEntity);
+	//}
+	//else {
+	interpolateTask(vctEntity);
+	//}
 
 	//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] vctEntity.size() = %d\n",__FILE__,__FUNCTION__,__LINE__,vctEntity.size());
 
@@ -1744,12 +1744,12 @@ void Renderer::renderUnitList(std::vector<RenderEntity> &vctEntity,MeshCallbackT
 	//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] vctEntity.size() = %d\n",__FILE__,__FUNCTION__,__LINE__,vctEntity.size());
 
 	// Run interpolation threaded if the thread is created
-	if(interpolateThread != NULL) {
-		interpolateThread->setTaskSignalled(&vctEntity);
-	}
-	else {
-		interpolateTask(vctEntity);
-	}
+	//if(interpolateThread != NULL) {
+	//	interpolateThread->setTaskSignalled(&vctEntity);
+	//}
+	//else {
+	interpolateTask(vctEntity);
+	//}
 
 	//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] vctEntity.size() = %d\n",__FILE__,__FUNCTION__,__LINE__,vctEntity.size());
 
@@ -2879,12 +2879,12 @@ void Renderer::renderUnitFastList(std::vector<RenderEntity> &vctEntity) {
 	//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] vctEntity.size() = %d\n",__FILE__,__FUNCTION__,__LINE__,vctEntity.size());
 
 	// Run interpolation threaded if the thread is created
-	if(interpolateThread != NULL) {
-		interpolateThread->setTaskSignalled(&vctEntity);
-	}
-	else {
-		interpolateTask(vctEntity);
-	}
+	//if(interpolateThread != NULL) {
+	//	interpolateThread->setTaskSignalled(&vctEntity);
+	//}
+	//else {
+	interpolateTask(vctEntity);
+	//}
 
 	//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] vctEntity.size() = %d\n",__FILE__,__FUNCTION__,__LINE__,vctEntity.size());
 
diff --git a/source/glest_game/graphics/renderer.h b/source/glest_game/graphics/renderer.h
index 7842b73c..9cd7bac1 100644
--- a/source/glest_game/graphics/renderer.h
+++ b/source/glest_game/graphics/renderer.h
@@ -27,7 +27,7 @@
 #include "font_manager.h"
 #include "camera.h"
 #include <vector>
-#include "base_thread.h"
+//#include "base_thread.h"
 #include "model_renderer.h"
 #include "model.h"
 
@@ -55,7 +55,7 @@ using Shared::Graphics::Camera;
 using Shared::Graphics::MeshCallback;
 using Shared::Graphics::Mesh;
 
-using namespace Shared::PlatformCommon;
+//using namespace Shared::PlatformCommon;
 
 // =====================================================
 // 	class MeshCallbackTeamColor
@@ -168,6 +168,7 @@ public:
 	}
 };
 
+/*
 //
 // This interface describes the methods a callback object must implement
 //
@@ -198,9 +199,10 @@ public:
     void setTaskSignalled(std::vector<RenderEntity> *vctEntity);
     bool getTaskSignalled();
 };
+*/
 
-
-class Renderer : public InterpolateTaskCallbackInterface {
+//class Renderer : public InterpolateTaskCallbackInterface {
+class Renderer  {
 public:
 	//progress bar
 	static const int maxProgressBar;
@@ -297,7 +299,7 @@ private:
 	float waterAnim;
 
 	bool allowRotateUnits;
-	InterpolateTaskThread *interpolateThread;
+	//InterpolateTaskThread *interpolateThread;
 
 private:
 	Renderer();