Performance Improvement: Use a cache which caches result for getFacePositions.

[minetest.git] / src / emerge.h

diff --git a/src/emerge.h b/src/emerge.h
index 7de1c8391d9c309b21f2b503107bc91d41c94c00..8bcc96ee0ce648367528b9e16ef65ba59990069f 100644 (file)
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -26,11 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen.h" // for MapgenParams
 #include "map.h"
 
-#define MGPARAMS_SET_MGNAME      1
-#define MGPARAMS_SET_SEED        2
-#define MGPARAMS_SET_WATER_LEVEL 4
-#define MGPARAMS_SET_FLAGS       8
-
 #define BLOCK_EMERGE_ALLOWGEN (1<<0)
 
 #define EMERGE_DBG_OUT(x) \
@@ -49,7 +44,7 @@ class DecorationManager;
 class SchematicManager;
 
 struct BlockMakeData {
-       ManualMapVoxelManipulator *vmanip;
+       MMVManip *vmanip;
        u64 seed;
        v3s16 blockpos_min;
        v3s16 blockpos_max;
@@ -75,8 +70,6 @@ class EmergeManager {
 public:
        INodeDefManager *ndef;
 
-       std::map<std::string, MapgenFactory *> mglist;
-
        std::vector<Mapgen *> mapgen;
        std::vector<EmergeThread *> emergethread;
 
@@ -110,14 +103,14 @@ class EmergeManager {
        void loadMapgenParams();
        void initMapgens();
        Mapgen *getCurrentMapgen();
-       Mapgen *createMapgen(std::string mgname, int mgid,
+       Mapgen *createMapgen(const std::string &mgname, int mgid,
                MapgenParams *mgparams);
-       MapgenSpecificParams *createMapgenParams(std::string mgname);
+       MapgenSpecificParams *createMapgenParams(const std::string &mgname);
+       static void getMapgenNames(std::list<const char *> &mgnames);
        void startThreads();
        void stopThreads();
        bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
 
-       void registerMapgen(std::string name, MapgenFactory *mgfactory);
        void loadParamsFromSettings(Settings *settings);
        void saveParamsToSettings(Settings *settings);
 
@@ -125,7 +118,6 @@ class EmergeManager {
        Biome *getBiomeAtPoint(v3s16 p);
        int getGroundLevelAtPoint(v2s16 p);
        bool isBlockUnderground(v3s16 blockpos);
-       u32 getBlockSeed(v3s16 p);
 };
 
 #endif