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

From Ulrich Hertlein, spelling corrections and a few Doxgen comments.

Browse Source
This commit is contained in:
Robert Osfield
2006-02-20 21:05:23 +00:00
parent b0358c698a
commit 7d5c81bf5e
12 changed files with 72 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgPlugins/osg/CameraNode.cpp
View File

@@ -71,8 +71,11 @@ bool CameraNode_readLocalData(Object& obj, Input& fr)
if (fr.matchSequence("transformOrder %w"))
{
if (fr[1].matchWord("PRE_MULTIPLE")) camera.setTransformOrder(osg::CameraNode::PRE_MULTIPLE);
else if (fr[1].matchWord("POST_MULTIPLE")) camera.setTransformOrder(osg::CameraNode::POST_MULTIPLE);
if (fr[1].matchWord("PRE_MULTIPLY")) camera.setTransformOrder(osg::CameraNode::PRE_MULTIPLY);
else if (fr[1].matchWord("POST_MULTIPLY")) camera.setTransformOrder(osg::CameraNode::POST_MULTIPLY);
// the following are for backwards compatibility.
else if (fr[1].matchWord("PRE_MULTIPLE")) camera.setTransformOrder(osg::CameraNode::PRE_MULTIPLY);
else if (fr[1].matchWord("POST_MULTIPLE")) camera.setTransformOrder(osg::CameraNode::POST_MULTIPLY);
fr += 2;
iteratorAdvanced = true;
@@ -235,8 +238,8 @@ bool CameraNode_writeLocalData(const Object& obj, Output& fw)
fw.indent()<<"transformOrder ";
switch(camera.getTransformOrder())
{
case(osg::CameraNode::PRE_MULTIPLE): fw <<"PRE_MULTIPLE"<<std::endl; break;
case(osg::CameraNode::POST_MULTIPLE): fw <<"POST_MULTIPLE"<<std::endl; break;
case(osg::CameraNode::PRE_MULTIPLY): fw <<"PRE_MULTIPLY"<<std::endl; break;
case(osg::CameraNode::POST_MULTIPLY): fw <<"POST_MULTIPLY"<<std::endl; break;
}
writeMatrix(camera.getProjectionMatrix(),fw,"ProjectionMatrix");

13
src/osgPlugins/pfb/ReaderWriterPFB.cpp
View File

@@ -1,5 +1,6 @@
#include <stdio.h>
#include <string.h>
#include <string>
#include <osg/Geode>
#include <osg/Group>
@@ -223,6 +224,18 @@ void ReaderWriterPFB::initPerformer()
// }
pfdInitConverter(".pfb");
/*
* Tell Performer to look in OSG search path
*/
const osgDB::FilePathList& filePath = osgDB::Registry::instance()->getDataFilePathList();
std::string path = "";
for (unsigned int i = 0; i < filePath.size(); i++) {
if (i != 0)
path += ":";
path += filePath[i];
}
pfFilePath(path.c_str());
pfConfig();
}