FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Fabio Mierlo, removed cast from float to RGB8, to allow native float imagery

Browse Source 
to be correctly importated from HDR files.

From Robert Osfield, tweaked the above to allow the original casting to RGB8 as an
options switched on by a osgDB::ReaderWriter::Options string with a value of "RGB8".
This commit is contained in:
Robert Osfield
2005-07-26 15:49:19 +00:00
parent bddaefd569
commit eca7fc210a
1 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/osgPlugins/hdr/ReaderWriterHDR.cpp
View File

@@ -56,14 +56,23 @@ public:
float mul = 1.0f;
bool bYFlip = false;
if(_opts) {
bool convertToRGB8 = false;
if(_opts)
{
std::istringstream iss(_opts->getOptionString());
std::string opt;
while (iss >> opt) {
if(opt == "RGBMUL") {
while (iss >> opt)
{
if(opt == "RGBMUL")
{
iss >> mul;
}
else if(opt == "YFLIP") {
else if(opt == "RGB8")
{
convertToRGB8 = true;
}
else if(opt == "YFLIP")
{
bYFlip = true; // TODO
}
}
@@ -74,34 +83,55 @@ public:
if (!ret)
return ReadResult::FILE_NOT_FOUND;
int nbPixs = res.width * res.height;
int nbElements = nbPixs * 3;
unsigned char *rgb = new unsigned char[ nbElements ];
unsigned char *tt = rgb;
float *cols = res.cols;
for (int i = 0; i < nbElements; i++) {
float element = *cols++;
element *= mul;
if (element < 0) element = 0;
else if (element > 1) element = 1;
int intElement = (int) (element * 255.0f);
*tt++ = intElement;
}
delete [] res.cols;
int pixelFormat = GL_RGB;
int dataType = GL_UNSIGNED_BYTE;
// create the osg::Image to fill in.
osg::Image *img = new osg::Image;
img->setFileName(_file.c_str());
img->setImage( res.width, res.height, 1,
3,
pixelFormat,
dataType,
(unsigned char*) rgb,
osg::Image::USE_NEW_DELETE);
// copy across the raw data into the osg::Image
if (convertToRGB8)
{
int nbPixs = res.width * res.height;
int nbElements = nbPixs * 3;
unsigned char *rgb = new unsigned char[ nbElements ];
unsigned char *tt = rgb;
float *cols = res.cols;
for (int i = 0; i < nbElements; i++) {
float element = *cols++;
element *= mul;
if (element < 0) element = 0;
else if (element > 1) element = 1;
int intElement = (int) (element * 255.0f);
*tt++ = intElement;
}
delete [] res.cols;
int pixelFormat = GL_RGB;
int dataType = GL_UNSIGNED_BYTE;
img->setFileName(_file.c_str());
img->setImage( res.width, res.height, 1,
3,
pixelFormat,
dataType,
(unsigned char*) rgb,
osg::Image::USE_NEW_DELETE);
}
else
{
int internalFormat = GL_RGB;
int pixelFormat = GL_RGB;
int dataType = GL_FLOAT;
img->setFileName(_file.c_str());
img->setImage( res.width, res.height, 1,
internalFormat,
pixelFormat,
dataType,
(unsigned char*) res.cols,
osg::Image::USE_NEW_DELETE);
}
return img;
}