RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix freeze when invalid heightfield is given

This commit is contained in:
rdb 2008-10-12 09:56:53 +00:00
parent bc2dcf0410
commit 83237997b5
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/grutil/geoMipTerrain.cxx
View File

@ -359,6 +359,10 @@ make_slope_image() {
////////////////////////////////////////////////////////////////////
void GeoMipTerrain::
generate() {
if (_xsize < 3 || _ysize < 3) {
grutil_cat.error() << "No valid heightfield image has been set!\n";
return;
}
calc_levels();
_root.node()->remove_all_children();
_blocks.clear();
@ -400,6 +404,10 @@ generate() {
////////////////////////////////////////////////////////////////////
bool GeoMipTerrain::
update() {
if (_xsize < 3 || _ysize < 3) {
grutil_cat.error() << "No valid heightfield image has been set!\n";
return false;
}
if (_is_dirty) {
generate();
return true;
@ -488,7 +496,7 @@ root_flattened() {
if (total != _root.node()->get_num_children()) {
grutil_cat.error() << "GeoMipTerrain: root node unexpectedly mangled: " << total << " vs " << (_root.node()->get_num_children()) << "\n";
return true;
}
}
// The default.
return false;
@ -530,6 +538,7 @@ auto_flatten() {
////////////////////////////////////////////////////////////////////
void GeoMipTerrain::
calc_levels() {
nassertv(_xsize >= 3 && _ysize >= 3);
_levels.clear();
for (unsigned int mx = 0; mx < (_xsize - 1) / _block_size; mx++) {
pvector<unsigned short> tvector; //create temporary row