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

Added a new level of brightened images,

Browse source 
image::SEMI_BRIGHTENED, which is a bit less brightened than

image::BRIGHTENED. It is currently used in the editor when marking
hexes.
This commit is contained in:
Kristoffer Erlandsson 2004-05-28 17:45:49 +00:00
parent bea0970cea
commit b054ca433e
4 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/display.cpp
View file

@ -1360,7 +1360,7 @@ void display::draw_tile(int x, int y, SDL_Surface* unit_image, double alpha, Uin
image_type = image::BRIGHTENED;
}
else if (highlighted_locations_.find(loc) != highlighted_locations_.end()) {
image_type = image::BRIGHTENED;
image_type = image::SEMI_BRIGHTENED;
}
scoped_sdl_surface surface(getTerrain(terrain,image_type,x,y));

3
src/display.hpp
View file

@ -316,7 +316,8 @@ public:
void rebuild_terrain(const gamemap::location &location);
//Add a location to highlight. Note that this has nothing to do with
//selecting hexes, it is pure highlighting.
//selecting hexes, it is pure highlighting. These hexes will be
//highlighted slightly darker than the currently selected hex.
void add_highlighted_loc(const gamemap::location &hex);
void clear_highlighted_locs();

32
src/image.cpp
View file

@ -19,7 +19,8 @@ typedef std::map<gamemap::TERRAIN,SDL_Surface*> mini_terrain_cache_map;
mini_terrain_cache_map mini_terrain_cache;
typedef std::map<image::locator,SDL_Surface*> image_map;
image_map images_,scaledImages_,unmaskedImages_,greyedImages_,brightenedImages_;
image_map images_,scaledImages_,unmaskedImages_,greyedImages_;
image_map brightenedImages_,semiBrightenedImages_;
std::map<SDL_Surface*,SDL_Surface*> reversedImages_;
@ -49,22 +50,35 @@ void clear_surfaces(Map& surfaces)
clear_surfaces_internal(surfaces,surfaces.begin(),surfaces.end());
}
enum TINT { GREY_IMAGE, BRIGHTEN_IMAGE };
enum TINT { GREY_IMAGE, BRIGHTEN_IMAGE, SEMI_BRIGHTEN_IMAGE };
SDL_Surface* get_tinted(const image::locator& i_locator, TINT tint)
{
image_map& images = tint == GREY_IMAGE ? greyedImages_ : brightenedImages_;
image_map* images;
if (tint == GREY_IMAGE) {
images = &greyedImages_;
} else if (tint == BRIGHTEN_IMAGE) {
images = &brightenedImages_;
} else {
images = &semiBrightenedImages_;
}
const image_map::iterator itor = images.find(i_locator);
const image_map::iterator itor = images->find(i_locator);
if(itor != images.end()) {
if(itor != images->end()) {
return itor->second;
}
scoped_sdl_surface base(image::get_image(i_locator,image::SCALED));
SDL_Surface* const surface = (tint == GREY_IMAGE ? greyscale_image(base) : brighten_image(base,1.5));
images.insert(std::pair<image::locator,SDL_Surface*>(i_locator,surface));
SDL_Surface* surface;
if (tint == GREY_IMAGE) {
surface = greyscale_image(base);
} else if (tint == BRIGHTEN_IMAGE) {
surface = brighten_image(base,1.5);
} else {
surface = brighten_image(base, 1.25);
}
images->insert(std::pair<image::locator,SDL_Surface*>(i_locator,surface));
return surface;
}
@ -247,6 +261,8 @@ SDL_Surface* get_image(const image::locator& i_locator, TYPE type, COLOUR_ADJUST
result = get_tinted(i_locator,GREY_IMAGE);
} else if(type == BRIGHTENED) {
result = get_tinted(i_locator,BRIGHTEN_IMAGE);
} else if(type == SEMI_BRIGHTENED) {
result = get_tinted(i_locator,SEMI_BRIGHTEN_IMAGE);
} else {
image_map::iterator i;

2
src/image.hpp
View file

@ -73,7 +73,7 @@ namespace image {
///scaled images.
void set_zoom(int zoom);
enum TYPE { UNSCALED, SCALED, UNMASKED, GREYED, BRIGHTENED };
enum TYPE { UNSCALED, SCALED, UNMASKED, GREYED, BRIGHTENED, SEMI_BRIGHTENED };
enum COLOUR_ADJUSTMENT { ADJUST_COLOUR, NO_ADJUST_COLOUR };