Cleanup and (mostly) document util/string.h and (very) minor refactoring

[dragonfireclient.git] / src / clouds.cpp

diff --git a/src/clouds.cpp b/src/clouds.cpp
index 9f0bc06d8fc22a187ebd5e736f9aad51dcd80c80..10ac8f5b36b1ee679ee4b54e4ef21c5e22952d89 100644 (file)
--- a/src/clouds.cpp
+++ b/src/clouds.cpp
@@ -29,12 +29,14 @@ Clouds::Clouds(
                scene::ISceneNode* parent,
                scene::ISceneManager* mgr,
                s32 id,
-               u32 seed
+               u32 seed,
+               s16 cloudheight
 ):
        scene::ISceneNode(parent, mgr, id),
        m_seed(seed),
        m_camera_pos(0,0),
-       m_time(0)
+       m_time(0),
+       m_camera_offset(0,0,0)
 {
        m_material.setFlag(video::EMF_LIGHTING, false);
        //m_material.setFlag(video::EMF_BACK_FACE_CULLING, false);
@@ -45,7 +47,8 @@ Clouds::Clouds(
        //m_material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
        m_material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
 
-       m_cloud_y = BS * g_settings->getS16("cloud_height");
+       m_cloud_y = BS * (cloudheight ? cloudheight :
+                               g_settings->getS16("cloud_height"));
 
        m_box = core::aabbox3d<f32>(-BS*1000000,m_cloud_y-BS,-BS*1000000,
                        BS*1000000,m_cloud_y+BS,BS*1000000);
@@ -186,7 +189,7 @@ void Clouds::render()
        }
 
 #define GETINDEX(x, z, radius) (((z)+(radius))*(radius)*2 + (x)+(radius))
-#define CONTAINS(x, z, radius) \
+#define INAREA(x, z, radius) \
        ((x) >= -(radius) && (x) < (radius) && (z) >= -(radius) && (z) < (radius))
 
        for(s16 zi0=-cloud_radius_i; zi0<cloud_radius_i; zi0++)
@@ -244,7 +247,7 @@ void Clouds::render()
                                v[3].Pos.set( rx, ry,-rz);
                                break;
                        case 1: // back
-                               if(CONTAINS(xi, zi-1, cloud_radius_i)){
+                               if(INAREA(xi, zi-1, cloud_radius_i)){
                                        u32 j = GETINDEX(xi, zi-1, cloud_radius_i);
                                        if(grid[j])
                                                continue;
@@ -259,7 +262,7 @@ void Clouds::render()
                                v[3].Pos.set(-rx,-ry,-rz);
                                break;
                        case 2: //right
-                               if(CONTAINS(xi+1, zi, cloud_radius_i)){
+                               if(INAREA(xi+1, zi, cloud_radius_i)){
                                        u32 j = GETINDEX(xi+1, zi, cloud_radius_i);
                                        if(grid[j])
                                                continue;
@@ -274,7 +277,7 @@ void Clouds::render()
                                v[3].Pos.set( rx,-ry,-rz);
                                break;
                        case 3: // front
-                               if(CONTAINS(xi, zi+1, cloud_radius_i)){
+                               if(INAREA(xi, zi+1, cloud_radius_i)){
                                        u32 j = GETINDEX(xi, zi+1, cloud_radius_i);
                                        if(grid[j])
                                                continue;
@@ -289,7 +292,7 @@ void Clouds::render()
                                v[3].Pos.set( rx,-ry, rz);
                                break;
                        case 4: // left
-                               if(CONTAINS(xi-1, zi, cloud_radius_i)){
+                               if(INAREA(xi-1, zi, cloud_radius_i)){
                                        u32 j = GETINDEX(xi-1, zi, cloud_radius_i);
                                        if(grid[j])
                                                continue;
@@ -316,6 +319,7 @@ void Clouds::render()
                        }
 
                        v3f pos(p0.X, m_cloud_y, p0.Y);
+                       pos -= intToFloat(m_camera_offset, BS);
 
                        for(u16 i=0; i<4; i++)
                                v[i].Pos += pos;