From 414f0aed08f1a03643f9d097533ed35720d13a8b Mon Sep 17 00:00:00 2001 From: proller Date: Tue, 10 Dec 2024 20:24:09 +0100 Subject: [PATCH] fix --- src/noise.h | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/noise.h b/src/noise.h index 620dfd85a..d3ccdba36 100644 --- a/src/noise.h +++ b/src/noise.h @@ -39,9 +39,6 @@ along with Freeminer. If not, see . extern FlagDesc flagdesc_noiseparams[]; - -#if MAX_MAP_GENERATION_LIMIT > FARSCALE_LIMIT - template inline type_scale farscale(type_scale scale, type_coord z) { return ( 1 + ( 1 - (FARSCALE_LIMIT * 1 - (fmod(fabs(z), FARSCALE_LIMIT)) ) / (FARSCALE_LIMIT * 1) ) * (scale - 1) ); @@ -57,26 +54,6 @@ inline type_scale farscale(type_scale scale, type_coord x, type_coord y, type_co return ( 1 + ( 1 - (FARSCALE_LIMIT * 3 - fmod(fabs(x) + fabs(y) + fabs(z), FARSCALE_LIMIT*3) ) / (FARSCALE_LIMIT * 3) ) * (scale - 1) ); } -#else - -template -inline type_scale farscale(type_scale scale, type_coord z) { - return ( 1 + ( 1 - (FARSCALE_LIMIT * 1 - (fabs(z)) ) / (FARSCALE_LIMIT * 1) ) * (scale - 1) ); -} - -template -inline type_scale farscale(type_scale scale, type_coord x, type_coord z) { - return ( 1 + ( 1 - (FARSCALE_LIMIT * 2 - (fabs(x) + fabs(z)) ) / (FARSCALE_LIMIT * 2) ) * (scale - 1) ); -} - -template -inline type_scale farscale(type_scale scale, type_coord x, type_coord y, type_coord z) { - return ( 1 + ( 1 - (FARSCALE_LIMIT * 3 - (fabs(x) + fabs(y) + fabs(z)) ) / (FARSCALE_LIMIT * 3) ) * (scale - 1) ); -} - -#endif - - // Note: this class is not polymorphic so that its high level of // optimizability may be preserved in the common use case class PseudoRandom {