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

Warn if GeoMipTerrain is passed a height field with sRGB color space

Browse Source
This commit is contained in:
rdb 2015-03-31 22:33:11 +02:00
parent 7e2bbda123
commit f8779d7eaf
3 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,24 +455,29 @@ lod_decide(unsigned short mx, unsigned short my) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE bool GeoMipTerrain:: INLINE bool GeoMipTerrain::
set_heightfield(const PNMImage &image) { set_heightfield(const PNMImage &image) {
if (image.get_color_space() == CS_sRGB) {
// Probably a mistaken metadata setting on the file.
grutil_cat.warning()
<< "Heightfield image is specified to have sRGB color space!\n"
"Panda applies gamma correction, which will probably cause "
"it to produce incorrect results.\n";
}
// Before we apply anything, validate the size. // Before we apply anything, validate the size.
if(is_power_of_two(image.get_x_size() - 1) && is_power_of_two(image.get_y_size() - 1)) { if (is_power_of_two(image.get_x_size() - 1) &&
is_power_of_two(image.get_y_size() - 1)) {
_heightfield = image; _heightfield = image;
_is_dirty = true; _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 { } else {
grutil_cat.error() << "Specified image does not have a power-of-two-plus-one size!\n"; grutil_cat.error()
<< "Specified image does not have a power-of-two-plus-one size!\n";
} }
return false; return false;
} }
INLINE bool GeoMipTerrain::
set_heightfield(const string &path) {
return set_heightfield(Filename(path));
}
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: GeoMipTerrain::set_color_map // Function: GeoMipTerrain::set_color_map
// Access: Published // Access: Published

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

@ -55,15 +55,16 @@ generate_block(unsigned short mx,
// Create the format // Create the format
PT(GeomVertexArrayFormat) array = new GeomVertexArrayFormat(); PT(GeomVertexArrayFormat) array = new GeomVertexArrayFormat();
if (_has_color_map) { if (_has_color_map) {
array->add_column(InternalName::make("color"), 4, array->add_column(InternalName::get_color(), 4,
Geom::NT_stdfloat, Geom::C_color); Geom::NT_stdfloat, Geom::C_color);
} }
array->add_column(InternalName::make("vertex"), 3, array->add_column(InternalName::get_vertex(), 3,
Geom::NT_stdfloat, Geom::C_point); Geom::NT_stdfloat, Geom::C_point);
array->add_column(InternalName::make("texcoord"), 2, array->add_column(InternalName::get_texcoord(), 2,
Geom::NT_stdfloat, Geom::C_texcoord); Geom::NT_stdfloat, Geom::C_texcoord);
array->add_column(InternalName::make("normal"), 3, array->add_column(InternalName::get_normal(), 3,
Geom::NT_stdfloat, Geom::C_vector); Geom::NT_stdfloat, Geom::C_vector);
PT(GeomVertexFormat) format = new GeomVertexFormat(); PT(GeomVertexFormat) format = new GeomVertexFormat();
format->add_array(array); format->add_array(array);
@ -73,11 +74,11 @@ generate_block(unsigned short mx,
vdata->unclean_set_num_rows((_block_size + 1) * (_block_size + 1)); vdata->unclean_set_num_rows((_block_size + 1) * (_block_size + 1));
GeomVertexWriter cwriter; GeomVertexWriter cwriter;
if (_has_color_map) { if (_has_color_map) {
cwriter = GeomVertexWriter(vdata, "color"); cwriter = GeomVertexWriter(vdata, InternalName::get_color());
} }
GeomVertexWriter vwriter (vdata, "vertex" ); GeomVertexWriter vwriter (vdata, InternalName::get_vertex());
GeomVertexWriter twriter (vdata, "texcoord"); GeomVertexWriter twriter (vdata, InternalName::get_texcoord());
GeomVertexWriter nwriter (vdata, "normal" ); GeomVertexWriter nwriter (vdata, InternalName::get_normal());
PT(GeomTriangles) prim = new GeomTriangles(Geom::UH_stream); PT(GeomTriangles) prim = new GeomTriangles(Geom::UH_stream);
if (_bruteforce) { if (_bruteforce) {
@ -109,20 +110,26 @@ generate_block(unsigned short mx,
// This is the number of vertices at the certain level. // This is the number of vertices at the certain level.
unsigned short lowblocksize = _block_size / level + 1; unsigned short lowblocksize = _block_size / level + 1;
PN_stdfloat cmap_xratio = _color_map.get_x_size() / (PN_stdfloat)_xsize;
PN_stdfloat cmap_yratio = _color_map.get_y_size() / (PN_stdfloat)_ysize;
PN_stdfloat tc_xscale = 1.0f / PN_stdfloat(_xsize - 1);
PN_stdfloat tc_yscale = 1.0f / PN_stdfloat(_ysize - 1);
for (int x = 0; x <= _block_size; x++) { for (int x = 0; x <= _block_size; x++) {
for (int y = 0; y <= _block_size; y++) { for (int y = 0; y <= _block_size; y++) {
if ((x % level) == 0 && (y % level) == 0) { if ((x % level) == 0 && (y % level) == 0) {
if (_has_color_map) { if (_has_color_map) {
LVecBase4f color = _color_map.get_xel_a(int((mx * _block_size + x) LVecBase4f color = _color_map.get_xel_a(
/ double(_xsize) * _color_map.get_x_size()), int((mx * _block_size + x) * cmap_xratio),
int((my * _block_size + y) int((my * _block_size + y) * cmap_yratio));
/ double(_ysize) * _color_map.get_y_size()));
cwriter.add_data4f(color); cwriter.add_data4f(color);
} }
vwriter.add_data3(x - 0.5 * _block_size, y - 0.5 * _block_size, get_pixel_value(mx, my, x, y)); vwriter.add_data3(x - 0.5 * _block_size, y - 0.5 * _block_size, get_pixel_value(mx, my, x, y));
twriter.add_data2((mx * _block_size + x) / double(_xsize - 1), twriter.add_data2((mx * _block_size + x) * tc_xscale,
(my * _block_size + y) / double(_ysize - 1)); (my * _block_size + y) * tc_yscale);
nwriter.add_data3(get_normal(mx, my, x, y)); nwriter.add_data3(get_normal(mx, my, x, y));
if (x > 0 && y > 0) { if (x > 0 && y > 0) {
// Left border // Left border
if (x == level && ljunction) { if (x == level && ljunction) {
@ -654,14 +661,16 @@ set_heightfield(const Filename &filename, PNMFileType *ftype) {
// Copy over the header to the heightfield image. // Copy over the header to the heightfield image.
_heightfield.copy_header_from(imgheader); _heightfield.copy_header_from(imgheader);
if(!is_power_of_two(imgheader.get_x_size() - 1) || !is_power_of_two(imgheader.get_y_size() - 1)) { if (!is_power_of_two(imgheader.get_x_size() - 1) ||
!is_power_of_two(imgheader.get_y_size() - 1)) {
// Calculate the nearest power-of-two-plus-one size. // Calculate the nearest power-of-two-plus-one size.
unsigned int reqx, reqy; unsigned int reqx, reqy;
reqx = max(3, (int) pow(2.0, ceil(log((double) max(2, imgheader.get_x_size() - 1)) / log(2.0))) + 1); reqx = max(3, (int) pow(2.0, ceil(log((double) max(2, imgheader.get_x_size() - 1)) / log(2.0))) + 1);
reqy = max(3, (int) pow(2.0, ceil(log((double) max(2, imgheader.get_y_size() - 1)) / log(2.0))) + 1); reqy = max(3, (int) pow(2.0, ceil(log((double) max(2, imgheader.get_y_size() - 1)) / log(2.0))) + 1);
// If it's not a valid size, tell PNMImage to resize it. // If it's not a valid size, tell PNMImage to resize it.
if (reqx != (unsigned int)imgheader.get_x_size() || reqy != (unsigned int)imgheader.get_y_size()) { if (reqx != (unsigned int)imgheader.get_x_size() ||
reqy != (unsigned int)imgheader.get_y_size()) {
grutil_cat.warning() grutil_cat.warning()
<< "Rescaling heightfield image " << filename << "Rescaling heightfield image " << filename
<< " from " << imgheader.get_x_size() << "x" << imgheader.get_y_size() << " from " << imgheader.get_x_size() << "x" << imgheader.get_y_size()
@ -670,6 +679,14 @@ set_heightfield(const Filename &filename, PNMFileType *ftype) {
} }
} }
if (imgheader.get_color_space() == CS_sRGB) {
// Probably a mistaken metadata setting on the file.
grutil_cat.warning()
<< "Heightfield image is specified to have sRGB color space!\n"
"Panda applies gamma correction, which will probably cause "
"it to produce incorrect results.\n";
}
// Read the real image now // Read the real image now
if (!_heightfield.read(filename, ftype)) { if (!_heightfield.read(filename, ftype)) {
_heightfield.clear_read_size(); _heightfield.clear_read_size();

1
panda/src/grutil/geoMipTerrain.h
View File

@ -45,7 +45,6 @@ PUBLISHED:
INLINE PNMImage &heightfield(); INLINE PNMImage &heightfield();
bool set_heightfield(const Filename &filename, PNMFileType *type = NULL); bool set_heightfield(const Filename &filename, PNMFileType *type = NULL);
INLINE bool set_heightfield(const PNMImage &image); INLINE bool set_heightfield(const PNMImage &image);
INLINE bool set_heightfield(const string &path);
INLINE PNMImage &color_map(); INLINE PNMImage &color_map();
INLINE bool set_color_map(const Filename &filename, INLINE bool set_color_map(const Filename &filename,
PNMFileType *type = NULL); PNMFileType *type = NULL);