From e88cdf8da714473624b221aca5a6feed2154a885 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sun, 5 May 2013 19:56:45 +0000 Subject: Re-worked generator subobject ownership, added a cache for the CompositionGen git-svn-id: http://mc-server.googlecode.com/svn/trunk@1447 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Generating/ComposableGenerator.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'source/Generating/ComposableGenerator.h') diff --git a/source/Generating/ComposableGenerator.h b/source/Generating/ComposableGenerator.h index ee38bdb9d..c32e7181f 100644 --- a/source/Generating/ComposableGenerator.h +++ b/source/Generating/ComposableGenerator.h @@ -148,13 +148,12 @@ protected: cStructureGenList m_StructureGens; cFinishGenList m_FinishGens; - // Specific generators that can be reused for different purposes - we don't want to create multiple objects for them - cNoise3DComposable * m_Noise3DComposable; - int m_NumNoise3DComposableUses; ///< How many times is it actually used? - cDistortedHeightmap * m_DistortedHeightmap; - int m_NumDistortedHeightmapUses; ///< How many times is it actually used? + // Generators underlying the caches: + cBiomeGen * m_UnderlyingBiomeGen; + cTerrainHeightGen * m_UnderlyingHeightGen; + cTerrainCompositionGen * m_UnderlyingCompositionGen; + - /// Reads the biome gen settings from the ini and initializes m_BiomeGen accordingly void InitBiomeGen(cIniFile & a_IniFile); -- cgit v1.2.3