X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclient%2Fmesh_generator_thread.cpp;h=c8d1cba2654fb7c3ef04f843c6d989f6cf412e5e;hb=946f3030fc0728de15620896e08ed7e10696c11b;hp=69d61d5e677b0dcefe1fe9892c14dc9dcaa2b458;hpb=ad148587dcf5244c2d2011dba339786c765c54c4;p=dragonfireclient.git diff --git a/src/client/mesh_generator_thread.cpp b/src/client/mesh_generator_thread.cpp index 69d61d5e6..c8d1cba26 100644 --- a/src/client/mesh_generator_thread.cpp +++ b/src/client/mesh_generator_thread.cpp @@ -48,13 +48,10 @@ QueuedMeshUpdate::~QueuedMeshUpdate() MeshUpdateQueue */ -MeshUpdateQueue::MeshUpdateQueue(Client *client) : m_client(client) +MeshUpdateQueue::MeshUpdateQueue(Client *client): + m_client(client) { m_cache_enable_shaders = g_settings->getBool("enable_shaders"); - m_cache_use_tangent_vertices = - m_cache_enable_shaders && - (g_settings->getBool("enable_bumpmapping") || - g_settings->getBool("enable_parallax_occlusion")); m_cache_smooth_lighting = g_settings->getBool("smooth_lighting"); m_meshgen_block_cache_size = g_settings->getS32("meshgen_block_cache_size"); } @@ -82,23 +79,22 @@ void MeshUpdateQueue::addBlock(Map *map, v3s16 p, bool ack_block_to_server, bool Cache the block data (force-update the center block, don't update the neighbors but get them if they aren't already cached) */ - std::vector cached_blocks; + std::vector cached_blocks; size_t cache_hit_counter = 0; - cached_blocks.reserve(3 * 3 * 3); + cached_blocks.reserve(3*3*3); v3s16 dp; for (dp.X = -1; dp.X <= 1; dp.X++) - for (dp.Y = -1; dp.Y <= 1; dp.Y++) - for (dp.Z = -1; dp.Z <= 1; dp.Z++) { - v3s16 p1 = p + dp; - CachedMapBlockData *cached_block; - if (dp == v3s16(0, 0, 0)) - cached_block = cacheBlock(map, p1, FORCE_UPDATE); - else - cached_block = cacheBlock(map, p1, - SKIP_UPDATE_IF_ALREADY_CACHED, - &cache_hit_counter); - cached_blocks.push_back(cached_block); - } + for (dp.Y = -1; dp.Y <= 1; dp.Y++) + for (dp.Z = -1; dp.Z <= 1; dp.Z++) { + v3s16 p1 = p + dp; + CachedMapBlockData *cached_block; + if (dp == v3s16(0, 0, 0)) + cached_block = cacheBlock(map, p1, FORCE_UPDATE); + else + cached_block = cacheBlock(map, p1, SKIP_UPDATE_IF_ALREADY_CACHED, + &cache_hit_counter); + cached_blocks.push_back(cached_block); + } g_profiler->avg("MeshUpdateQueue: MapBlocks from cache [%]", 100.0f * cache_hit_counter / cached_blocks.size()); @@ -116,7 +112,7 @@ void MeshUpdateQueue::addBlock(Map *map, v3s16 p, bool ack_block_to_server, bool if (q->p == p) { // NOTE: We are not adding a new position to the queue, thus // refcount_from_queue stays the same. - if (ack_block_to_server) + if(ack_block_to_server) q->ack_block_to_server = true; q->crack_level = m_client->getCrackLevel(); q->crack_pos = m_client->getCrackPos(); @@ -147,10 +143,10 @@ QueuedMeshUpdate *MeshUpdateQueue::pop() MutexAutoLock lock(m_mutex); bool must_be_urgent = !m_urgents.empty(); - for (std::vector::iterator i = m_queue.begin(); + for (std::vector::iterator i = m_queue.begin(); i != m_queue.end(); ++i) { QueuedMeshUpdate *q = *i; - if (must_be_urgent && m_urgents.count(q->p) == 0) + if(must_be_urgent && m_urgents.count(q->p) == 0) continue; m_queue.erase(i); m_urgents.erase(q->p); @@ -160,11 +156,12 @@ QueuedMeshUpdate *MeshUpdateQueue::pop() return NULL; } -CachedMapBlockData *MeshUpdateQueue::cacheBlock( - Map *map, v3s16 p, UpdateMode mode, size_t *cache_hit_counter) +CachedMapBlockData* MeshUpdateQueue::cacheBlock(Map *map, v3s16 p, UpdateMode mode, + size_t *cache_hit_counter) { CachedMapBlockData *cached_block = nullptr; - std::map::iterator it = m_cache.find(p); + std::map::iterator it = + m_cache.find(p); if (it != m_cache.end()) { cached_block = it->second; @@ -185,11 +182,10 @@ CachedMapBlockData *MeshUpdateQueue::cacheBlock( MapBlock *b = map->getBlockNoCreateNoEx(p); if (b) { if (!cached_block->data) - cached_block->data = new MapNode[MAP_BLOCKSIZE * MAP_BLOCKSIZE * - MAP_BLOCKSIZE]; + cached_block->data = + new MapNode[MAP_BLOCKSIZE * MAP_BLOCKSIZE * MAP_BLOCKSIZE]; memcpy(cached_block->data, b->getData(), - MAP_BLOCKSIZE * MAP_BLOCKSIZE * MAP_BLOCKSIZE * - sizeof(MapNode)); + MAP_BLOCKSIZE * MAP_BLOCKSIZE * MAP_BLOCKSIZE * sizeof(MapNode)); } else { delete[] cached_block->data; cached_block->data = nullptr; @@ -197,9 +193,9 @@ CachedMapBlockData *MeshUpdateQueue::cacheBlock( return cached_block; } -CachedMapBlockData *MeshUpdateQueue::getCachedBlock(const v3s16 &p) +CachedMapBlockData* MeshUpdateQueue::getCachedBlock(const v3s16 &p) { - std::map::iterator it = m_cache.find(p); + std::map::iterator it = m_cache.find(p); if (it != m_cache.end()) { return it->second; } @@ -208,8 +204,7 @@ CachedMapBlockData *MeshUpdateQueue::getCachedBlock(const v3s16 &p) void MeshUpdateQueue::fillDataFromMapBlockCache(QueuedMeshUpdate *q) { - MeshMakeData *data = new MeshMakeData( - m_client, m_cache_enable_shaders, m_cache_use_tangent_vertices); + MeshMakeData *data = new MeshMakeData(m_client, m_cache_enable_shaders); q->data = data; data->fillBlockDataBegin(q->p); @@ -219,18 +214,17 @@ void MeshUpdateQueue::fillDataFromMapBlockCache(QueuedMeshUpdate *q) // Collect data for 3*3*3 blocks from cache v3s16 dp; for (dp.X = -1; dp.X <= 1; dp.X++) - for (dp.Y = -1; dp.Y <= 1; dp.Y++) - for (dp.Z = -1; dp.Z <= 1; dp.Z++) { - v3s16 p = q->p + dp; - CachedMapBlockData *cached_block = getCachedBlock(p); - if (cached_block) { - cached_block->refcount_from_queue--; - cached_block->last_used_timestamp = t_now; - if (cached_block->data) - data->fillBlockData( - dp, cached_block->data); - } - } + for (dp.Y = -1; dp.Y <= 1; dp.Y++) + for (dp.Z = -1; dp.Z <= 1; dp.Z++) { + v3s16 p = q->p + dp; + CachedMapBlockData *cached_block = getCachedBlock(p); + if (cached_block) { + cached_block->refcount_from_queue--; + cached_block->last_used_timestamp = t_now; + if (cached_block->data) + data->fillBlockData(dp, cached_block->data); + } + } data->setCrack(q->crack_level, q->crack_pos); data->setSmoothLighting(m_cache_smooth_lighting); @@ -239,7 +233,7 @@ void MeshUpdateQueue::fillDataFromMapBlockCache(QueuedMeshUpdate *q) void MeshUpdateQueue::cleanupCache() { const int mapblock_kB = MAP_BLOCKSIZE * MAP_BLOCKSIZE * MAP_BLOCKSIZE * - sizeof(MapNode) / 1000; + sizeof(MapNode) / 1000; g_profiler->avg("MeshUpdateQueue MapBlock cache size kB", mapblock_kB * m_cache.size()); @@ -247,20 +241,16 @@ void MeshUpdateQueue::cleanupCache() // anything get older than cache_seconds_max or deleted before 2 seconds. const int cache_seconds_max = 10; const int cache_soft_max_size = m_meshgen_block_cache_size * 1000 / mapblock_kB; - int cache_seconds = MYMAX(2, - cache_seconds_max - - m_cache.size() / - (cache_soft_max_size / - cache_seconds_max)); + int cache_seconds = MYMAX(2, cache_seconds_max - + m_cache.size() / (cache_soft_max_size / cache_seconds_max)); int t_now = time(0); - for (std::map::iterator it = m_cache.begin(); - it != m_cache.end();) { + for (std::map::iterator it = m_cache.begin(); + it != m_cache.end(); ) { CachedMapBlockData *cached_block = it->second; if (cached_block->refcount_from_queue == 0 && - cached_block->last_used_timestamp < - t_now - cache_seconds) { + cached_block->last_used_timestamp < t_now - cache_seconds) { m_cache.erase(it++); delete cached_block; } else { @@ -273,15 +263,16 @@ void MeshUpdateQueue::cleanupCache() MeshUpdateThread */ -MeshUpdateThread::MeshUpdateThread(Client *client) : - UpdateThread("Mesh"), m_queue_in(client) +MeshUpdateThread::MeshUpdateThread(Client *client): + UpdateThread("Mesh"), + m_queue_in(client) { m_generation_interval = g_settings->getU16("mesh_generation_interval"); m_generation_interval = rangelim(m_generation_interval, 0, 50); } -void MeshUpdateThread::updateBlock( - Map *map, v3s16 p, bool ack_block_to_server, bool urgent) +void MeshUpdateThread::updateBlock(Map *map, v3s16 p, bool ack_block_to_server, + bool urgent) { // Allow the MeshUpdateQueue to do whatever it wants m_queue_in.addBlock(map, p, ack_block_to_server, urgent);