Merge remote-tracking branch 'origin/wip5.8.0' into wip5.8.0webport

proller · Oct 15, 2024 · a426c31 · a426c31
2 parents e896e5d + 54f9f95
commit a426c31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/client/clientmap.cpp b/src/client/clientmap.cpp
@@ -1245,7 +1245,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 		// Mesh animation
 		if (pass == scene::ESNRP_SOLID) {
 			// Pretty random but this should work somewhat nicely
-			bool faraway = d >= BS * 50;
+			bool faraway = false; //d >= BS * 50;
 			if (block_mesh->isAnimationForced() || !faraway ||
 					mesh_animate_count < (m_control.range_all ? 200 : 50)) {
 

diff --git a/src/client/game.cpp b/src/client/game.cpp
@@ -4751,8 +4751,8 @@ void Game::updateFrame(f32 dtime,
 	if (clouds)
 		updateClouds(dtime);
 
+	thread_local static const auto farmesh_range = g_settings->getS32("farmesh");
 	if (farmesh) {
-		thread_local static const auto farmesh_range = g_settings->getS32("farmesh");
 		thread_local static uint8_t processed{};
 		thread_local static u64 next_run_time{};
 		if (processed || porting::getTimeMs() > next_run_time) {
@@ -4794,8 +4794,8 @@ void Game::updateFrame(f32 dtime,
 		driver->setFog(
 				sky->getBgColor(),
 				video::EFT_FOG_LINEAR,
-				100000 * BS,
-				110000 * BS,
+				std::max(farmesh_range, 100000) * BS,
+				(std::max(farmesh_range, 100000)+10000) * BS,
 				0.01f,
 				false, // pixel fog
 				false // range fog