TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better solution to subzero clamping problem

Browse Source
This commit is contained in:
rdb 2010-10-31 13:32:35 +00:00
parent 44bf0582cf
commit 3a6e008f72
1 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
panda/src/pnmimage/pnmImage.cxx
View File

@ -1464,25 +1464,28 @@ operator += (const PNMImage &other) {
void PNMImage:: void PNMImage::
operator += (const Colord &other) { operator += (const Colord &other) {
size_t array_size = _x_size * _y_size; size_t array_size = _x_size * _y_size;
xel addxel (to_val(other.get_x()), to_val(other.get_y()), to_val(other.get_z())); // Note: don't use to_val here because it clamps values below 0
xelval addalpha = to_val(other.get_w()); int add_r = (int)(other.get_x() * get_maxval() + 0.5);
int add_g = (int)(other.get_y() * get_maxval() + 0.5);
int add_b = (int)(other.get_z() * get_maxval() + 0.5);
int add_a = (int)(other.get_w() * get_maxval() + 0.5);
if (_array != NULL && _alpha != NULL) { if (_array != NULL && _alpha != NULL) {
for (size_t i = 0; i < array_size; ++i) { for (size_t i = 0; i < array_size; ++i) {
_array[i].r = clamp_val(_array[i].r + addxel.r); _array[i].r = clamp_val(_array[i].r + add_r);
_array[i].g = clamp_val(_array[i].g + addxel.g); _array[i].g = clamp_val(_array[i].g + add_g);
_array[i].b = clamp_val(_array[i].b + addxel.b); _array[i].b = clamp_val(_array[i].b + add_b);
_alpha[i] = clamp_val(_alpha[i] + addalpha); _alpha[i] = clamp_val(_alpha[i] + add_a);
} }
} else if (_array != NULL) { } else if (_array != NULL) {
for (size_t i = 0; i < array_size; ++i) { for (size_t i = 0; i < array_size; ++i) {
_array[i].r = clamp_val(_array[i].r + addxel.r); _array[i].r = clamp_val(_array[i].r + add_r);
_array[i].g = clamp_val(_array[i].g + addxel.g); _array[i].g = clamp_val(_array[i].g + add_g);
_array[i].b = clamp_val(_array[i].b + addxel.b); _array[i].b = clamp_val(_array[i].b + add_b);
} }
} else if (_alpha != NULL) { } else if (_alpha != NULL) {
for (size_t i = 0; i < array_size; ++i) { for (size_t i = 0; i < array_size; ++i) {
_alpha[i] = clamp_val(_alpha[i] + addalpha); _alpha[i] = clamp_val(_alpha[i] + add_a);
} }
} }
} }
@ -1529,28 +1532,7 @@ operator -= (const PNMImage &other) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void PNMImage:: void PNMImage::
operator -= (const Colord &other) { operator -= (const Colord &other) {
size_t array_size = _x_size * _y_size; (*this) += (-other);
xel subxel (to_val(other.get_x()), to_val(other.get_y()), to_val(other.get_z()));
xelval subalpha = to_val(other.get_w());
if (_array != NULL && _alpha != NULL) {
for (size_t i = 0; i < array_size; ++i) {
_array[i].r = clamp_val(_array[i].r - subxel.r);
_array[i].g = clamp_val(_array[i].g - subxel.g);
_array[i].b = clamp_val(_array[i].b - subxel.b);
_alpha[i] = clamp_val(_alpha[i] + subalpha);
}
} else if (_array != NULL) {
for (size_t i = 0; i < array_size; ++i) {
_array[i].r = clamp_val(_array[i].r - subxel.r);
_array[i].g = clamp_val(_array[i].g - subxel.g);
_array[i].b = clamp_val(_array[i].b - subxel.b);
}
} else if (_alpha != NULL) {
for (size_t i = 0; i < array_size; ++i) {
_alpha[i] = clamp_val(_alpha[i] - subalpha);
}
}
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////