diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-07-23 19:04:37 +0300 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-07-23 19:04:37 +0300 |
commit | 2587bb361cfc96b3a695d1476e39b9c0ecaa6553 (patch) | |
tree | 6e6a35e0ee35883201189df9c545cc44b7a06658 /src/farmesh.cpp | |
parent | 90d793f8f369bf1431d7a915198cd49b98bbe2d7 (diff) | |
parent | 976ec31c1faedc3a34935c3aafd6a868e222d1ad (diff) | |
download | hax-minetest-server-2587bb361cfc96b3a695d1476e39b9c0ecaa6553.tar.gz hax-minetest-server-2587bb361cfc96b3a695d1476e39b9c0ecaa6553.zip |
merged the content type extension and delta
Diffstat (limited to 'src/farmesh.cpp')
-rw-r--r-- | src/farmesh.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/farmesh.cpp b/src/farmesh.cpp index 8f91e3a1a..2cd922434 100644 --- a/src/farmesh.cpp +++ b/src/farmesh.cpp @@ -70,6 +70,7 @@ FarMesh::FarMesh( m_box = core::aabbox3d<f32>(-BS*1000000,-BS*31000,-BS*1000000, BS*1000000,BS*31000,BS*1000000); + trees = g_settings.getBool("farmesh_trees"); } FarMesh::~FarMesh() @@ -313,12 +314,11 @@ void FarMesh::render() } else { - /*// Trees if there are over 0.01 trees per MapNode - if(tree_amount_avg > 0.01) + // Trees if there are over 0.01 trees per MapNode + if(trees && tree_amount_avg > 0.01) c = video::SColor(255,50,128,50); else - c = video::SColor(255,107,134,51);*/ - c = video::SColor(255,107,134,51); + c = video::SColor(255,107,134,51); ground_is_mud = true; } } @@ -351,7 +351,7 @@ void FarMesh::render() video::EVT_STANDARD, scene::EPT_TRIANGLES, video::EIT_16BIT); // Add some trees if appropriate - if(tree_amount_avg >= 0.0065 && steepness < 1.4 + if(trees && tree_amount_avg >= 0.0065 && steepness < 1.4 && ground_is_mud == true) { driver->setMaterial(m_materials[1]); @@ -404,11 +404,11 @@ void FarMesh::step(float dtime) m_time += dtime; } -void FarMesh::update(v2f camera_p, float brightness, s16 render_range) +void FarMesh::update(v2f camera_p, float brightness) { m_camera_pos = camera_p; m_brightness = brightness; - m_render_range = render_range; + m_render_range = g_settings.getS16("farmesh_distance")*10; } |