diff --git a/src/osgPlugins/p3d/PickEventHandler.cpp b/src/osgPlugins/p3d/PickEventHandler.cpp index 16aad1c8e..5bf8b9a42 100644 --- a/src/osgPlugins/p3d/PickEventHandler.cpp +++ b/src/osgPlugins/p3d/PickEventHandler.cpp @@ -130,7 +130,7 @@ void PickEventHandler::doOperation() std::string delimintor(":"); #endif std::string filepath("OSG_FILE_PATH="); - + bool needDeliminator = false; for(osgDB::FilePathList::iterator itr = paths.begin(); itr != paths.end(); @@ -145,7 +145,7 @@ void PickEventHandler::doOperation() std::string binpath("PATH="); char* path = getenv("PATH"); if (path) binpath += path; - + needDeliminator = true; for(osgDB::FilePathList::iterator itr = paths.begin(); itr != paths.end(); @@ -158,10 +158,10 @@ void PickEventHandler::doOperation() putenv( (char*) binpath.c_str()); } -#endif +#endif int result = system(_command.c_str()); - - osg::notify(osg::INFO)<<"system("<<_command<<") result "<getActiveSlide(); @@ -197,7 +197,7 @@ void PickEventHandler::doOperation() { newLayer = 0; } - + osg::notify(osg::NOTICE)<<" jump to "<selectSlide(newSlide, newLayer); diff --git a/src/osgPlugins/p3d/ReaderWriterP3D.cpp b/src/osgPlugins/p3d/ReaderWriterP3D.cpp index 20b4cdf68..cd044f600 100644 --- a/src/osgPlugins/p3d/ReaderWriterP3D.cpp +++ b/src/osgPlugins/p3d/ReaderWriterP3D.cpp @@ -870,10 +870,10 @@ void ReaderWriterP3DXML::parseStereoPair(osgPresentation::SlideShowConstructor& getProperties(cur,imageDataRight); } } - + if (!filenameLeft.empty() && !filenameRight.empty()) constructor.addStereoImagePair(filenameLeft,imageDataLeft, - filenameRight, imageDataRight, + filenameRight, imageDataRight, positionRead ? positionData : constructor.getImagePositionData()); } diff --git a/src/osgPlugins/p3d/SlideShowConstructor.cpp b/src/osgPlugins/p3d/SlideShowConstructor.cpp index ddd6d672b..b5ea4be2e 100644 --- a/src/osgPlugins/p3d/SlideShowConstructor.cpp +++ b/src/osgPlugins/p3d/SlideShowConstructor.cpp @@ -636,23 +636,23 @@ class FindImageStreamsVisitor : public osg::NodeVisitor public: FindImageStreamsVisitor(): osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) {} - + virtual void apply(osg::Node& node) { - if (node.getStateSet()) - { - process(node.getStateSet()); - } - traverse(node); - } + if (node.getStateSet()) + { + process(node.getStateSet()); + } + traverse(node); + } virtual void apply(osg::Geode& node) { - if (node.getStateSet()) - { - process(node.getStateSet()); - } - + if (node.getStateSet()) + { + process(node.getStateSet()); + } + for(unsigned int i=0;isetMode(GL_BLEND, osg::StateAttribute::ON); } - attachTexMat(pictureLeftStateSet, imageDataLeft, s, t, usedTextureRectangle); + attachTexMat(pictureLeftStateSet, imageDataLeft, s, t, usedTextureRectangle); pictureLeft->addDrawable(pictureLeftQuad); @@ -984,7 +984,7 @@ void SlideShowConstructor::addStereoImagePair(const std::string& filenameLeft, c pictureRightStateSet->setMode(GL_BLEND, osg::StateAttribute::ON); } - attachTexMat(pictureRightStateSet, imageDataRight, s, t, usedTextureRectangle); + attachTexMat(pictureRightStateSet, imageDataRight, s, t, usedTextureRectangle); pictureRight->addDrawable(pictureRightQuad); }