diff options
author | est31 <MTest31@outlook.com> | 2015-06-29 11:06:03 +0200 |
---|---|---|
committer | est31 <MTest31@outlook.com> | 2015-06-29 15:00:19 +0200 |
commit | 29dda9f356042c403b3b7da1d717d32b45c9b6de (patch) | |
tree | ac063171e654443370691468175502bd221ac979 /src/minimap.h | |
parent | 4e28c8d3c8af51b728a049c28806e0f740ac0106 (diff) | |
download | minetest-29dda9f356042c403b3b7da1d717d32b45c9b6de.tar.gz minetest-29dda9f356042c403b3b7da1d717d32b45c9b6de.tar.bz2 minetest-29dda9f356042c403b3b7da1d717d32b45c9b6de.zip |
Add UpdateThread and use it for minimap and mesh threads
Diffstat (limited to 'src/minimap.h')
-rw-r--r-- | src/minimap.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/minimap.h b/src/minimap.h index 37bc2f7cb..3cb7da898 100644 --- a/src/minimap.h +++ b/src/minimap.h @@ -96,7 +96,6 @@ public: bool addBlock(v3s16 pos, MinimapMapblock *data); - // blocking!! QueuedMinimapUpdate *pop(); u32 size() @@ -110,12 +109,16 @@ private: JMutex m_mutex; }; -class MinimapUpdateThread : public JThread +class MinimapUpdateThread : public UpdateThread { private: - JSemaphore m_queue_sem; MinimapUpdateQueue m_queue; +protected: + const char *getName() + { return "MinimapUpdateThread"; } + virtual void doUpdate(); + public: MinimapUpdateThread(IrrlichtDevice *device, Client *client) { @@ -131,13 +134,10 @@ public: video::SColor getColorFromId(u16 id); void enqueue_Block(v3s16 pos, MinimapMapblock *data); - void forceUpdate(); IrrlichtDevice *device; Client *client; video::IVideoDriver *driver; ITextureSource *tsrc; - void Stop(); - void *Thread(); MinimapData *data; std::map<v3s16, MinimapMapblock *> m_blocks_cache; }; |