minetest
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broken lint since 04cc9de8f2

master
Loïc Blot 2017-04-18 17:13:50 +02:00
parent 93c1d511e3
commit 5f2af7c4e8
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mesh_generator_thread.h
View File

@ -53,10 +53,12 @@ struct QueuedMeshUpdate
*/ */
class MeshUpdateQueue class MeshUpdateQueue
{ {
enum UpdateMode { enum UpdateMode
{
FORCE_UPDATE, FORCE_UPDATE,
SKIP_UPDATE_IF_ALREADY_CACHED, SKIP_UPDATE_IF_ALREADY_CACHED,
}; };
public: public:
MeshUpdateQueue(Client *client); MeshUpdateQueue(Client *client);
@ -68,7 +70,7 @@ public:
// Returned pointer must be deleted // Returned pointer must be deleted
// Returns NULL if queue is empty // Returns NULL if queue is empty
QueuedMeshUpdate * pop(); QueuedMeshUpdate *pop();
u32 size() u32 size()
{ {
@ -78,9 +80,9 @@ public:
private: private:
Client *m_client; Client *m_client;
std::vector<QueuedMeshUpdate*> m_queue; std::vector<QueuedMeshUpdate *> m_queue;
std::set<v3s16> m_urgents; std::set<v3s16> m_urgents;
std::map<v3s16, CachedMapBlockData*> m_cache; std::map<v3s16, CachedMapBlockData *> m_cache;
Mutex m_mutex; Mutex m_mutex;
// TODO: Add callback to update these when g_settings changes // TODO: Add callback to update these when g_settings changes
@ -89,9 +91,9 @@ private:
bool m_cache_smooth_lighting; bool m_cache_smooth_lighting;
int m_meshgen_block_cache_size; int m_meshgen_block_cache_size;
CachedMapBlockData* cacheBlock(Map *map, v3s16 p, UpdateMode mode, CachedMapBlockData *cacheBlock(Map *map, v3s16 p, UpdateMode mode,
size_t *cache_hit_counter=NULL); size_t *cache_hit_counter = NULL);
CachedMapBlockData* getCachedBlock(const v3s16 &p); CachedMapBlockData *getCachedBlock(const v3s16 &p);
void fillDataFromMapBlockCache(QueuedMeshUpdate *q); void fillDataFromMapBlockCache(QueuedMeshUpdate *q);
void cleanupCache(); void cleanupCache();
}; };
@ -102,10 +104,8 @@ struct MeshUpdateResult
MapBlockMesh *mesh; MapBlockMesh *mesh;
bool ack_block_to_server; bool ack_block_to_server;
MeshUpdateResult(): MeshUpdateResult()
p(-1338,-1338,-1338), : p(-1338, -1338, -1338), mesh(NULL), ack_block_to_server(false)
mesh(NULL),
ack_block_to_server(false)
{ {
} }
}; };

1
util/travis/clang-format-whitelist.txt
View File

@ -169,6 +169,7 @@ src/map_settings_manager.cpp
src/map_settings_manager.h src/map_settings_manager.h
src/mesh.cpp src/mesh.cpp
src/mesh.h src/mesh.h
src/mesh_generator_thread.cpp
src/metadata.cpp src/metadata.cpp
src/metadata.h src/metadata.h
src/mg_biome.cpp src/mg_biome.cpp