TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix crash with flaming cannonballs

Browse Source
This commit is contained in:
David Rose 2005-10-07 00:04:38 +00:00
parent 7683032977
commit d2d94fd2f5
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
panda/src/grutil/multitexReducer.cxx
View File

@ -637,37 +637,47 @@ choose_texture_size(int &x_size, int &y_size,
x_size = model_tex->get_x_size(); x_size = model_tex->get_x_size();
y_size = model_tex->get_y_size(); y_size = model_tex->get_y_size();
// But we might be looking at just a subset of that texture (scale < // But we might be looking at just a subset of that texture (|scale| <
// 1) or a superset of the texture (scale > 1). In this case, we // 1) or a superset of the texture (|scale| > 1). In this case, we
// should adjust the pixel size accordingly, although we have to // should adjust the pixel size accordingly, although we have to
// keep it to a power of 2. // keep it to a power of 2.
LVecBase3f inherited_scale = model_stage._tex_mat->get_scale(); LVecBase3f inherited_scale = model_stage._tex_mat->get_scale();
float u_scale = inherited_scale[0] * uv_scale[0]; float u_scale = cabs(inherited_scale[0]) * uv_scale[0];
if (u_scale != 0.0f) { if (u_scale != 0.0f) {
while (u_scale >= 2.0f) { while (u_scale >= 2.0f) {
x_size *= 2; x_size *= 2;
u_scale *= 0.5f; u_scale *= 0.5f;
} }
while (u_scale <= 0.5f) { while (u_scale <= 0.5f && x_size > 0) {
x_size /= 2; x_size /= 2;
u_scale *= 2.0f; u_scale *= 2.0f;
} }
} }
float v_scale = inherited_scale[1] * uv_scale[1]; float v_scale = cabs(inherited_scale[1]) * uv_scale[1];
if (v_scale != 0.0f) { if (v_scale != 0.0f) {
while (v_scale >= 2.0f) { while (v_scale >= 2.0f) {
y_size *= 2; y_size *= 2;
v_scale *= 0.5f; v_scale *= 0.5f;
} }
while (v_scale <= 0.5f) { while (v_scale <= 0.5f && y_size > 0) {
y_size /= 2; y_size /= 2;
v_scale *= 2.0f; v_scale *= 2.0f;
} }
} }
if (x_size == 0 || y_size == 0) {
grutil_cat.warning()
<< "Texture size " << model_tex->get_x_size() << " "
<< model_tex->get_y_size() << " with scale "
<< model_stage._tex_mat->get_scale() << ", reduced to size "
<< x_size << " " << y_size << "; constraining to 1 1.\n";
x_size = 1;
y_size = 1;
}
// Constrain the x_size and y_size to the max_texture_dimension. // Constrain the x_size and y_size to the max_texture_dimension.
if (max_texture_dimension > 0) { if (max_texture_dimension > 0) {
x_size = min(x_size, (int)max_texture_dimension); x_size = min(x_size, (int)max_texture_dimension);