oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-01 17:38:41 +00:00
Code Wiki Activity

Merge branch 'master' into sapier_experimental

Browse source
This commit is contained in:
sapier 2012-02-07 20:52:20 +01:00
commit 61ae136431
3 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/defaultsettings.cpp
View file

@ -64,8 +64,9 @@ void set_default_settings(Settings *settings)
settings->setDefault("wanted_fps", "30"); settings->setDefault("wanted_fps", "30");
settings->setDefault("fps_max", "60"); settings->setDefault("fps_max", "60");
settings->setDefault("viewing_range_nodes_max", "300"); // A bit more than the server will send around the player, to make fog blend well
settings->setDefault("viewing_range_nodes_min", "15"); settings->setDefault("viewing_range_nodes_min", "35");
settings->setDefault("viewing_range_nodes_max", "128");
settings->setDefault("screenW", "800"); settings->setDefault("screenW", "800");
settings->setDefault("screenH", "600"); settings->setDefault("screenH", "600");
settings->setDefault("address", ""); settings->setDefault("address", "");

31
src/game.cpp
View file

@ -438,7 +438,7 @@ void update_skybox(video::IVideoDriver* driver, ITextureSource *tsrc,
if(g_settings->getBool("enable_farmesh")) if(g_settings->getBool("enable_farmesh"))
return;*/ return;*/
if(brightness >= 0.5) if(brightness >= 0.7)
{ {
skybox = smgr->addSkyBoxSceneNode( skybox = smgr->addSkyBoxSceneNode(
tsrc->getTextureRaw("skybox2.png"), tsrc->getTextureRaw("skybox2.png"),
@ -1972,14 +1972,21 @@ void the_game(
u32 daynight_ratio = client.getDayNightRatio(); u32 daynight_ratio = client.getDayNightRatio();
u8 light8 = decode_light((daynight_ratio * LIGHT_SUN) / 1000); u8 light8 = decode_light((daynight_ratio * LIGHT_SUN) / 1000);
brightness = (float)light8/255.0; brightness = (float)light8/255.0;
video::SColor bgcolor = video::SColor( // Make night look good
255, brightness = brightness * 1.15 - 0.15;
bgcolor_bright.getRed() * brightness, video::SColor bgcolor;
bgcolor_bright.getGreen() * brightness, if(brightness >= 0.2 && brightness < 0.7)
bgcolor_bright.getBlue() * brightness); bgcolor = video::SColor(
/*skycolor.getRed() * brightness, 255,
skycolor.getGreen() * brightness, bgcolor_bright.getRed() * brightness,
skycolor.getBlue() * brightness);*/ bgcolor_bright.getGreen() * brightness*0.7,
bgcolor_bright.getBlue() * brightness*0.5);
else
bgcolor = video::SColor(
255,
bgcolor_bright.getRed() * brightness,
bgcolor_bright.getGreen() * brightness,
bgcolor_bright.getBlue() * brightness);
/* /*
Update skybox Update skybox
@ -1994,7 +2001,7 @@ void the_game(
{ {
clouds->step(dtime); clouds->step(dtime);
clouds->update(v2f(player_position.X, player_position.Z), clouds->update(v2f(player_position.X, player_position.Z),
0.05+brightness*0.95); brightness);
} }
/* /*
@ -2010,7 +2017,7 @@ void the_game(
farmesh->step(dtime); farmesh->step(dtime);
farmesh->update(v2f(player_position.X, player_position.Z), farmesh->update(v2f(player_position.X, player_position.Z),
0.05+brightness*0.95, farmesh_range); brightness, farmesh_range);
} }
// Store brightness value // Store brightness value
@ -2029,7 +2036,7 @@ void the_game(
} }
else else
{ {
range = draw_control.wanted_range*BS + MAP_BLOCKSIZE*BS*1.5; range = draw_control.wanted_range*BS + 0.0*MAP_BLOCKSIZE*BS;
range *= 0.9; range *= 0.9;
if(draw_control.range_all) if(draw_control.range_all)
range = 100000*BS; range = 100000*BS;

2
src/utility.cpp
View file

@ -208,7 +208,7 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
return true; return true;
// If block is far away, it's not in sight // If block is far away, it's not in sight
if(d > range * BS) if(d > range)
return false; return false;
// Maximum radius of a block // Maximum radius of a block