Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
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
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 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.
+GNU Lesser General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser 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 "farmesh.h"
+
#include "constants.h"
#include "debug.h"
#include "noise.h"
#include "map.h"
#include "client.h"
+#include "tile.h" // ITextureSource
+#include "clientmap.h"
-/*
- Temporarily exposed map generator stuff
- Should only be used for testing
-*/
-extern double base_rock_level_2d(u64 seed, v2s16 p);
-extern double get_mud_add_amount(u64 seed, v2s16 p);
-extern bool get_have_sand(u64 seed, v2s16 p2d);
-extern double tree_amount_2d(u64 seed, v2s16 p);
-
+#include "mapgen.h" // Shouldn't really be done this way
FarMesh::FarMesh(
scene::ISceneNode* parent,
m_seed(seed),
m_camera_pos(0,0),
m_time(0),
- m_client(client)
+ m_client(client),
+ m_render_range(20*MAP_BLOCKSIZE)
{
dstream<<__FUNCTION_NAME<<std::endl;
- video::IVideoDriver* driver = mgr->getVideoDriver();
+ //video::IVideoDriver* driver = mgr->getVideoDriver();
m_materials[0].setFlag(video::EMF_LIGHTING, false);
m_materials[0].setFlag(video::EMF_BACK_FACE_CULLING, true);
m_materials[1].setFlag(video::EMF_BACK_FACE_CULLING, false);
m_materials[1].setFlag(video::EMF_BILINEAR_FILTER, false);
m_materials[1].setFlag(video::EMF_FOG_ENABLE, false);
- m_materials[1].setTexture
- (0, driver->getTexture(getTexturePath("treeprop.png").c_str()));
+ m_materials[1].setTexture(0, client->tsrc()->getTextureRaw("treeprop.png"));
m_materials[1].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
m_materials[1].setFlag(video::EMF_FOG_ENABLE, true);
if(n)
return n->getValue();
HeightPoint hp;
- hp.gh = BS*base_rock_level_2d(seed, p2d);
- hp.ma = BS*get_mud_add_amount(seed, p2d);
- hp.have_sand = get_have_sand(seed, p2d);
+ s16 level = Mapgen::find_ground_level_from_noise(seed, p2d, 3);
+ hp.gh = (level-4)*BS;
+ hp.ma = (4)*BS;
+ /*hp.gh = BS*base_rock_level_2d(seed, p2d);
+ hp.ma = BS*get_mud_add_amount(seed, p2d);*/
+ hp.have_sand = Mapgen::get_have_beach(seed, p2d);
if(hp.gh > BS*WATER_LEVEL)
- hp.tree_amount = tree_amount_2d(seed, p2d);
+ hp.tree_amount = Mapgen::tree_amount_2d(seed, p2d);
else
hp.tree_amount = 0;
// No mud has been added if mud amount is less than 1
if(hp.ma < 1.0*BS)
hp.ma = 0.0;
- hp.gh -= BS*3; // Lower a bit so that it is not that much in the way
+ //hp.gh -= BS*3; // Lower a bit so that it is not that much in the way
g_heights[p2d] = hp;
return hp;
}
//const s16 grid_radius_i = 12;
//const float grid_size = BS*50;
- const s16 grid_radius_i = 20;
+ const s16 grid_radius_i = m_render_range/MAP_BLOCKSIZE;
const float grid_size = BS*MAP_BLOCKSIZE;
const v2f grid_speed(-BS*0, 0);
if(h_avg < WATER_LEVEL*BS && h_max < (WATER_LEVEL+5)*BS)
{
//c = video::SColor(255,59,86,146);
- c = video::SColor(255,82,120,204);
+ //c = video::SColor(255,82,120,204);
+ c = video::SColor(255,74,105,170);
/*// Set to water level
for(u32 i=0; i<4; i++)
video::EVT_STANDARD, scene::EPT_TRIANGLES, video::EIT_16BIT);
// Add some trees if appropriate
- if(tree_amount_avg >= 0.005 && steepness < 1.0
+ if(tree_amount_avg >= 0.0065 && steepness < 1.4
&& ground_is_mud == true)
{
driver->setMaterial(m_materials[1]);
{
video::S3DVertex(p0.X,noise[0],p0.Y,
0,0,0, c, 0,1),
- video::S3DVertex(p0.X,noise[1]+BS*MAP_BLOCKSIZE,p0.Y,
+ video::S3DVertex(p0.X,noise[0]+BS*MAP_BLOCKSIZE,p0.Y,
0,0,0, c, 0,0),
video::S3DVertex(p1.X,noise[2]+BS*MAP_BLOCKSIZE,p1.Y,
0,0,0, c, 1,0),
- video::S3DVertex(p1.X,noise[3],p1.Y,
+ video::S3DVertex(p1.X,noise[2],p1.Y,
0,0,0, c, 1,1),
};
u16 indices[] = {0,1,2,2,3,0};
{
video::S3DVertex vertices[4] =
{
- video::S3DVertex(p1.X,noise[0],p0.Y,
+ video::S3DVertex(p1.X,noise[3],p0.Y,
0,0,0, c, 0,1),
- video::S3DVertex(p1.X,noise[1]+BS*MAP_BLOCKSIZE,p0.Y,
+ video::S3DVertex(p1.X,noise[3]+BS*MAP_BLOCKSIZE,p0.Y,
0,0,0, c, 0,0),
- video::S3DVertex(p0.X,noise[2]+BS*MAP_BLOCKSIZE,p1.Y,
+ video::S3DVertex(p0.X,noise[1]+BS*MAP_BLOCKSIZE,p1.Y,
0,0,0, c, 1,0),
- video::S3DVertex(p0.X,noise[3],p1.Y,
+ video::S3DVertex(p0.X,noise[1],p1.Y,
0,0,0, c, 1,1),
};
u16 indices[] = {0,1,2,2,3,0};
m_time += dtime;
}
-void FarMesh::update(v2f camera_p, float brightness)
+void FarMesh::update(v2f camera_p, float brightness, s16 render_range)
{
m_camera_pos = camera_p;
m_brightness = brightness;
+ m_render_range = render_range;
}