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

[minetest.git] / src / clouds.cpp

diff --git a/src/clouds.cpp b/src/clouds.cpp
index 8fea7a6aa24b7292c7d04c15ddb6f2b04f84e972..29210e2b4cda1ded6be22379ec81d71baa31c83c 100644 (file)
--- a/src/clouds.cpp
+++ b/src/clouds.cpp
@@ -21,10 +21,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "noise.h"
 #include "constants.h"
 #include "debug.h"
-#include "main.h" // For g_profiler and g_settings
 #include "profiler.h"
 #include "settings.h"
 
+
+// Menu clouds are created later
+class Clouds;
+Clouds *g_menuclouds = NULL;
+irr::scene::ISceneManager *g_menucloudsmgr = NULL;
+
+static void cloud_3d_setting_changed(const std::string &settingname, void *data)
+{
+       ((Clouds *)data)->readSettings();
+}
+
 Clouds::Clouds(
                scene::ISceneNode* parent,
                scene::ISceneManager* mgr,
@@ -47,8 +57,10 @@ Clouds::Clouds(
        //m_material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
        m_material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
 
-       m_cloud_y = BS * (cloudheight ? cloudheight :
-                               g_settings->getS16("cloud_height"));
+       m_passed_cloud_y = cloudheight;
+       readSettings();
+       g_settings->registerChangedCallback("enable_3d_clouds",
+               &cloud_3d_setting_changed, this);
 
        m_box = core::aabbox3d<f32>(-BS*1000000,m_cloud_y-BS,-BS*1000000,
                        BS*1000000,m_cloud_y+BS,BS*1000000);
@@ -57,6 +69,8 @@ Clouds::Clouds(
 
 Clouds::~Clouds()
 {
+       g_settings->deregisterChangedCallback("enable_3d_clouds",
+               &cloud_3d_setting_changed, this);
 }
 
 void Clouds::OnRegisterSceneNode()
@@ -82,23 +96,21 @@ void Clouds::render()
 
        ScopeProfiler sp(g_profiler, "Rendering of clouds, avg", SPT_AVG);
        
-       bool enable_3d = g_settings->getBool("enable_3d_clouds");
-       int num_faces_to_draw = enable_3d ? 6 : 1;
+       int num_faces_to_draw = m_enable_3d ? 6 : 1;
        
-       m_material.setFlag(video::EMF_BACK_FACE_CULLING, enable_3d);
+       m_material.setFlag(video::EMF_BACK_FACE_CULLING, m_enable_3d);
 
        driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
        driver->setMaterial(m_material);
        
        /*
-               Clouds move from X+ towards X-
+               Clouds move from Z+ towards Z-
        */
 
-       const s16 cloud_radius_i = 12;
        const float cloud_size = BS * 64;
        const v2f cloud_speed(0, -BS * 2);
        
-       const float cloud_full_radius = cloud_size * cloud_radius_i;
+       const float cloud_full_radius = cloud_size * m_cloud_radius_i;
        
        // Position of cloud noise origin in world coordinates
        v2f world_cloud_origin_pos_f = m_time * cloud_speed;
@@ -160,14 +172,14 @@ void Clouds::render()
 
        // Read noise
 
-       bool *grid = new bool[cloud_radius_i * 2 * cloud_radius_i * 2];
+       bool *grid = new bool[m_cloud_radius_i * 2 * m_cloud_radius_i * 2];
 
        float cloud_size_noise = cloud_size / BS / 200;
 
-       for(s16 zi = -cloud_radius_i; zi < cloud_radius_i; zi++) {
-               u32 si = (zi + cloud_radius_i) * cloud_radius_i * 2 + cloud_radius_i;
+       for(s16 zi = -m_cloud_radius_i; zi < m_cloud_radius_i; zi++) {
+               u32 si = (zi + m_cloud_radius_i) * m_cloud_radius_i * 2 + m_cloud_radius_i;
 
-               for(s16 xi = -cloud_radius_i; xi < cloud_radius_i; xi++) {
+               for (s16 xi = -m_cloud_radius_i; xi < m_cloud_radius_i; xi++) {
                        u32 i = si + xi;
 
                        v2s16 p_in_noise_i(
@@ -187,23 +199,23 @@ void Clouds::render()
 #define INAREA(x, z, radius) \
        ((x) >= -(radius) && (x) < (radius) && (z) >= -(radius) && (z) < (radius))
 
-       for(s16 zi0=-cloud_radius_i; zi0<cloud_radius_i; zi0++)
-       for(s16 xi0=-cloud_radius_i; xi0<cloud_radius_i; xi0++)
+       for (s16 zi0= -m_cloud_radius_i; zi0 < m_cloud_radius_i; zi0++)
+       for (s16 xi0= -m_cloud_radius_i; xi0 < m_cloud_radius_i; xi0++)
        {
                s16 zi = zi0;
                s16 xi = xi0;
                // Draw from front to back (needed for transparency)
                /*if(zi <= 0)
-                       zi = -cloud_radius_i - zi;
+                       zi = -m_cloud_radius_i - zi;
                if(xi <= 0)
-                       xi = -cloud_radius_i - xi;*/
+                       xi = -m_cloud_radius_i - xi;*/
                // Draw from back to front
                if(zi >= 0)
-                       zi = cloud_radius_i - zi - 1;
+                       zi = m_cloud_radius_i - zi - 1;
                if(xi >= 0)
-                       xi = cloud_radius_i - xi - 1;
+                       xi = m_cloud_radius_i - xi - 1;
 
-               u32 i = GETINDEX(xi, zi, cloud_radius_i);
+               u32 i = GETINDEX(xi, zi, m_cloud_radius_i);
 
                if(grid[i] == false)
                        continue;
@@ -242,8 +254,8 @@ void Clouds::render()
                                v[3].Pos.set( rx, ry,-rz);
                                break;
                        case 1: // back
-                               if(INAREA(xi, zi-1, cloud_radius_i)){
-                                       u32 j = GETINDEX(xi, zi-1, cloud_radius_i);
+                               if (INAREA(xi, zi - 1, m_cloud_radius_i)) {
+                                       u32 j = GETINDEX(xi, zi - 1, m_cloud_radius_i);
                                        if(grid[j])
                                                continue;
                                }
@@ -257,8 +269,8 @@ void Clouds::render()
                                v[3].Pos.set(-rx,-ry,-rz);
                                break;
                        case 2: //right
-                               if(INAREA(xi+1, zi, cloud_radius_i)){
-                                       u32 j = GETINDEX(xi+1, zi, cloud_radius_i);
+                               if (INAREA(xi + 1, zi, m_cloud_radius_i)) {
+                                       u32 j = GETINDEX(xi+1, zi, m_cloud_radius_i);
                                        if(grid[j])
                                                continue;
                                }
@@ -272,8 +284,8 @@ void Clouds::render()
                                v[3].Pos.set( rx,-ry,-rz);
                                break;
                        case 3: // front
-                               if(INAREA(xi, zi+1, cloud_radius_i)){
-                                       u32 j = GETINDEX(xi, zi+1, cloud_radius_i);
+                               if (INAREA(xi, zi + 1, m_cloud_radius_i)) {
+                                       u32 j = GETINDEX(xi, zi + 1, m_cloud_radius_i);
                                        if(grid[j])
                                                continue;
                                }
@@ -287,8 +299,8 @@ void Clouds::render()
                                v[3].Pos.set( rx,-ry, rz);
                                break;
                        case 4: // left
-                               if(INAREA(xi-1, zi, cloud_radius_i)){
-                                       u32 j = GETINDEX(xi-1, zi, cloud_radius_i);
+                               if (INAREA(xi-1, zi, m_cloud_radius_i)) {
+                                       u32 j = GETINDEX(xi-1, zi, m_cloud_radius_i);
                                        if(grid[j])
                                                continue;
                                }
@@ -344,3 +356,11 @@ void Clouds::update(v2f camera_p, video::SColorf color)
        //dstream<<"m_brightness="<<m_brightness<<std::endl;
 }
 
+void Clouds::readSettings()
+{
+       m_cloud_y = BS * (m_passed_cloud_y ? m_passed_cloud_y :
+               g_settings->getS16("cloud_height"));
+       m_cloud_radius_i = g_settings->getU16("cloud_radius");
+       m_enable_3d = g_settings->getBool("enable_3d_clouds");
+}
+