Skip to content

Commit 9345ba7

Browse files
paramatest31
paramat
authored and
est31
committedMay 4, 2015
Clouds: Make cloud area radius settable in .conf
·
5.11.00.4.13
1 parent 5fa4fed commit 9345ba7

File tree

4 files changed

+28
-22
lines changed

4 files changed

+28
-22
lines changed
 

‎minetest.conf.example

+3
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@
142142
# Enable/disable clouds
143143
#enable_clouds = true
144144
#cloud_height = 120
145+
# Radius of cloud area stated in number of 64 node cloud squares.
146+
# Values > 22 will start to produce clipping of the cloud area corners.
147+
#cloud_radius = 12
145148
#enable_3d_clouds = true
146149
# Use a cloud animation for the main menu background
147150
#menu_clouds = true

‎src/clouds.cpp

+23-22
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ Clouds::Clouds(
5555
m_cloud_y = BS * (cloudheight ? cloudheight :
5656
g_settings->getS16("cloud_height"));
5757

58+
m_cloud_radius_i = g_settings->getU16("cloud_radius");
59+
5860
m_box = core::aabbox3d<f32>(-BS*1000000,m_cloud_y-BS,-BS*1000000,
5961
BS*1000000,m_cloud_y+BS,BS*1000000);
6062

@@ -96,14 +98,13 @@ void Clouds::render()
9698
driver->setMaterial(m_material);
9799

98100
/*
99-
Clouds move from X+ towards X-
101+
Clouds move from Z+ towards Z-
100102
*/
101103

102-
const s16 cloud_radius_i = 12;
103104
const float cloud_size = BS * 64;
104105
const v2f cloud_speed(0, -BS * 2);
105106

106-
const float cloud_full_radius = cloud_size * cloud_radius_i;
107+
const float cloud_full_radius = cloud_size * m_cloud_radius_i;
107108

108109
// Position of cloud noise origin in world coordinates
109110
v2f world_cloud_origin_pos_f = m_time * cloud_speed;
@@ -165,14 +166,14 @@ void Clouds::render()
165166

166167
// Read noise
167168

168-
bool *grid = new bool[cloud_radius_i * 2 * cloud_radius_i * 2];
169+
bool *grid = new bool[m_cloud_radius_i * 2 * m_cloud_radius_i * 2];
169170

170171
float cloud_size_noise = cloud_size / BS / 200;
171172

172-
for(s16 zi = -cloud_radius_i; zi < cloud_radius_i; zi++) {
173-
u32 si = (zi + cloud_radius_i) * cloud_radius_i * 2 + cloud_radius_i;
173+
for(s16 zi = -m_cloud_radius_i; zi < m_cloud_radius_i; zi++) {
174+
u32 si = (zi + m_cloud_radius_i) * m_cloud_radius_i * 2 + m_cloud_radius_i;
174175

175-
for(s16 xi = -cloud_radius_i; xi < cloud_radius_i; xi++) {
176+
for (s16 xi = -m_cloud_radius_i; xi < m_cloud_radius_i; xi++) {
176177
u32 i = si + xi;
177178

178179
v2s16 p_in_noise_i(
@@ -192,23 +193,23 @@ void Clouds::render()
192193
#define INAREA(x, z, radius) \
193194
((x) >= -(radius) && (x) < (radius) && (z) >= -(radius) && (z) < (radius))
194195

195-
for(s16 zi0=-cloud_radius_i; zi0<cloud_radius_i; zi0++)
196-
for(s16 xi0=-cloud_radius_i; xi0<cloud_radius_i; xi0++)
196+
for (s16 zi0= -m_cloud_radius_i; zi0 < m_cloud_radius_i; zi0++)
197+
for (s16 xi0= -m_cloud_radius_i; xi0 < m_cloud_radius_i; xi0++)
197198
{
198199
s16 zi = zi0;
199200
s16 xi = xi0;
200201
// Draw from front to back (needed for transparency)
201202
/*if(zi <= 0)
202-
zi = -cloud_radius_i - zi;
203+
zi = -m_cloud_radius_i - zi;
203204
if(xi <= 0)
204-
xi = -cloud_radius_i - xi;*/
205+
xi = -m_cloud_radius_i - xi;*/
205206
// Draw from back to front
206207
if(zi >= 0)
207-
zi = cloud_radius_i - zi - 1;
208+
zi = m_cloud_radius_i - zi - 1;
208209
if(xi >= 0)
209-
xi = cloud_radius_i - xi - 1;
210+
xi = m_cloud_radius_i - xi - 1;
210211

211-
u32 i = GETINDEX(xi, zi, cloud_radius_i);
212+
u32 i = GETINDEX(xi, zi, m_cloud_radius_i);
212213

213214
if(grid[i] == false)
214215
continue;
@@ -247,8 +248,8 @@ void Clouds::render()
247248
v[3].Pos.set( rx, ry,-rz);
248249
break;
249250
case 1: // back
250-
if(INAREA(xi, zi-1, cloud_radius_i)){
251-
u32 j = GETINDEX(xi, zi-1, cloud_radius_i);
251+
if (INAREA(xi, zi - 1, m_cloud_radius_i)) {
252+
u32 j = GETINDEX(xi, zi - 1, m_cloud_radius_i);
252253
if(grid[j])
253254
continue;
254255
}
@@ -262,8 +263,8 @@ void Clouds::render()
262263
v[3].Pos.set(-rx,-ry,-rz);
263264
break;
264265
case 2: //right
265-
if(INAREA(xi+1, zi, cloud_radius_i)){
266-
u32 j = GETINDEX(xi+1, zi, cloud_radius_i);
266+
if (INAREA(xi + 1, zi, m_cloud_radius_i)) {
267+
u32 j = GETINDEX(xi+1, zi, m_cloud_radius_i);
267268
if(grid[j])
268269
continue;
269270
}
@@ -277,8 +278,8 @@ void Clouds::render()
277278
v[3].Pos.set( rx,-ry,-rz);
278279
break;
279280
case 3: // front
280-
if(INAREA(xi, zi+1, cloud_radius_i)){
281-
u32 j = GETINDEX(xi, zi+1, cloud_radius_i);
281+
if (INAREA(xi, zi + 1, m_cloud_radius_i)) {
282+
u32 j = GETINDEX(xi, zi + 1, m_cloud_radius_i);
282283
if(grid[j])
283284
continue;
284285
}
@@ -292,8 +293,8 @@ void Clouds::render()
292293
v[3].Pos.set( rx,-ry, rz);
293294
break;
294295
case 4: // left
295-
if(INAREA(xi-1, zi, cloud_radius_i)){
296-
u32 j = GETINDEX(xi-1, zi, cloud_radius_i);
296+
if (INAREA(xi-1, zi, m_cloud_radius_i)) {
297+
u32 j = GETINDEX(xi-1, zi, m_cloud_radius_i);
297298
if(grid[j])
298299
continue;
299300
}

‎src/clouds.h

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ class Clouds : public scene::ISceneNode
8787
video::SMaterial m_material;
8888
core::aabbox3d<f32> m_box;
8989
float m_cloud_y;
90+
u16 m_cloud_radius_i;
9091
video::SColorf m_color;
9192
u32 m_seed;
9293
v2f m_camera_pos;

‎src/defaultsettings.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ void set_default_settings(Settings *settings)
127127
settings->setDefault("fall_bobbing_amount", "0.0");
128128
settings->setDefault("enable_3d_clouds", "true");
129129
settings->setDefault("cloud_height", "120");
130+
settings->setDefault("cloud_radius", "12");
130131
settings->setDefault("menu_clouds", "true");
131132
settings->setDefault("opaque_water", "false");
132133
settings->setDefault("console_color", "(0,0,0)");

0 commit comments

Comments
 (0)
Please sign in to comment.