Increase step smoothing to fit 1:1 stairs (works well on slabs too)

[minetest.git] / src / emerge.h

diff --git a/src/emerge.h b/src/emerge.h
index ee95c348f9e1a595c2fa69c88853e49dc116d85e..65b1d6594ebe9e33544e436c8c88d5597ed26fe5 100644 (file)
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -21,8 +21,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define EMERGE_HEADER
 
 #include <map>
-#include <queue>
-#include "util/thread.h"
+#include "irr_v3d.h"
+#include "util/container.h"
+#include "mapgen.h" // for MapgenParams
+#include "map.h"
 
 #define MGPARAMS_SET_MGNAME      1
 #define MGPARAMS_SET_SEED        2
@@ -32,18 +34,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define BLOCK_EMERGE_ALLOWGEN (1<<0)
 
 #define EMERGE_DBG_OUT(x) \
-       { if (enable_mapgen_debug_info) \
-       infostream << "EmergeThread: " x << std::endl; }
-
-class Mapgen;
-struct MapgenParams;
-struct MapgenFactory;
-class Biome;
-class BiomeDefManager;
+       do {                                                   \
+               if (enable_mapgen_debug_info)                      \
+                       infostream << "EmergeThread: " x << std::endl; \
+       } while (0)
+
 class EmergeThread;
-class ManualMapVoxelManipulator;
+class INodeDefManager;
+class Settings;
 
-#include "server.h"
+class BiomeManager;
+class OreManager;
+class DecorationManager;
+class SchematicManager;
 
 struct BlockMakeData {
        ManualMapVoxelManipulator *vmanip;
@@ -73,45 +76,50 @@ class EmergeManager {
        INodeDefManager *ndef;
 
        std::map<std::string, MapgenFactory *> mglist;
-       
+
        std::vector<Mapgen *> mapgen;
        std::vector<EmergeThread *> emergethread;
-       
+
+       bool threads_active;
+
        //settings
-       MapgenParams *params;
+       MapgenParams params;
        bool mapgen_debug_info;
        u16 qlimit_total;
        u16 qlimit_diskonly;
        u16 qlimit_generate;
-       
-       MapgenParams *luaoverride_params;
-       u32 luaoverride_params_modified;
-       u32 luaoverride_flagmask;
-       
-       //block emerge queue data structures
+
+       u32 gennotify;
+
+       //// Block emerge queue data structures
        JMutex queuemutex;
        std::map<v3s16, BlockEmergeData *> blocks_enqueued;
        std::map<u16, u16> peer_queue_count;
 
-       //Mapgen-related structures
-       BiomeDefManager *biomedef;
-       std::vector<Ore *> ores;
-       std::vector<Decoration *> decorations;
+       //// Managers of map generation-related components
+       BiomeManager *biomemgr;
+       OreManager *oremgr;
+       DecorationManager *decomgr;
+       SchematicManager *schemmgr;
 
+       //// Methods
        EmergeManager(IGameDef *gamedef);
        ~EmergeManager();
 
-       void initMapgens(MapgenParams *mgparams);
+       void loadMapgenParams();
+       void initMapgens();
        Mapgen *getCurrentMapgen();
        Mapgen *createMapgen(std::string mgname, int mgid,
-                                               MapgenParams *mgparams);
-       MapgenParams *createMapgenParams(std::string mgname);
+               MapgenParams *mgparams);
+       MapgenSpecificParams *createMapgenParams(std::string mgname);
+       void startThreads();
+       void stopThreads();
        bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
-       
+
        void registerMapgen(std::string name, MapgenFactory *mgfactory);
-       MapgenParams *getParamsFromSettings(Settings *settings);
-       void setParamsToSettings(Settings *settings);
-       
+       void loadParamsFromSettings(Settings *settings);
+       void saveParamsToSettings(Settings *settings);
+
        //mapgen helper methods
        Biome *getBiomeAtPoint(v3s16 p);
        int getGroundLevelAtPoint(v2s16 p);
@@ -119,43 +127,4 @@ class EmergeManager {
        u32 getBlockSeed(v3s16 p);
 };
 
-class EmergeThread : public SimpleThread
-{
-public:
-       Server *m_server;
-       ServerMap *map;
-       EmergeManager *emerge;
-       Mapgen *mapgen;
-       bool enable_mapgen_debug_info;
-       int id;
-       
-       Event qevent;
-       std::queue<v3s16> blockqueue;
-       
-       EmergeThread(Server *server, int ethreadid):
-               SimpleThread(),
-               m_server(server),
-               map(NULL),
-               emerge(NULL),
-               mapgen(NULL),
-               id(ethreadid)
-       {
-       }
-
-       void *Thread();
-
-       void trigger()
-       {
-               setRun(true);
-               if(IsRunning() == false)
-               {
-                       Start();
-               }
-       }
-
-       bool popBlockEmerge(v3s16 *pos, u8 *flags);
-       bool getBlockOrStartGen(v3s16 p, MapBlock **b, 
-                                                       BlockMakeData *data, bool allow_generate);
-};
-
 #endif