Fixed bug in handling of stereo image pairs

This commit is contained in:
Robert Osfield 2009-07-27 15:39:27 +00:00
parent e078aad61f
commit fcaec80dc9

View File

@ -848,6 +848,10 @@ void ReaderWriterP3DXML::parseVolume(osgPresentation::SlideShowConstructor& cons
void ReaderWriterP3DXML::parseStereoPair(osgPresentation::SlideShowConstructor& constructor, osgDB::XmlNode*cur) const void ReaderWriterP3DXML::parseStereoPair(osgPresentation::SlideShowConstructor& constructor, osgDB::XmlNode*cur) const
{ {
osg::notify(osg::NOTICE)<<"ReaderWriterP3DXML::parseStereoPair()"<<std::endl;
std::string filenameLeft; std::string filenameLeft;
std::string filenameRight; std::string filenameRight;
@ -866,16 +870,20 @@ void ReaderWriterP3DXML::parseStereoPair(osgPresentation::SlideShowConstructor&
if (child->name == "image_left") if (child->name == "image_left")
{ {
getProperties(child,imageDataLeft); getProperties(child,imageDataLeft);
filenameLeft = child->name; filenameLeft = child->contents;
} }
if (cur->name == "image_right") if (child->name == "image_right")
{ {
getProperties(child,imageDataRight); getProperties(child,imageDataRight);
filenameRight = child->name; filenameRight = child->contents;
getProperties(cur,imageDataRight); getProperties(cur,imageDataRight);
} }
} }
osg::notify(osg::NOTICE)<<" filenameLeft="<<filenameLeft<<std::endl;
osg::notify(osg::NOTICE)<<" filenameRight="<<filenameRight<<std::endl;
if (!filenameLeft.empty() && !filenameRight.empty()) if (!filenameLeft.empty() && !filenameRight.empty())
constructor.addStereoImagePair(filenameLeft,imageDataLeft, constructor.addStereoImagePair(filenameLeft,imageDataLeft,
filenameRight, imageDataRight, filenameRight, imageDataRight,