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

Optimize ToD update by skipping an useless step in lightmap application

Browse source
This commit is contained in:
Ali El Gariani 2011-12-16 03:39:04 +00:00
parent 1e12b3b999
commit 62d2e838c6
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/sdl_utils.cpp
View file

@ -987,29 +987,28 @@ surface light_surface(const surface &surf, const surface &lightmap, bool optimiz
}
surface nsurf = make_neutral_surface(surf);
surface nlightmap = make_neutral_surface(lightmap);
if(nsurf == NULL || nlightmap == NULL) {
if(nsurf == NULL) {
std::cerr << "could not make neutral surface...\n";
return NULL;
}
if (nsurf->w != nlightmap->w) {
if (nsurf->w != lightmap->w) {
// we don't support efficiently different width.
// (different height is not a real problem)
// This function is used on all hexes and usually only for that
// so better keep it simple and efficient for the normal case
std::cerr << "Detected an image with bad dimensions :" << nsurf->w << "x" << nsurf->h << "\n";
std::cerr << "It will not be lighted, please use :"<< nlightmap->w << "x" << nlightmap->h << "\n";
std::cerr << "It will not be lighted, please use :"<< lightmap->w << "x" << lightmap->h << "\n";
return nsurf;
}
{
surface_lock lock(nsurf);
const_surface_lock llock(nlightmap);
const_surface_lock llock(lightmap);
Uint32* beg = lock.pixels();
Uint32* end = beg + nsurf->w * nsurf->h;
const Uint32* lbeg = llock.pixels();
const Uint32* lend = lbeg + nlightmap->w * nlightmap->h;
const Uint32* lend = lbeg + lightmap->w * lightmap->h;
while(beg != end && lbeg != lend) {
Uint8 alpha = (*beg) >> 24;

3
src/sdl_utils.hpp
View file

@ -247,7 +247,8 @@ surface submerge_alpha(const surface &surf, int depth, float alpha_base, float a
* @param surf The source surface.
* @param lightmap add/subtract this color to surf
* but RGB values are converted to (X-128)*2
* to cover the full (-256,256) spectrum
* to cover the full (-256,256) spectrum.
* Should already be neutral
* @param optimize Whether the new surface should be RLE encoded.
*/
surface light_surface(const surface &surf, const surface &lightmap, bool optimize=true);