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

Changed build OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION to ON and then fixed all the resulting build errors.

Browse Source
This commit is contained in:
Robert Osfield
2009-06-17 10:39:39 +00:00
parent 7c4225e574
commit ad8f2d8974
17 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/dae/daeReader.cpp
View File

@@ -161,7 +161,7 @@ osg::Node* daeReader::processVisualScene( domVisual_scene *scene )
}
}
}
retVal->setStateSet(_rootStateSet);
retVal->setStateSet(_rootStateSet.get());
return retVal;
}

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

@@ -1710,7 +1710,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterP3DXML::readNode(const std::string&
input.open(fileName);
input.readAllDataIntoBuffer();
return readNode(input, local_opt);
return readNode(input, local_opt.get());
}
osgDB::ReaderWriter::ReadResult ReaderWriterP3DXML::readNode(std::istream& fin, const Options* options) const
@@ -1723,7 +1723,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterP3DXML::readNode(std::istream& fin,
//local_opt->setFindFileCallback(new MyFindFileCallback);
local_opt->setReadFileCallback(new MyReadFileCallback);
return readNode(input, local_opt);
return readNode(input, local_opt.get());
}
osgDB::ReaderWriter::ReadResult ReaderWriterP3DXML::readNode(osgDB::XmlNode::Input& input, osgDB::ReaderWriter::Options* options) const

6
src/osgPlugins/p3d/ReaderWriterPaths.cpp
View File

@@ -93,7 +93,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::readObject(const std::string&
std::ifstream input(fileName.c_str());
return readObject(input, local_opt);
return readObject(input, local_opt.get());
}
osgDB::ReaderWriter::ReadResult ReaderWriterPaths::readObject(std::istream& fin, const osgDB::Options* options) const
@@ -234,12 +234,12 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_rotation_path(std::istre
localValue.azim = currValue.azim *r + prevValue.azim * (1.0f-r);
localValue.elevation = currValue.elevation *r + prevValue.elevation * (1.0f-r);
localValue.addToPath(animation);
localValue.addToPath(animation.get());
}
}
else
{
currValue.addToPath(animation);
currValue.addToPath(animation.get());
}
prevValue = currValue;
first = false;

8
src/osgPlugins/revisions/ReaderWriterRevisions.cpp
View File

@@ -126,15 +126,15 @@ class ReaderWriterFreeType : public osgDB::ReaderWriter
if (ext=="added")
{
dbRevision->setFilesAdded(fileList);
dbRevision->setFilesAdded(fileList.get());
}
else if (ext=="removed")
{
dbRevision->setFilesRemoved(fileList);
dbRevision->setFilesRemoved(fileList.get());
}
else if (ext=="modified")
{
dbRevision->setFilesModified(fileList);
dbRevision->setFilesModified(fileList.get());
}
}
}
@@ -144,7 +144,7 @@ class ReaderWriterFreeType : public osgDB::ReaderWriter
itr != revisionMap.end();
++itr)
{
revisions->addRevision(itr->second);
revisions->addRevision(itr->second.get());
}
return revisions.get();

10
src/osgPlugins/vrml/ReaderWriterVRML2.cpp
View File

@@ -214,7 +214,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterVRML2::readNode(const std::string &f
for (unsigned i = 0; i < mfn.size(); i++)
{
openvrml::node *vrml_node = mfn[i].get();
osg_root->addChild(convertFromVRML(vrml_node).get());
osg_root->addChild(convertFromVRML(vrml_node));
}
osgDB::getDataFilePathList().pop_front();
return osg_root.get();
@@ -225,7 +225,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterVRML2::readNode(const std::string &f
catch (std::invalid_argument) { return ReadResult::FILE_NOT_HANDLED; }
}
osg::ref_ptr<osg::Node> ReaderWriterVRML2::convertFromVRML(openvrml::node *obj) const
osg::Node* ReaderWriterVRML2::convertFromVRML(openvrml::node *obj) const
{
//static int osgLightNum = 0; //light
@@ -285,7 +285,7 @@ osg::ref_ptr<osg::Node> ReaderWriterVRML2::convertFromVRML(openvrml::node *obj)
for (it_npv = node_ptr_vector.begin(); it_npv != node_ptr_vector.end(); it_npv++)
{
openvrml::node *node = (*(it_npv)).get();
osg_m->addChild(convertFromVRML(node).get());
osg_m->addChild(convertFromVRML(node));
}
}
}
@@ -294,7 +294,7 @@ osg::ref_ptr<osg::Node> ReaderWriterVRML2::convertFromVRML(openvrml::node *obj)
// no children
}
return osg_m.get();
return osg_m.release();
}
@@ -467,7 +467,7 @@ osg::ref_ptr<osg::Node> ReaderWriterVRML2::convertFromVRML(openvrml::node *obj)
}
}
return osg_geode.get();
return osg_geode.release();
}
else
{

2
src/osgPlugins/vrml/ReaderWriterVRML2.h
View File

@@ -83,7 +83,7 @@ private:
typedef std::map<QuadricKey, osg::ref_ptr<osg::Geometry> > ConeLibrary;
typedef std::map<QuadricKey, osg::ref_ptr<osg::Geometry> > CylinderLibrary;
osg::ref_ptr<osg::Node> convertFromVRML(openvrml::node *obj) const;
osg::Node* convertFromVRML(openvrml::node *obj) const;
osg::ref_ptr<osg::Geometry> convertVRML97IndexedFaceSet(openvrml::node *vrml_ifs) const;

6
src/osgPlugins/zip/ReaderWriterZIP.cpp
View File

@@ -71,7 +71,7 @@ class ReaderWriterZIP : public osgDB::ReaderWriter
local_opt->getDatabasePathList().push_front(osgDB::getFilePath(file));
// Now pass through to memory zip handler
rresult = readNode(tmpStrmBuffer,local_opt);
rresult = readNode(tmpStrmBuffer,local_opt.get());
// Clean up options
local_opt->getDatabasePathList().pop_front();
@@ -81,7 +81,7 @@ class ReaderWriterZIP : public osgDB::ReaderWriter
return rresult;
}
virtual ReadResult readNode(std::istream& fin,const osgDB::Options* options =NULL) const
virtual ReadResult readNode(std::istream& fin,const osgDB::Options* options) const
{
ReadResult result = ReadResult(ReadResult::FILE_NOT_HANDLED);
@@ -145,7 +145,7 @@ class ReaderWriterZIP : public osgDB::ReaderWriter
local_opt->setPluginStringData("STREAM_FILENAME",osgDB::getSimpleFileName(StreamName));
result = rw->readNode(buffer,local_opt);
result = rw->readNode(buffer,local_opt.get());
if (result.validNode())
{
grp->addChild( result.takeNode() );