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

Fix hex-cut images in :layers

Browse source 
This remove the need of ~LOC (which was broken some time ago) by using
~CROP~MASK instead.
This commit is contained in:
Ali El Gariani 2011-12-11 15:47:06 +00:00
parent df233cea55
commit 71f833a06c
1 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/menu_events.cpp
View file

@ -3246,15 +3246,45 @@ void console_handler::do_layers() {
const map_location& loc_cut = img.get_loc();
std::ostringstream str;
int tz = image::tile_size;
SDL_Rect r = create_rect(0,0,tz,tz);
surface surf = image::get_image(img.get_filename());
// calculate which part of the image the terrain engine uses
if(loc_cut.valid()) {
// copied from image.cpp : load_image_sub_file()
r = create_rect(
((tz*3) / 4) * loc_cut.x
, tz * loc_cut.y + (tz / 2) * (loc_cut.x % 2)
, tz, tz);
if(img.get_center_x() >= 0 && img.get_center_y()>= 0){
r.x += surf->w/2 - img.get_center_x();
r.y += surf->h/2 - img.get_center_y();
}
}
str << (ri->is_background() ? "B ": "F ") << order
<< COLUMN_SEPARATOR
<< IMAGE_PREFIX << "terrain/foreground.png"
<< "~BLIT("
<< name << "~LOC("
<< loc_cut.x << "," << loc_cut.y << ","
<< img.get_center_x() << "," << img.get_center_y() << ")"
<< ")"
<< COLUMN_SEPARATOR
<< IMAGE_PREFIX << "terrain/foreground.png";
// cut and mask the image
// ~CROP and ~BLIT have limitations, we do some math to avoid them
SDL_Rect r2 = intersect_rects(r, create_rect(0,0,surf->w,surf->h));
if(r2.w > 0 && r2.h > 0) {
str << "~BLIT("
<< name << "~CROP("
<< r2.x << "," << r2.y << ","
<< r2.w << "," << r2.h
<< ")"
<< "," << r2.x-r.x << "," << r2.y-r.y
<< ")"
<< "~MASK(" << "terrain/alphamask.png" << ")";
}
str << COLUMN_SEPARATOR
<< IMAGE_PREFIX << name << "~SCALE(72,72)"
<< IMG_TEXT_SEPARATOR << name
<< COLUMN_SEPARATOR << img.get_loc()