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

Surface: add area getter

Browse source
This commit is contained in:
Charles Dang 2024-09-02 18:47:14 -04:00
parent de776a4065
commit 651779007a
4 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/image_modifications.cpp
View file

@ -300,7 +300,7 @@ void adjust_alpha_modification::operator()(surface& src) const
surface_lock lock(src);
uint32_t* cur = lock.pixels();
uint32_t* const end = cur + src->w * src->h;
uint32_t* const end = cur + src.area();
uint32_t* const beg = cur;
while(cur != end) {
@ -334,7 +334,7 @@ void adjust_channels_modification::operator()(surface& src) const
surface_lock lock(src);
uint32_t* cur = lock.pixels();
uint32_t* const end = cur + src->w * src->h;
uint32_t* const end = cur + src.area();
uint32_t* const beg = cur;
while(cur != end) {
@ -493,7 +493,7 @@ void o_modification::operator()(surface& src) const
surface_lock lock(src);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + src->w * src->h;
uint32_t* end = beg + src.area();
while(beg != end) {
uint8_t alpha = (*beg) >> 24;

6
src/sdl/surface.hpp
View file

@ -86,6 +86,12 @@ public:
*/
surface clone() const;
/** Total area of the surface in square pixels. */
int area() const
{
return surface_ ? surface_->w * surface_->h : 0;
}
operator SDL_Surface*() const { return surface_; }
SDL_Surface* get() const { return surface_; }

30
src/sdl/utils.cpp
View file

@ -403,7 +403,7 @@ void adjust_surface_color(surface& nsurf, int red, int green, int blue)
if(nsurf && (red != 0 || green != 0 || blue != 0)) {
surface_lock lock(nsurf);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w*nsurf->h;
uint32_t* end = beg + nsurf.area();
while(beg != end) {
uint8_t alpha = (*beg) >> 24;
@ -431,7 +431,7 @@ void greyscale_image(surface& nsurf)
if(nsurf) {
surface_lock lock(nsurf);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w*nsurf->h;
uint32_t* end = beg + nsurf.area();
while(beg != end) {
uint8_t alpha = (*beg) >> 24;
@ -465,7 +465,7 @@ void monochrome_image(surface& nsurf, const int threshold)
if(nsurf) {
surface_lock lock(nsurf);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w*nsurf->h;
uint32_t* end = beg + nsurf.area();
while(beg != end) {
uint8_t alpha = (*beg) >> 24;
@ -494,7 +494,7 @@ void sepia_image(surface& nsurf)
if(nsurf) {
surface_lock lock(nsurf);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w*nsurf->h;
uint32_t* end = beg + nsurf.area();
while(beg != end) {
uint8_t alpha = (*beg) >> 24;
@ -525,7 +525,7 @@ void negative_image(surface& nsurf, const int thresholdR, const int thresholdG,
if(nsurf) {
surface_lock lock(nsurf);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w*nsurf->h;
uint32_t* end = beg + nsurf.area();
while(beg != end) {
uint8_t alpha = (*beg) >> 24;
@ -557,7 +557,7 @@ void alpha_to_greyscale(surface& nsurf)
if(nsurf) {
surface_lock lock(nsurf);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w*nsurf->h;
uint32_t* end = beg + nsurf.area();
while(beg != end) {
uint8_t alpha = (*beg) >> 24;
@ -574,7 +574,7 @@ void wipe_alpha(surface& nsurf)
if(nsurf) {
surface_lock lock(nsurf);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w*nsurf->h;
uint32_t* end = beg + nsurf.area();
while(beg != end) {
@ -621,7 +621,7 @@ void swap_channels_image(surface& nsurf, channel r, channel g, channel b, channe
if(nsurf) {
surface_lock lock(nsurf);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w*nsurf->h;
uint32_t* end = beg + nsurf.area();
while(beg != end) {
uint8_t alpha = (*beg) >> 24;
@ -719,7 +719,7 @@ void recolor_image(surface& nsurf, const color_range_map& map_rgb)
surface_lock lock(nsurf);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w*nsurf->h;
uint32_t* end = beg + nsurf.area();
while(beg != end) {
uint8_t alpha = (*beg) >> 24;
@ -744,7 +744,7 @@ void brighten_image(surface& nsurf, int32_t amount)
if(nsurf) {
surface_lock lock(nsurf);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w*nsurf->h;
uint32_t* end = beg + nsurf.area();
if (amount < 0) amount = 0;
while(beg != end) {
@ -782,7 +782,7 @@ void adjust_surface_alpha_add(surface& nsurf, int amount)
if(nsurf) {
surface_lock lock(nsurf);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w*nsurf->h;
uint32_t* end = beg + nsurf.area();
while(beg != end) {
uint8_t alpha = (*beg) >> 24;
@ -832,7 +832,7 @@ void mask_surface(surface& nsurf, const surface& nmask, bool* empty_result, cons
const_surface_lock mlock(nmask);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w*nsurf->h;
uint32_t* end = beg + nsurf.area();
const uint32_t* mbeg = mlock.pixels();
const uint32_t* mend = mbeg + nmask->w*nmask->h;
@ -924,9 +924,9 @@ void light_surface(surface& nsurf, const surface &lightmap)
const_surface_lock llock(lightmap);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w * nsurf->h;
uint32_t* end = beg + nsurf.area();
const uint32_t* lbeg = llock.pixels();
const uint32_t* lend = lbeg + lightmap->w * lightmap->h;
const uint32_t* lend = lbeg + lightmap.area();
while(beg != end && lbeg != lend) {
uint8_t alpha = (*beg) >> 24;
@ -1276,7 +1276,7 @@ void blend_surface(surface& nsurf, const double amount, const color_t color)
if(nsurf) {
surface_lock lock(nsurf);
uint32_t* beg = lock.pixels();
uint32_t* end = beg + nsurf->w*nsurf->h;
uint32_t* end = beg + nsurf.area();
uint16_t ratio = amount * 256;
const uint16_t red = ratio * color.r;

4
src/utils/spritesheet_generator.cpp
View file

@ -135,10 +135,10 @@ void build_sheet_from_images(const std::vector<fs::path>& file_paths)
// Sort the surfaces by area, largest last.
// TODO: should we use plain sort? Output sheet seems ever so slightly smaller when sort is not stable.
std::stable_sort(elements.begin(), elements.end(),
[](const auto& lhs, const auto& rhs) { return lhs.surf->w * lhs.surf->h < rhs.surf->w * rhs.surf->h; });
[](const auto& lhs, const auto& rhs) { return lhs.surf.area() < rhs.surf.area(); });
const unsigned total_area = std::accumulate(elements.begin(), elements.end(), 0,
[](const int val, const auto& s) { return val + (s.surf->w * s.surf->h); });
[](const int val, const auto& s) { return val + s.surf.area(); });
const unsigned side_length = static_cast<unsigned>(std::sqrt(total_area) * 1.3);