From b204bc4da91f6f0bf38cc284693450afc5787512 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Thu, 17 Aug 2017 08:26:52 +0200 Subject: clientmap, clientmedia: code modernization * use range-based for loops * simplify some tests * various code style fixes * remove debugprint in ClientMap::getBackgroundBrightness, debug code was not intended to be there * remove unused fields in MapDrawControl * use emplace_back instead of push_back when necessary --- src/clientmap.cpp | 97 ++++++++++++++++--------------------------------------- 1 file changed, 28 insertions(+), 69 deletions(-) (limited to 'src/clientmap.cpp') diff --git a/src/clientmap.cpp b/src/clientmap.cpp index c443773b6..9c4d70f7d 100644 --- a/src/clientmap.cpp +++ b/src/clientmap.cpp @@ -22,9 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapblock_mesh.h" #include #include -#include "log.h" #include "mapsector.h" -#include "nodedef.h" #include "mapblock.h" #include "profiler.h" #include "settings.h" @@ -42,10 +40,7 @@ ClientMap::ClientMap( scene::ISceneNode(RenderingEngine::get_scene_manager()->getRootSceneNode(), RenderingEngine::get_scene_manager(), id), m_client(client), - m_control(control), - m_camera_position(0,0,0), - m_camera_direction(0,0,1), - m_camera_fov(M_PI) + m_control(control) { m_box = aabb3f(-BS*1000000,-BS*1000000,-BS*1000000, BS*1000000,BS*1000000,BS*1000000); @@ -65,10 +60,6 @@ ClientMap::ClientMap( } -ClientMap::~ClientMap() -{ -} - MapSector * ClientMap::emergeSector(v2s16 p2d) { DSTACK(FUNCTION_NAME); @@ -129,14 +120,13 @@ void ClientMap::getBlocksInViewRange(v3s16 cam_pos_nodes, p_nodes_max.Z / MAP_BLOCKSIZE + 1); } -void ClientMap::updateDrawList(video::IVideoDriver* driver) +void ClientMap::updateDrawList() { ScopeProfiler sp(g_profiler, "CM::updateDrawList()", SPT_AVG); g_profiler->add("CM::updateDrawList() count", 1); - for (std::map::iterator i = m_drawlist.begin(); - i != m_drawlist.end(); ++i) { - MapBlock *block = i->second; + for (auto &i : m_drawlist) { + MapBlock *block = i.second; block->refDrop(); } m_drawlist.clear(); @@ -183,12 +173,11 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) occlusion_culling_enabled = false; } - for (std::map::iterator si = m_sectors.begin(); - si != m_sectors.end(); ++si) { - MapSector *sector = si->second; + for (const auto §or_it : m_sectors) { + MapSector *sector = sector_it.second; v2s16 sp = sector->getPos(); - if (m_control.range_all == false) { + if (!m_control.range_all) { if (sp.X < p_blocks_min.X || sp.X > p_blocks_max.X || sp.Y < p_blocks_min.Z || sp.Y > p_blocks_max.Z) continue; @@ -203,14 +192,11 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) u32 sector_blocks_drawn = 0; - for (MapBlockVect::iterator i = sectorblocks.begin(); - i != sectorblocks.end(); ++i) { - MapBlock *block = *i; - + for (auto block : sectorblocks) { /* - Compare block position to camera position, skip - if not seen on display - */ + Compare block position to camera position, skip + if not seen on display + */ if (block->mesh) block->mesh->updateCameraOffset(m_camera_offset); @@ -267,10 +253,6 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) m_last_drawn_sectors.insert(sp); } - m_control.blocks_would_have_drawn = blocks_would_have_drawn; - m_control.blocks_drawn = blocks_drawn; - m_control.farthest_drawn = farthest_drawn; - g_profiler->avg("CM: blocks in range", blocks_in_range); g_profiler->avg("CM: blocks occlusion culled", blocks_occlusion_culled); if (blocks_in_range != 0) @@ -389,9 +371,8 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) MeshBufListList drawbufs; - for (std::map::iterator i = m_drawlist.begin(); - i != m_drawlist.end(); ++i) { - MapBlock *block = i->second; + for (auto &i : m_drawlist) { + MapBlock *block = i.second; // If the mesh of the block happened to get deleted, ignore it if (!block->mesh) @@ -507,12 +488,9 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) if (blocks_drawn != 0) g_profiler->avg(prefix + "empty blocks (frac)", (float)blocks_without_stuff / blocks_drawn); - - /*infostream<<"renderMap(): is_transparent_pass="<getNodeNoEx(p); - if(allow_allowing_non_sunlight_propagates && i == 0 && + if (allow_allowing_non_sunlight_propagates && i == 0 && ndef->get(n).param_type == CPT_LIGHT && - !ndef->get(n).sunlight_propagates){ + !ndef->get(n).sunlight_propagates) { allow_non_sunlight_propagates = true; } - if(ndef->get(n).param_type != CPT_LIGHT || + + if (ndef->get(n).param_type != CPT_LIGHT || (!ndef->get(n).sunlight_propagates && !allow_non_sunlight_propagates)){ nonlight_seen = true; @@ -567,9 +546,9 @@ static bool getVisibleBrightness(Map *map, v3f p0, v3f dir, float step, break; continue; } - if(distance >= sunlight_min_d && *sunlight_seen == false - && nonlight_seen == false) - if(n.getLight(LIGHTBANK_DAY, ndef) == LIGHT_SUN) + + if (distance >= sunlight_min_d && !*sunlight_seen && !nonlight_seen) + if (n.getLight(LIGHTBANK_DAY, ndef) == LIGHT_SUN) *sunlight_seen = true; noncount = 0; brightness_sum += decode_light(n.getLightBlend(daylight_factor, ndef)); @@ -587,13 +566,13 @@ static bool getVisibleBrightness(Map *map, v3f p0, v3f dir, float step, int ClientMap::getBackgroundBrightness(float max_d, u32 daylight_factor, int oldvalue, bool *sunlight_seen_result) { - const bool debugprint = false; static v3f z_directions[50] = { v3f(-100, 0, 0) }; static f32 z_offsets[sizeof(z_directions)/sizeof(*z_directions)] = { -1000, }; + if(z_directions[0].X < -99){ for(u32 i=0; i 35*BS) @@ -646,22 +624,12 @@ int ClientMap::getBackgroundBrightness(float max_d, u32 daylight_factor, else if(num_values_to_use >= 7) num_values_to_use -= num_values_to_use/3; u32 first_value_i = (values.size() - num_values_to_use) / 2; - if(debugprint){ - for(u32 i=0; i < first_value_i; i++) - std::cerr<