Mgv5/v7/flat/fractal: Move tunnel noise calculation into generateCaves

[minetest.git] / src / environment.h

diff --git a/src/environment.h b/src/environment.h
index 1984cf40d8d81d8e1e63153cef6ee1d26c8f64aa..1aaa5091fc5bf6fbb5210b6791df5aa88791ef4d 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -40,6 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapnode.h"
 #include "mapblock.h"
 #include "threading/mutex.h"
+#include "threading/atomic.h"
 #include "network/networkprotocol.h" // for AccessDeniedCode
 
 class ServerEnvironment;
@@ -92,11 +93,7 @@ class Environment
        void setTimeOfDaySpeed(float speed);
        float getTimeOfDaySpeed();
 
-       void setDayNightRatioOverride(bool enable, u32 value)
-       {
-               m_enable_day_night_ratio_override = enable;
-               m_day_night_ratio_override = value;
-       }
+       void setDayNightRatioOverride(bool enable, u32 value);
 
        // counter used internally when triggering ABMs
        u32 m_added_objects;
@@ -105,23 +102,24 @@ class Environment
        // peer_ids in here should be unique, except that there may be many 0s
        std::vector<Player*> m_players;
 
+       GenericAtomic<float> m_time_of_day_speed;
 
        /*
-        *  Below: values under m_time_lock
-        */
+        * Below: values managed by m_time_lock
+       */
        // Time of day in milli-hours (0-23999); determines day and night
        u32 m_time_of_day;
        // Time of day in 0...1
        float m_time_of_day_f;
-       float m_time_of_day_speed;
-       // Used to buffer dtime for adding to m_time_of_day
-       float m_time_counter;
+       // Stores the skew created by the float -> u32 conversion
+       // to be applied at next conversion, so that there is no real skew.
+       float m_time_conversion_skew;
        // Overriding the day-night ratio is useful for custom sky visuals
        bool m_enable_day_night_ratio_override;
        u32 m_day_night_ratio_override;
        /*
-        * Above: values under m_time_lock
-        */
+        * Above: values managed by m_time_lock
+       */
 
        /* TODO: Add a callback function so these can be updated when a setting
         *       changes.  At this point in time it doesn't matter (e.g. /set
@@ -137,6 +135,7 @@ class Environment
 private:
        Mutex m_time_lock;
 
+       DISABLE_CLASS_COPY(Environment);
 };
 
 /*