X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclouds.cpp;h=82b63b6b35006d64609a8e9609d40697de32a004;hb=65c09a96f41705bb8e75fc5ff4276342be91ed11;hp=5b980a5ba2ad4e21e94c13ce8b1bccce28c6e36c;hpb=bcc0ca93d463ec7bdf6ff1ef621f7777014c404a;p=minetest.git diff --git a/src/clouds.cpp b/src/clouds.cpp index 5b980a5ba..82b63b6b3 100644 --- a/src/clouds.cpp +++ b/src/clouds.cpp @@ -1,6 +1,6 @@ /* -Minetest-c55 -Copyright (C) 2010-2011 celeron55, Perttu Ahola +Minetest +Copyright (C) 2010-2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -21,20 +21,32 @@ 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, 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,15 +57,20 @@ 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_passed_cloud_y = cloudheight; + readSettings(); + g_settings->registerChangedCallback("enable_3d_clouds", + &cloud_3d_setting_changed, this); - m_box = core::aabbox3d(-BS*1000000,m_cloud_y-BS,-BS*1000000, + m_box = aabb3f(-BS*1000000,m_cloud_y-BS,-BS*1000000, BS*1000000,m_cloud_y+BS,BS*1000000); } Clouds::~Clouds() { + g_settings->deregisterChangedCallback("enable_3d_clouds", + &cloud_3d_setting_changed, this); } void Clouds::OnRegisterSceneNode() @@ -79,26 +96,24 @@ 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_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; + v2f world_cloud_origin_pos_f = m_time * cloud_speed; // Position of cloud noise origin from the camera v2f cloud_origin_from_camera_f = world_cloud_origin_pos_f - m_camera_pos; // The center point of drawing in the noise @@ -157,55 +172,50 @@ 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]; - for(s16 zi=-cloud_radius_i; zi= 0.80); -#endif -#if 1 - double noise = noise2d_perlin( - (float)p_in_noise_i.X*cloud_size/BS/200, - (float)p_in_noise_i.Y*cloud_size/BS/200, - m_seed, 3, 0.5); - grid[i] = (noise >= 0.4); -#endif + float cloud_size_noise = cloud_size / BS / 200; + + 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 = -m_cloud_radius_i; xi < m_cloud_radius_i; xi++) { + u32 i = si + xi; + + v2s16 p_in_noise_i( + xi + center_of_drawing_in_noise_i.X, + zi + center_of_drawing_in_noise_i.Y + ); + + double noise = noise2d_perlin( + (float)p_in_noise_i.X * cloud_size_noise, + (float)p_in_noise_i.Y * cloud_size_noise, + m_seed, 3, 0.5); + grid[i] = (noise >= 0.4); + } } #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= 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; @@ -227,8 +237,8 @@ void Clouds::render() }*/ f32 rx = cloud_size/2; - f32 ry = 8*BS; - f32 rz = cloud_size/2; + f32 ry = 8 * BS; + f32 rz = cloud_size / 2; for(int i=0; igetU16("cloud_radius"); + m_enable_3d = g_settings->getBool("enable_3d_clouds"); +} +