projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Mapgen VoxelManipulator on buffer invalidation
[oweals/minetest.git]
/
src
/
emerge.h
diff --git
a/src/emerge.h
b/src/emerge.h
index d2ab6894dfe5edf9a7eafb90d7213eed3996a4db..b4c8e9ffd43f7281ae11f3999fff23693f84548d 100644
(file)
--- a/
src/emerge.h
+++ b/
src/emerge.h
@@
-24,6
+24,7
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#include "irr_v3d.h"
#include "util/container.h"
#include "map.h" // for ManualMapVoxelManipulator
#include "irr_v3d.h"
#include "util/container.h"
#include "map.h" // for ManualMapVoxelManipulator
+#include "mapgen.h" // for MapgenParams
#define MGPARAMS_SET_MGNAME 1
#define MGPARAMS_SET_SEED 2
#define MGPARAMS_SET_MGNAME 1
#define MGPARAMS_SET_SEED 2
@@
-37,9
+38,8
@@
with this program; if not, write to the Free Software Foundation, Inc.,
infostream << "EmergeThread: " x << std::endl; }
class EmergeThread;
infostream << "EmergeThread: " x << std::endl; }
class EmergeThread;
-class Mapgen;
-struct MapgenParams;
-struct MapgenFactory;
+//class Mapgen;
+//struct MapgenFactory;
class Biome;
class BiomeDefManager;
class Decoration;
class Biome;
class BiomeDefManager;
class Decoration;
@@
-70,34
+70,26
@@
struct BlockEmergeData {
u8 flags;
};
u8 flags;
};
-class IBackgroundBlockEmerger
-{
-public:
- virtual bool enqueueBlockEmerge(u16 peer_id, v3s16 p,
- bool allow_generate) = 0;
- virtual ~IBackgroundBlockEmerger() {}
-};
-
-class EmergeManager : public IBackgroundBlockEmerger {
+class EmergeManager {
public:
INodeDefManager *ndef;
std::map<std::string, MapgenFactory *> mglist;
public:
INodeDefManager *ndef;
std::map<std::string, MapgenFactory *> mglist;
-
+
std::vector<Mapgen *> mapgen;
std::vector<EmergeThread *> emergethread;
std::vector<Mapgen *> mapgen;
std::vector<EmergeThread *> emergethread;
-
+
+ bool threads_active;
+
//settings
//settings
- MapgenParams
*
params;
+ MapgenParams params;
bool mapgen_debug_info;
u16 qlimit_total;
u16 qlimit_diskonly;
u16 qlimit_generate;
bool mapgen_debug_info;
u16 qlimit_total;
u16 qlimit_diskonly;
u16 qlimit_generate;
-
- MapgenParams *luaoverride_params;
- u32 luaoverride_params_modified;
- u32 luaoverride_flagmask;
-
+
+ u32 gennotify;
+
//block emerge queue data structures
JMutex queuemutex;
std::map<v3s16, BlockEmergeData *> blocks_enqueued;
//block emerge queue data structures
JMutex queuemutex;
std::map<v3s16, BlockEmergeData *> blocks_enqueued;
@@
-111,18
+103,20
@@
public:
EmergeManager(IGameDef *gamedef);
~EmergeManager();
EmergeManager(IGameDef *gamedef);
~EmergeManager();
- void initMapgens(MapgenParams *mgparams);
+ void loadMapgenParams();
+ void initMapgens();
Mapgen *getCurrentMapgen();
Mapgen *createMapgen(std::string mgname, int mgid,
MapgenParams *mgparams);
Mapgen *getCurrentMapgen();
Mapgen *createMapgen(std::string mgname, int mgid,
MapgenParams *mgparams);
- MapgenParams *createMapgenParams(std::string mgname);
- void triggerAllThreads();
+ MapgenSpecificParams *createMapgenParams(std::string mgname);
+ void startThreads();
+ void stopThreads();
bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
-
+
void registerMapgen(std::string name, MapgenFactory *mgfactory);
void registerMapgen(std::string name, MapgenFactory *mgfactory);
-
MapgenParams *get
ParamsFromSettings(Settings *settings);
- void s
et
ParamsToSettings(Settings *settings);
-
+
void load
ParamsFromSettings(Settings *settings);
+ void s
ave
ParamsToSettings(Settings *settings);
+
//mapgen helper methods
Biome *getBiomeAtPoint(v3s16 p);
int getGroundLevelAtPoint(v2s16 p);
//mapgen helper methods
Biome *getBiomeAtPoint(v3s16 p);
int getGroundLevelAtPoint(v2s16 p);