From: Perttu Ahola Date: Fri, 29 Apr 2011 12:34:26 +0000 (+0300) Subject: added clouds X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=7a367f96e15aa6167f1c51b19fd38cffa14f5cc7;p=zefram%2Fminetest%2Fminetest_engine.git added clouds --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9d9524ea..ef42d002 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -81,6 +81,7 @@ set(common_SRCS # Client sources set(minetest_SRCS ${common_SRCS} + clouds.cpp clientobject.cpp guiFurnaceMenu.cpp guiMainMenu.cpp diff --git a/src/clouds.cpp b/src/clouds.cpp new file mode 100644 index 00000000..20a1c12d --- /dev/null +++ b/src/clouds.cpp @@ -0,0 +1,157 @@ +/* +Minetest-c55 +Copyright (C) 2010 celeron55, Perttu Ahola + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include "clouds.h" +#include "noise.h" +#include "constants.h" +#include "debug.h" + +Clouds::Clouds( + scene::ISceneNode* parent, + scene::ISceneManager* mgr, + s32 id, + float cloud_y, + u32 seed +): + scene::ISceneNode(parent, mgr, id), + m_cloud_y(cloud_y), + m_seed(seed), + m_camera_pos(0,0), + m_time(0) +{ + dstream<<__FUNCTION_NAME<(-BS*1000000,cloud_y-BS,-BS*1000000, + BS*1000000,cloud_y+BS,BS*1000000); + +} + +Clouds::~Clouds() +{ + dstream<<__FUNCTION_NAME<registerNodeForRendering(this, scene::ESNRP_SOLID); + //SceneManager->registerNodeForRendering(this, scene::ESNRP_TRANSPARENT); + } + + ISceneNode::OnRegisterSceneNode(); +} + +#define MYROUND(x) (x > 0.0 ? (int)x : (int)x - 1) + +void Clouds::render() +{ + video::IVideoDriver* driver = SceneManager->getVideoDriver(); + + /*if(SceneManager->getSceneNodeRenderPass() != scene::ESNRP_TRANSPARENT) + return;*/ + if(SceneManager->getSceneNodeRenderPass() != scene::ESNRP_SOLID) + return; + + driver->setTransform(video::ETS_WORLD, AbsoluteTransformation); + driver->setMaterial(m_material); + + /* + Clouds move from X+ towards X- + */ + + const s16 cloud_radius_i = 12; + const float cloud_size = BS*50; + const v2f cloud_speed(-BS*2, 0); + + // Position of cloud noise origin in world coordinates + 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 + v2f center_of_drawing_in_noise_f = -cloud_origin_from_camera_f; + // The integer center point of drawing in the noise + v2s16 center_of_drawing_in_noise_i( + MYROUND(center_of_drawing_in_noise_f.X / cloud_size), + MYROUND(center_of_drawing_in_noise_f.Y / cloud_size) + ); + // The world position of the integer center point of drawing in the noise + v2f world_center_of_drawing_in_noise_f = v2f( + center_of_drawing_in_noise_i.X * cloud_size, + center_of_drawing_in_noise_i.Y * cloud_size + ) + world_cloud_origin_pos_f; + + for(s16 zi=-cloud_radius_i; zidrawVertexPrimitiveList(vertices, 4, indices, 2, + video::EVT_STANDARD, scene::EPT_TRIANGLES, video::EIT_16BIT); + } +} + +void Clouds::step(float dtime) +{ + m_time += dtime; +} + +void Clouds::update(v2f camera_p, float brightness) +{ + m_camera_pos = camera_p; + m_brightness = brightness; +} + diff --git a/src/clouds.h b/src/clouds.h new file mode 100644 index 00000000..6972ccab --- /dev/null +++ b/src/clouds.h @@ -0,0 +1,83 @@ +/* +Minetest-c55 +Copyright (C) 2010 celeron55, Perttu Ahola + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#ifndef CLOUDS_HEADER +#define CLOUDS_HEADER + +#include "common_irrlicht.h" +#include + +class Clouds : public scene::ISceneNode +{ +public: + Clouds( + scene::ISceneNode* parent, + scene::ISceneManager* mgr, + s32 id, + float cloud_y, + u32 seed + ); + + ~Clouds(); + + /* + ISceneNode methods + */ + + virtual void OnRegisterSceneNode(); + + virtual void render(); + + virtual const core::aabbox3d& getBoundingBox() const + { + return m_box; + } + + virtual u32 getMaterialCount() const + { + return 1; + } + + virtual video::SMaterial& getMaterial(u32 i) + { + return m_material; + } + + /* + Other stuff + */ + + void step(float dtime); + + void update(v2f camera_p, float brightness); + +private: + video::SMaterial m_material; + core::aabbox3d m_box; + float m_cloud_y; + float m_brightness; + u32 m_seed; + v2f m_camera_pos; + float m_time; +}; + + + +#endif + diff --git a/src/game.cpp b/src/game.cpp index 9054f00c..6f0760ee 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "guiFurnaceMenu.h" #include "materials.h" #include "config.h" +#include "clouds.h" /* Setting this to 1 enables a special camera mode that forces @@ -602,6 +603,13 @@ void the_game( const s32 hotbar_itemcount = 8; const s32 hotbar_imagesize = 36; + // The color of the sky + + //video::SColor skycolor = video::SColor(255,90,140,200); + //video::SColor skycolor = video::SColor(255,166,202,244); + //video::SColor skycolor = video::SColor(255,120,185,244); + video::SColor skycolor = video::SColor(255,140,186,250); + /* Draw "Loading" screen */ @@ -737,11 +745,6 @@ void the_game( return; } - //video::SColor skycolor = video::SColor(255,90,140,200); - //video::SColor skycolor = video::SColor(255,166,202,244); - //video::SColor skycolor = video::SColor(255,120,185,244); - video::SColor skycolor = video::SColor(255,140,186,250); - camera->setFOV(FOV_ANGLE); // Just so big a value that everything rendered is visible @@ -750,6 +753,16 @@ void the_game( f32 camera_yaw = 0; // "right/left" f32 camera_pitch = 0; // "up/down" + /* + Clouds + */ + + float cloud_height = BS*100; + //float cloud_height = BS*55; + //float cloud_height = BS*20; + Clouds *clouds = new Clouds(smgr->getRootSceneNode(), smgr, -1, + cloud_height, 0); + /* Move into game */ @@ -1209,7 +1222,7 @@ void the_game( // Get player position v3f player_position = client.getPlayerPosition(); - + //TimeTaker //timer2("//timer2"); /* @@ -1667,15 +1680,19 @@ void the_game( skycolor.getGreen() * l / 255, skycolor.getBlue() * l / 255); + /* + Update coulds + */ + clouds->step(dtime); + clouds->update(v2f(player_position.X, player_position.Z), (float)l/255.0); + /* Fog */ if(g_settings.getBool("enable_fog") == true) { - //f32 range = draw_control.wanted_range * BS + MAP_BLOCKSIZE/2*BS; - f32 range = draw_control.wanted_range * BS + 0.8*MAP_BLOCKSIZE*BS; - //f32 range = draw_control.wanted_range * BS + 0.0*MAP_BLOCKSIZE*BS; + f32 range = draw_control.wanted_range*BS + MAP_BLOCKSIZE*BS*1.5; if(draw_control.range_all) range = 100000*BS;