0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimize again local_light prototype.

Browse source 
Only use it for hexes in ToD areas (or adjacent to).

This means no memory increase for map without ToD areas.
This commit is contained in:
Ali El Gariani 2010-07-20 19:46:13 +00:00
parent 7e53c42340
commit 9c18ac4d3e
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/display.cpp
View file

@ -697,7 +697,8 @@ std::vector<surface> display::get_terrain_images(const map_location &loc,
std::string color_mod;
bool use_lightmap = false;
if(game_config::local_light){
bool use_local_light = game_config::local_light;
if(use_local_light){
const time_of_day& tod = get_time_of_day(loc);
map_location adjs[6];
@ -737,12 +738,20 @@ std::vector<surface> display::get_terrain_images(const map_location &loc,
<< light_trans.str()
<< ")"; // L
} else {
// simply color it
mod << "~CS("
<< tod.red << ","
<< tod.green << ","
<< tod.blue
<< ")"; // CS
// no light map needed, but still need to color the hex
const time_of_day& global_tod =
get_time_of_day(map_location::null_location);
if(tod.red == global_tod.red && tod.green == global_tod.green && tod.blue == global_tod.blue) {
// It's the same as global ToD, don't use local light
use_local_light = false;
} else if (tod.red != 0 && tod.green != 0 && tod.blue != 0) {
// simply color it if needed
mod << "~CS("
<< tod.red << ","
<< tod.green << ","
<< tod.blue
<< ")"; // CS
}
}
color_mod = mod.str();
}
@ -766,9 +775,11 @@ std::vector<surface> display::get_terrain_images(const map_location &loc,
surface surf;
if(!game_config::local_light) {
if(!use_local_light) {
const bool off_map = (image.get_filename() == off_map_name);
surf = image::get_image(image, off_map ? image::UNMASKED : image_type);
} else if(color_mod.empty()) {
surf = image::get_image(image, image::UNMASKED);
} else {
image::locator colored_image(
image.get_filename(),