2 files changed, 10 insertions, 65 deletions

diff --git a/Tools/QtBiomeVisualiser/ChunkSource.cpp b/Tools/QtBiomeVisualiser/ChunkSource.cpp
index 5658198f4..7da36c39b 100644
--- a/Tools/QtBiomeVisualiser/ChunkSource.cpp
+++ b/Tools/QtBiomeVisualiser/ChunkSource.cpp
@@ -142,7 +142,6 @@ static void biomesToImage(cChunkDef::BiomeMap & a_Biomes, Chunk::Image & a_Image
 
 BioGenSource::BioGenSource(QString a_WorldIniPath) :
 	m_WorldIniPath(a_WorldIniPath),
-	m_WorldIni(new cIniFile),
 	m_Mtx(QMutex::Recursive)
 {
 	reload();
@@ -154,14 +153,11 @@ BioGenSource::BioGenSource(QString a_WorldIniPath) :
 
 void BioGenSource::getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChunk)
 {
-	cBiomeGenPtr biomeGen;
+	cChunkDef::BiomeMap biomes;
 	{
 		QMutexLocker lock(&m_Mtx);
-		biomeGen = getBiomeGen();
+		m_BiomeGen->GenBiomes(a_ChunkX, a_ChunkZ, biomes);
 	}
-	cChunkDef::BiomeMap biomes;
-	biomeGen->GenBiomes(a_ChunkX, a_ChunkZ, biomes);
-	releaseBiomeGen(biomeGen);
 	Chunk::Image img;
 	biomesToImage(biomes, img);
 	a_DestChunk->setImage(img);
@@ -173,52 +169,15 @@ void BioGenSource::getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChu
 
 void BioGenSource::reload()
 {
+	cIniFile ini;
+	if (!ini.ReadFile(m_WorldIniPath.toStdString()))
 	{
-		QMutexLocker lock(&m_Mtx);
-		if (!m_WorldIni->ReadFile(m_WorldIniPath.toStdString()))
-		{
-			return;
-		}
-		m_AvailableGens.clear();
-	}
-}
-
-
-
-
-cBiomeGenPtr BioGenSource::getBiomeGen()
-{
-	QMutexLocker lock(&m_Mtx);
-
-	// Return a generator from the cache, if available:
-	if (!m_AvailableGens.empty())
-	{
-		cBiomeGenPtr res = m_AvailableGens.back();
-		m_AvailableGens.pop_back();
-		return res;
+		return;
 	}
-
-	// No generator in cache available, create a new one:
-	int seed = m_WorldIni->GetValueSetI("Seed", "Seed", 0);
+	int seed = ini.GetValueSetI("Seed", "Seed", 0);
 	bool unused = false;
-	return cBiomeGenPtr(cBiomeGen::CreateBiomeGen(*m_WorldIni, seed, unused));
-}
-
-
-
-
-
-void BioGenSource::releaseBiomeGen(cBiomeGenPtr a_BiomeGen)
-{
 	QMutexLocker lock(&m_Mtx);
-	m_AvailableGens.push_back(a_BiomeGen);
-
-	// Trim the cache if there are too many gens:
-	int wantedNumGens = QThread::idealThreadCount();
-	if (m_AvailableGens.size() > (size_t)(4 * wantedNumGens))
-	{
-		m_AvailableGens.resize(wantedNumGens);
-	}
+	m_BiomeGen.reset(cBiomeGen::CreateBiomeGen(ini, seed, unused));
 }
 
 
diff --git a/Tools/QtBiomeVisualiser/ChunkSource.h b/Tools/QtBiomeVisualiser/ChunkSource.h
index 7bbdda276..a485e473a 100644
--- a/Tools/QtBiomeVisualiser/ChunkSource.h
+++ b/Tools/QtBiomeVisualiser/ChunkSource.h
@@ -49,25 +49,11 @@ protected:
 	/** Path to the world.ini file from which the m_WorldIni is regenerated on reload requests. */
 	QString m_WorldIniPath;
 
-	/** Parsed contents of the world.ini file from which the biome generators are initialized.
-	Locked by m_Mtx to avoid multithreaded access. */
-	std::unique_ptr<cIniFile> m_WorldIni;
+	/** The generator used for generating biomes. */
+	std::unique_ptr<cBiomeGen> m_BiomeGen;
 
-	/** List of cBiomeGen instances that are "free" - aren't doing any generating at this moment.
-	Locked by m_Mtx to avoid multithreaded access. */
-	std::vector<cBiomeGenPtr> m_AvailableGens;
-
-	/** Guards m_AvailableGens and m_WorldIni against multithreaded access. */
+	/** Guards m_BiomeGen against multithreaded access. */
 	QMutex m_Mtx;
-
-
-	/** Returns a cBiomeGen that can generate a new chunk's biomes.
-	Uses m_AvailableGens as a cache before creating a new generator. */
-	cBiomeGenPtr BioGenSource::getBiomeGen();
-
-	/** Puts the specified BiomeGen back to m_AvailableGens to make it available for next getBiomeGen() request.
-	Truncates m_AvailableGens if there are too many instances in there. */
-	void releaseBiomeGen(cBiomeGenPtr a_BiomeGen);
 };