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

Replaced tabs with spaces

Browse Source
This commit is contained in:
Robert Osfield
2009-05-14 13:30:25 +00:00
parent fcfb8468cf
commit 2dad77a102
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgPlugins/p3d/PickEventHandler.cpp
View File

@@ -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 "<<result<<std::endl;
osg::notify(osg::INFO)<<"system("<<_command<<") result "<<result<<std::endl;
break;
}
@@ -186,7 +186,7 @@ void PickEventHandler::doOperation()
if (requiresJump())
{
osg::notify(osg::NOTICE)<<"Requires jump "<<_relativeJump<<", "<<_slideNum<<", "<<_layerNum<<std::endl;
if (_relativeJump)
{
int previousSlide = SlideEventHandler::instance()->getActiveSlide();
@@ -197,7 +197,7 @@ void PickEventHandler::doOperation()
{
newLayer = 0;
}
osg::notify(osg::NOTICE)<<" jump to "<<newSlide<<", "<<newLayer<<std::endl;
SlideEventHandler::instance()->selectSlide(newSlide, newLayer);

4
src/osgPlugins/p3d/ReaderWriterP3D.cpp
View File

@@ -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());
}

30
src/osgPlugins/p3d/SlideShowConstructor.cpp
View File

@@ -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;i<node.getNumDrawables();++i)
{
osg::Drawable* drawable = node.getDrawable(i);
@@ -681,7 +681,7 @@ public:
}
}
}
};
void SlideShowConstructor::findImageStreamsAndAddCallbacks(osg::Node* node)
@@ -966,7 +966,7 @@ void SlideShowConstructor::addStereoImagePair(const std::string& filenameLeft, c
pictureLeftStateSet->setMode(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);
}