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

Overhauled heightfield loading, and used double for log calcs

Browse Source
This commit is contained in:
rdb 2008-10-30 11:02:15 +00:00
parent 05dbe116e4
commit 6bd9856ff2
1 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
panda/src/grutil/geoMipTerrain.I
View File

@ -258,11 +258,11 @@ set_block_size(unsigned short newbs) {
_block_size = newbs + 1; _block_size = newbs + 1;
} else { } else {
_block_size = (unsigned short) pow(2.0, _block_size = (unsigned short) pow(2.0,
floor(log(float(newbs)) / log(2.0) + 0.5)); floor(log((double) newbs) / log(2.0) + 0.5));
} }
} }
} }
_max_level = (unsigned short) (log(float(_block_size)) / log(2.0)); _max_level = (unsigned short) (log((double) _block_size) / log(2.0));
_is_dirty = true; _is_dirty = true;
} }
@ -392,7 +392,7 @@ lod_decide(unsigned short mx, unsigned short my) {
float d; float d;
if (_use_near_far) { if (_use_near_far) {
d = sqrt(pow(_focal_point.get_x(_root) - cx, 2) + d = sqrt(pow(_focal_point.get_x(_root) - cx, 2) +
pow(_focal_point.get_y(_root) - cy, 2)); pow(_focal_point.get_y(_root) - cy, 2));
if (d < _near) { if (d < _near) {
return 0; return 0;
} else if (d > _far) { } else if (d > _far) {
@ -422,45 +422,55 @@ lod_decide(unsigned short mx, unsigned short my) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE bool GeoMipTerrain:: INLINE bool GeoMipTerrain::
set_heightfield(const Filename &filename, PNMFileType *ftype) { set_heightfield(const Filename &filename, PNMFileType *ftype) {
PNMImage image; // First, we need to load the header to determine the size and format.
if (image.read(filename, ftype)) { PNMImageHeader imgheader;
_is_dirty = true; if (imgheader.read_header(filename, ftype)) {
_heightfield = PNMImage( // Copy over the header to the heightfield image.
max(3, (int) pow(2.0, ceil(log(float(max(2, image.get_x_size() - 1))) _heightfield.copy_header_from(imgheader);
/ log(2.0))) + 1),
max(3, (int) pow(2.0, ceil(log(float(max(2, image.get_y_size() - 1))) if(!is_power_of_two(imgheader.get_x_size() - 1) || !is_power_of_two(imgheader.get_y_size() - 1)) {
/ log(2.0))) + 1)); // Calculate the nearest power-of-two-plus-one size.
// Make sure not to apply gaussian when it's already the right size unsigned int reqx, reqy;
if (_heightfield.get_x_size() == image.get_x_size() && reqx = max(3, (int) pow(2.0, ceil(log((double) max(2, imgheader.get_x_size() - 1)) / log(2.0))) + 1);
_heightfield.get_y_size() == image.get_y_size()) { reqy = max(3, (int) pow(2.0, ceil(log((double) max(2, imgheader.get_y_size() - 1)) / log(2.0))) + 1);
_heightfield.copy_from(image);
} else { // If it's not a valid size, tell PNMImage to resize it.
_heightfield.gaussian_filter_from(1.0, image); if (reqx != imgheader.get_x_size() || reqy != imgheader.get_y_size()) {
grutil_cat.warning() << "Rescaling heightfield image " << filename << " to "
<< reqx << " by " << reqy << " pixels\n";
_heightfield.set_read_size(reqx, reqy);
}
} }
// Read the real image now
if (!_heightfield.read(filename, ftype)) {
_heightfield.clear_read_size();
grutil_cat.error() << "Failed to read heightfield image " << filename << "!\n";
return false;
}
_is_dirty = true;
_xsize = _heightfield.get_x_size(); _xsize = _heightfield.get_x_size();
_ysize = _heightfield.get_y_size(); _ysize = _heightfield.get_y_size();
return true; return true;
} else {
grutil_cat.error() << "Failed to load heightfield image " << filename << "!\n";
} }
return false; return false;
} }
INLINE bool GeoMipTerrain:: INLINE bool GeoMipTerrain::
set_heightfield(const PNMImage &image) { set_heightfield(const PNMImage &image) {
_heightfield = PNMImage( // Before we apply anything, validate the size.
max(3, (int) pow(2.0, ceil(log(float(max(2, image.get_x_size() - 1))) if(is_power_of_two(image.get_x_size() - 1) && is_power_of_two(image.get_y_size() - 1)) {
/ log(2.0))) + 1), _heightfield = image;
max(3, (int) pow(2.0, ceil(log(float(max(2, image.get_y_size() - 1))) _is_dirty = true;
/ log(2.0))) + 1)); _xsize = _heightfield.get_x_size();
// Make sure not to apply gaussian when it's already the right size _ysize = _heightfield.get_y_size();
if (_heightfield.get_x_size() == image.get_x_size() && return true;
_heightfield.get_y_size() == image.get_y_size()) {
_heightfield.copy_from(image);
} else { } else {
_heightfield.gaussian_filter_from(1.0, image); grutil_cat.error() << "Specified image does not have a power-of-two-plus-one size!\n";
} }
_is_dirty = true; return false;
_xsize = _heightfield.get_x_size();
_ysize = _heightfield.get_y_size();
return true;
} }
INLINE bool GeoMipTerrain:: INLINE bool GeoMipTerrain::
set_heightfield(const string &path) { set_heightfield(const string &path) {
@ -634,9 +644,9 @@ f_part(double i) {
INLINE int GeoMipTerrain:: INLINE int GeoMipTerrain::
sfav(int n, int powlevel, int mypowlevel) { sfav(int n, int powlevel, int mypowlevel) {
double t = n - 1; double t = n - 1;
t /= float(pow(2.0, powlevel - mypowlevel)); t /= pow(2.0, powlevel - mypowlevel);
t = double(int(t > 0.0 ? t + 0.5 : t - 0.5)); t = double(int(t > 0.0 ? t + 0.5 : t - 0.5));
t *= float(pow(2.0, powlevel - mypowlevel)); t *= pow(2.0, powlevel - mypowlevel);
return int(t); return int(t);
} }